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

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

@@ -8173,10 +8173,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						aaa.add(trunklinePackageTrackLog);
 					}
 					//下架解托
-					if (StringUtils.isNotBlank(distributionLoadscanEntity.getOrderPackageCode())) {
-						warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
-					}
-					pushList.add(distributionLoadscanEntity);
+                    warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
+                    pushList.add(distributionLoadscanEntity);
 					packageLockIds.add(parcelListEntity.getId());
 					parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 					parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());