From 8277b9c27197ded5aaf4fd78c7281a6644b0c8ca Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 29 Jul 2024 15:41:17 +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

---
 .../service/impl/TrunklineAdvanceDetailServiceImpl.java    | 2 +-
 .../service/impl/TrunklineCarsLoadServiceImpl.java         | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
index 8bc0cc346..ddcc1bdd6 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
@@ -300,7 +300,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) {
 
 		//判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值
-		if (StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
+		if (StringUtil.isBlank(orderDetailsDTO.getDeliveryTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
 			return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值");
 		}
 
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 2726d0300..78d126c6b 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
@@ -1749,7 +1749,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			carsLoadEntity.setLoadStatus("40");
 		}else{
-			carsLoadEntity.setLoadStatus("20");
+			Long startWarehouseId = Long.parseLong(split[0]);
+			if(startWarehouseId.equals(warehouseId)){
+				carsLoadEntity.setLoadStatus("0");
+			}else{
+				carsLoadEntity.setLoadStatus("20");
+			}
 		}
 
 		updateById(carsLoadEntity);