From ccf8c0ad555ff463ddbc95cee3cd5ae9178c836c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 31 Jul 2024 17:12:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D=202.?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB=E7=BB=9F=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/vo/TrunklineCarsLoadVO.java     |  1 +
 .../impl/TrunklineCarsLoadServiceImpl.java    |  6 +--
 .../impl/WarehouseTrayTypeServiceImpl.java    | 43 ++++++++++++-------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java
index 5fa063a23..61878dbde 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java
@@ -51,5 +51,6 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 	private Integer planUnloadNum;
 	private Integer totalLoadingNum;
 	private String loadCarsNo;
+	private String unloadStatus;
 
 }
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 b1b10d0bd..d1b61c6f2 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
@@ -1045,10 +1045,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
 				throw new CustomerException(400, "当前节点为终点");
 			}
-			if (!"10".equals(nodeStatus)) {
-				log.warn("#############unloadByLoadId: 当前节点未到车 nowWarehouseId={} nodeStatus={}", nowWarehouseId, nodeStatus);
-				throw new CustomerException(400, "当前节点未到车");
-			}
 
 			currentCarsLoadLineEntity.setUnloadStatus("1");
 			currentCarsLoadLineEntity.setUnloadUserId(AuthUtil.getUserId());
@@ -6735,6 +6731,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 			Integer sort = carsLoadLineEntity.getSort();
 			String nodeStatus1 = carsLoadLineEntity.getNodeStatus();
+			String unloadStatus = carsLoadLineEntity.getUnloadStatus();
+			trunklineCarsLoadVO.setUnloadStatus(unloadStatus);
 			TrunklineCarsLoadLineEntity upCarsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndSort(loadId, sort - 1);
 			String nodeStatus = upCarsLoadLineEntity.getNodeStatus();
 			trunklineCarsLoadVO.setLastStartCarStatus(0);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 3e295c2c1..01451cb52 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -4184,17 +4184,36 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	private void saveOrderInfo(String orderCode, Integer oldWarehouseId, Long newWarehouseId) {
 
 		//通过订单号查询暂存单
-		AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode);
+		Integer total = 0;
+		AdvanceEntity advanceEntity = null;
+		WayBillEntity wayBillEntity = null;
+		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
+		for (AdvanceEntity entity : advanceList) {
+			total = total + entity.getTotal();
+			String waybillNo = entity.getWaybillNo();
+			if(StringUtil.isNotBlank(waybillNo)){
+				WayBillEntity wb = wayBillClient.getByWaybillNo(waybillNo);
+				if(!Objects.isNull(wb)){
+					Integer oWid = wb.getWarehouseId();
+					if(oldWarehouseId.equals(oWid)){
+						advanceEntity = entity;
+						wayBillEntity = wb;
+						break;
+					}
+				}
+			}
+		}
+
 		if(Objects.isNull(advanceEntity)){
-			log.warn("#################saveOrderInfo: 未查询单订单信息 orderCode={}",orderCode);
-			throw new CustomerException(403,"未查询单订单信息");
+			log.warn("#################saveOrderInfo: 暂存单信息不存在 orderCode={}",orderCode);
+			throw new CustomerException(403,"暂存单信息不存在");
 		}
+
 		Integer advanceId = advanceEntity.getId();
-		Integer waybillStatus = advanceEntity.getWaybillStatus();
-		String waybillNo = advanceEntity.getWaybillNo();
-		if(waybillStatus.equals(1)){
-			log.warn("#################saveOrderInfo: 订单还未开单 orderCode={}",orderCode);
-			throw new CustomerException(403,"订单还未开单");
+
+		if(Objects.isNull(wayBillEntity)){
+			log.warn("#################saveOrderInfo: 暂存单暂未有运单信息 orderCode={}",orderCode);
+			throw new CustomerException(403,"暂存单暂未有运单信息");
 		}
 
 
@@ -4207,14 +4226,6 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			throw new CustomerException(403,"未查询单订单信息");
 		}
 
-		Integer total = 0;
-		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
-		for (AdvanceEntity entity : advanceList) {
-			total = total + entity.getTotal();
-		}
-
-		WayBillEntity wayBillEntity = wayBillClient.getByWayBillByAdvanceId(advanceId);
-
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(newWarehouseId);
 		if(Objects.isNull(basicdataWarehouseEntity)){
 			log.warn("#################saveOrderInfo: 未查询到仓库信息 newWarehouseId={}",newWarehouseId);