From c5a6e9b0ab4f72abf82f08b0389c565ffa260749 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 12 Oct 2024 17:56:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TrunklineCarsLoadServiceImpl.java    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 365e5b67d..b012ed703 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/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,16 +9955,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<Long> carsLoadScanIds = unloadPackageList.stream()
 			.map(UnloadPackageVO::getCarsLoadScanId)
 			.collect(Collectors.toList());
-		List<TrunklineScanZeroDetailVO> scanZeroDetailList = scanZeroDetailService.findListByCarsLoadScanIds(carsLoadScanIds);
-		//把scanZeroDetailList中所有元素通过id进行分组
-		Map<Long, List<TrunklineScanZeroDetailVO>> scanZeroDetailMap = scanZeroDetailList.stream()
-			.collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId));
-
-		unloadPackageList.forEach(unloadPackageVO -> {
-			Long carsLoadScanId = unloadPackageVO.getCarsLoadScanId();
-			List<TrunklineScanZeroDetailVO> list = scanZeroDetailMap.get(carsLoadScanId);
-			unloadPackageVO.setScanZeroDetailList(list);
-		});
+		if(CollUtil.isNotEmpty(carsLoadScanIds)){
+			List<TrunklineScanZeroDetailVO> scanZeroDetailList = scanZeroDetailService.findListByCarsLoadScanIds(carsLoadScanIds);
+			//把scanZeroDetailList中所有元素通过id进行分组
+			Map<Long, List<TrunklineScanZeroDetailVO>> scanZeroDetailMap = scanZeroDetailList.stream()
+				.collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId));
+
+			unloadPackageList.forEach(unloadPackageVO -> {
+				Long carsLoadScanId = unloadPackageVO.getCarsLoadScanId();
+				List<TrunklineScanZeroDetailVO> list = scanZeroDetailMap.get(carsLoadScanId);
+				unloadPackageVO.setScanZeroDetailList(list);
+			});
+		}
 
 		for (UnloadZeroVO unloadZeroVO : zeroList) {
 			String waybillNo = StringUtil.isBlank(unloadZeroVO.getWaybillNo())?"null":unloadZeroVO.getWaybillNo();