1.配载卸车逻辑优化

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

@@ -1002,11 +1002,10 @@ public class SyncOrderInfoToPlatform {
 			//查询所有装车明细
 			List<TrunklineCarsLoadScanEntity> carsLoadScanEntities = carsLoadScanClient.findAllListByLoadId(loadId);
 
-			List<Long> scanloadIdList = carsLoadScanEntities.stream().map(TrunklineCarsLoadScanEntity::getId).collect(Collectors.toList());
-
+			List<Long> scanloadIdList = new ArrayList<>();
 
 			//把carsLoadScanEntities通过unloadNodeId分组
-			Map<Long, List<TrunklineCarsLoadScanEntity>> collect = carsLoadScanEntities.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getUnloadNodeId));
+			Map<Long, List<TrunklineCarsLoadScanEntity>> collect = carsLoadScanEntities.stream().filter(s -> !Objects.isNull(s.getUnloadNodeId())).collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getUnloadNodeId));
 
 			collect.keySet().forEach(unloadNodeId -> {
 				List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = collect.get(unloadNodeId);
@@ -1026,7 +1025,9 @@ public class SyncOrderInfoToPlatform {
 				});
 			});
 
-			carsLoadScanClient.removeLoadScanByIds(scanloadIdList);
+			if(CollUtil.isNotEmpty(scanloadIdList)){
+				carsLoadScanClient.removeLoadScanByIds(scanloadIdList);
+			}
 
 			carsLoadClient.updateCardLoadNum(loadId);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -8790,6 +8790,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		QueryWrapper<TrunklineCarsLoadScanEntity> neloadScanQueryWrapper = new QueryWrapper<>();
 		neloadScanQueryWrapper.eq("load_id", loadId)
 			.eq("scan_code", orderPackageCode)
+			.eq("unload_node_id", warehouseId)
 			.ne("scan_status", "1");
 		TrunklineCarsLoadScanEntity scanEntity = trunklineCarsLoadScanService.getOne(neloadScanQueryWrapper);