From 5e66fe80f2f81c4689a6b5a9a08c2efef8149353 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 24 Sep 2024 09:47:23 +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

---
 .../mapper/TrunklineCarsLoadScanMapper.xml    |  2 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index b9b9ed574..f56bf74a8 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -499,7 +499,7 @@
 
     <select id="findTransferLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
         select waybill_no waybillNo,
-               sum(unload_num) num
+               sum(num) num
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and warehouse_id = #{nodeId}
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 e336c9879..2a771a1dd 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
@@ -7424,6 +7424,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getLoadId));
 		Set<Long> loadIdSet = groupedByLoadId.keySet();
 
+		List<TrunklineCarsLoadEntity> trunklineCarsLoadEntities = baseMapper.selectBatchIds(loadIdSet);
+		//把trunklineCarsLoadEntities转化成以id为key的Map
+		Map<Long, TrunklineCarsLoadEntity> map = trunklineCarsLoadEntities.stream().collect(Collectors.toMap(TrunklineCarsLoadEntity::getId, Function.identity()));
+
 		List<DistributionParcelListEntity> updateParceListList = new ArrayList<>();
 		List<DistributionStockArticleEntity> updateStockArticleList = new ArrayList<>();
 
@@ -7454,6 +7458,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 									DistributionStockArticleEntity distributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
 									List<TrunklineCarsLoadScanEntity> loadScanEntityList2 = groupedByOrderCode.get(orderCode);
 									if(CollUtil.isNotEmpty(loadScanEntityList2)){
+
+										TrunklineCarsLoadScanEntity carsLoadScanEntity = loadScanEntityList2.get(0);
+										Long loadId1 = carsLoadScanEntity.getLoadId();
+
 										//把loadScanEntityList2的num进行累加
 										Integer num = loadScanEntityList2.stream().map(TrunklineCarsLoadScanEntity::getNum).reduce(0, Integer::sum);
 										//把loadScanEntityList2中所有元素的scanCode放入一个List
@@ -7483,9 +7491,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 										updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num);
 										updateStockArticleList.add(updateStockArticle);
 
-
-										String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
-										packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+										TrunklineCarsLoadEntity carsLoadEntity = map.get(loadId1);
+										if(!Objects.isNull(carsLoadEntity)){
+											String loadType = carsLoadEntity.getLoadType();
+											if(!StringUtils.equals(loadType, "4")){
+												String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
+												packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+											}
+										}else{
+											String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
+											packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+										}
 									}
 								});