From 0b22a631d8fd8076e7f6fe15d38dd86d21d8a73d Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 21 Jan 2025 18:38:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E6=89=98=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TrunklineCarsLoadServiceImpl.java    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 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 8b470c959..db62c7bd1 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
@@ -7086,7 +7086,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
 				distributionParcelListClient.updateOrderPackageCodeById(pacakageId, "60");
 
-				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "中转卸车下架解托");
+				DownPackageTrayVO downPackageTrayVO = buildDownPackageTrayVO(orderPackageCode, wid, "三方中转卸车下架解托");
 				if(downPackageTrayVO!=null){
 					updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
 				}
@@ -7301,7 +7301,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		//处理托盘的入库和货物的入库
-		trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId);
+		trayTypeClient.trayToNull(trayCode,"三方中转托盘卸车");
 
 		JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId);
 		Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum");
@@ -8492,6 +8492,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				//更新包件状态
 				distributionParcelListClient.updateOrderPackageCodeById(parcelListEntity.getId(), "70");
 
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+				downPackageTrayVO.setRemark("直发商家异常签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 				//无装车记录异常日志记录
 				try {
 					carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseEntity.getName(), loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId()));
@@ -8566,6 +8572,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			//生成签收记录
 			trunklineCarsSignLogService.addEntity(carsLoadScanEntity, remark);
+
+
+			DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+			downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+			downPackageTrayVO.setWarehouseId(parcelListEntity.getWarehouseId());
+			downPackageTrayVO.setRemark("直发商家签收下架解托");
+			updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+
 		}
 
 		//重新计算数量
@@ -8927,6 +8941,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				scanZeroDetailService.updateBatchById(updateZerpPackageList);
 			}
 
+			orderPackageCodes.forEach(orderPackageCode -> {
+				DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO();
+				downPackageTrayVO.setOrderPackageCodes(orderPackageCode);
+				downPackageTrayVO.setWarehouseId(warehouseId);
+				downPackageTrayVO.setRemark("PC批量签收下架解托");
+				updownTypeClient.downPackageOrDelTray(downPackageTrayVO);
+			});
+
+
 			//生成签收记录
 			trunklineCarsSignLogService.addList(updateCarsLoadScanList, "PC批量签收");