Merge branch 'dev' into pre-production

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

@@ -3353,7 +3353,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					break;
 				}
 			}
-
+			distributionParcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
+			distributionParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+			distributionParcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+			distributionParcelListService.save(distributionParcelListEntity);
 
 			if (distributionParcelListEntity != null) {
 				n.set(true);
@@ -3440,9 +3443,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 			distributionBillLadingScanService.save(distributionBillLadingScan);
 			//进行下架解托
-			if(StringUtils.isNotBlank(distributionBillLadingScan.getPacketBarCode())){
-				warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");
-			}
+//			if(StringUtils.isNotBlank(distributionBillLadingScan.getPacketBarCode())){
+//				warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");
+//			}
 
 
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -408,7 +408,7 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
-	@XxlJob("clearOrderPackageStatusStock")
+	@XxlJob("clearOrderPackageDownAndDelTray")
 	public ReturnT<String>  clearOrderPackageDownAndDelTray(String param) {
 		log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托   开始");