1.干线bug修复

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

@@ -3081,7 +3081,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				}
 			}
 			distributionParcelListClient.updateOrderPackageCodeById(packageId, "60");
-			distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
+//			distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
 			if (StringUtil.isBlank(trayCode) && StringUtil.isBlank(orderPackageCode)) {
 				updownTypeClient.downPackageOrDelTray(orderPackageCode, warehouseId, "干线装车下架解托");
 			}
@@ -9955,6 +9955,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<Long> carsLoadScanIds = unloadPackageList.stream()
 			.map(UnloadPackageVO::getCarsLoadScanId)
 			.collect(Collectors.toList());
+		if(CollUtil.isNotEmpty(carsLoadScanIds)){
 			List<TrunklineScanZeroDetailVO> scanZeroDetailList = scanZeroDetailService.findListByCarsLoadScanIds(carsLoadScanIds);
 			//把scanZeroDetailList中所有元素通过id进行分组
 			Map<Long, List<TrunklineScanZeroDetailVO>> scanZeroDetailMap = scanZeroDetailList.stream()
@@ -9965,6 +9966,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				List<TrunklineScanZeroDetailVO> list = scanZeroDetailMap.get(carsLoadScanId);
 				unloadPackageVO.setScanZeroDetailList(list);
 			});
+		}
 
 		for (UnloadZeroVO unloadZeroVO : zeroList) {
 			String waybillNo = StringUtil.isBlank(unloadZeroVO.getWaybillNo())?"null":unloadZeroVO.getWaybillNo();