Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -8173,7 +8173,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						aaa.add(trunklinePackageTrackLog);
 					}
 					//下架解托
-                    warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
+					String orderPackageCodes = parcelListEntity.getOrderPackageCode();
+					Long warehouseId = myCurrentWarehouse.getId();
+					String remark = "签收下架解托";
+					log.info("------------------orderPackageCodes={}",orderPackageCodes);
+					log.info("------------------warehouseId={}",warehouseId);
+					log.info("------------------remark={}",remark);
+					warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes, warehouseId, remark);
                     pushList.add(distributionLoadscanEntity);
 					packageLockIds.add(parcelListEntity.getId());
 					parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());