1.修复包件解托bug

2.新增处理包件下架解托定时任务

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

@@ -408,6 +408,30 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("clearOrderPackageStatusStock")
+	public ReturnT<String>  clearOrderPackageDownAndDelTray(String param) {
+		log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托   开始");
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllOrderPackage();
+
+		for (JSONObject l : ls) {
+			String orderPackageCode = l.getStr("orderPackageCode");
+			Long warehouseId = l.getLong("warehouseId");
+
+			syncOrderInfoService.clearOrderPackageDownAndDelTray(orderPackageCode,warehouseId);
+
+			warehouseMappingDataService.updateClearOrderPackageStatusSignStatus(orderPackageCode,warehouseId,1);
+		}
+
+
+
+		log.info("############clearOrderPackageDownAndDelTray: 清理包件数据下架解托  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
+
+
 
 	@XxlJob("syncZeroOrderInfo")
 	public ReturnT<String> syncZeroOrderInfo(String param) {

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java

@@ -28,4 +28,6 @@ public interface ISyncOrderInfoService {
 	void clearOrderPackageStatusOut(String orderPackageCode, Long warehouseId);
 
     void dealWithPackageUpdown(String orderPackageCode, Long allocationId,Long warehouseId);
+
+	void clearOrderPackageDownAndDelTray(String orderPackageCode, Long warehouseId);
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -365,6 +365,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 	}
 
+	@Override
+	public void clearOrderPackageDownAndDelTray(String orderPackageCode, Long warehouseId) {
+		warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId,"系统下架解托");
+	}
+
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -2765,7 +2765,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			.collect(Collectors.groupingBy(WarehouseTrayGoodsEntity::getTrayTypeId));
 
 		Set<Long> trayTypeIds = trayTypeIdToTrayGoodsListMap.keySet();
-		if(!trayTypeIds.isEmpty()){
+		if(trayTypeIds.isEmpty()){
 			return ;
 		}
 		List<WarehouseTrayTypeEntity> warehouseTrayTypeEntities = baseMapper.selectBatchIds(trayTypeIds);