From b1e23c5b3a9b465d2812c2e91c58edef3b62dc8e Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 21 Jan 2025 18:55:14 +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

---
 .../api/TripartiteTransferApiController.java    |  2 +-
 .../service/ITrunklineCarsLoadService.java      |  2 +-
 .../impl/TrunklineCarsLoadServiceImpl.java      | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java
index 9e9e6b808..8fbaf34cc 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java
@@ -114,7 +114,7 @@ public class TripartiteTransferApiController {
 			}
 
 
-			return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车");
+			return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",1);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
index 464d31bd8..b7c695561 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
@@ -138,7 +138,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R updateLoadScanFinalNodeIdById(LoadCarsDTO loadCarsDTO);
 
-	R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark);
+	R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark,Integer unloadType);
 
 	R transferUnloadZero(Long carsLoadScanId,Long loadId, String waybillNo, Integer enterNum, Long warehouseId, Integer unbindTray, String trayCode, String orderCode, String remark,List<ZeroPackageDTO> zeroPackageList);
 
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 db62c7bd1..eb1e41373 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
@@ -6915,7 +6915,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark) {
+	public R transferUnloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark,Integer unloadType) {
 		log.info("#############transferUnloadPackage: 三方中转卸车包件");
 
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@@ -6939,10 +6939,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			return R.fail(405,"配载计划节点信息不存在");
 //		}
 
+		String unloadTypeStr = "";
+		if(unloadType == 1){
+			unloadTypeStr = "扫码";
+		}else if(unloadType == 2){
+			unloadTypeStr = "托盘";
+		}else if(unloadType == 3){
+			unloadTypeStr = "批量";
+		}
+
 		Long trayId = null;
 		String trayName = null;
 		String trayCode = null;
-		String content = "包件在 "+warehouseName+" 扫码 卸车，车次号："+loadCode+",由["+carrierName+"] 承运.";
+		String content = "包件在 "+warehouseName+" "+unloadTypeStr+" 卸车，车次号："+loadCode+",由["+carrierName+"] 承运.";
 
 		//判断包件是否已入库
 //		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
@@ -7279,7 +7288,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String scanCode = carsLoadScanEntity.getScanCode();
 			if (type == 1) {
 				//包件
-				transferUnloadPackage(loadId, scanCode, warehouseId, 0, "三方中转托盘正常卸车");
+				transferUnloadPackage(loadId, scanCode, warehouseId, 0, "三方中转托盘正常卸车",2);
 			} else if (type == 2) {
 				String waybillNo = carsLoadScanEntity.getWaybillNo();
 				Integer num = carsLoadScanEntity.getNum();
@@ -7894,7 +7903,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		for (UnloadPackageDTO unloadPackageDTO : unloadPackageList) {
 			String orderPackageCode = unloadPackageDTO.getOrderPackageCode();
-			transferUnloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车");
+			transferUnloadPackage(loadId, orderPackageCode, warehouseId, 1, "批量卸车包件正常卸车",3);
 		}