From 2a341fa8309cb922d08d66fb8f30cf196b0f282f Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 18 Oct 2024 18:58:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E8=A3=85=E8=BD=A6bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../patch/jobhandle/SyncOrderInfoToPlatform.java     |  5 +++--
 .../mapper/TrunklineCarsLoadScanMapper.java          |  2 ++
 .../trunkline/mapper/TrunklineCarsLoadScanMapper.xml |  8 ++++++++
 .../service/ITrunklineCarsLoadScanService.java       |  2 ++
 .../impl/TrunklineCarsLoadScanServiceImpl.java       |  5 +++++
 .../service/impl/TrunklineCarsLoadServiceImpl.java   | 12 +++++-------
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
index 6a2ecffbf..807c8268c 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
@@ -902,9 +902,10 @@ public class SyncOrderInfoToPlatform {
 			Integer id = waybillJSON.getInt("id");
 			String waybillNo = waybillJSON.getStr("waybillNo");
 
-			List<String> list = advanceClient.findListByWaybillNo(waybillNo);
+			List<String> orderCodes = new ArrayList<>();
+			orderCodes.add(waybillNo);
 
-			syncOrderInfoService.handleData(list,oldId,warehouseId,null,null);
+			syncOrderInfoService.handleData(orderCodes,oldId,warehouseId,null,null);
 
 			warehouseMappingDataService.updateSyncWaybillOrderRecordById(id,1);
 		});
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
index 1c837c4a4..8038cf6a7 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
@@ -187,4 +187,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	Integer findStockNumByLoadId(@Param("loadId") Long loadId);
+
+	TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(@Param("loadId") Long loadId, @Param("orderPackageCode") String orderPackageCode, @Param("scanStatus") String scanStatus);
 }
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 897cd4113..1d0b902e6 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
@@ -1009,4 +1009,12 @@
     </select>
 
 
+    <select id="findEntityByLoadIdAndOrderPackageCodeAndScanStatus" parameterType="">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where scan_code = #{orderPackageCode}
+          and load_id = #{loadId}
+          and scan_status = #{scanStatus}
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
index 4cf654b4a..7c436c60b 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
@@ -183,4 +183,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId);
 
 	Integer findStockNumByLoadId(Long loadId);
+
+	TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(Long loadId, String orderPackageCode, String scanStatus);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
index 4c242ea94..a1667db4b 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
@@ -469,4 +469,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findStockNumByLoadId(loadId);
 	}
 
+	@Override
+	public TrunklineCarsLoadScanEntity findEntityByLoadIdAndOrderPackageCodeAndScanStatus(Long loadId, String orderPackageCode, String scanStatus) {
+		return baseMapper.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId,orderPackageCode,scanStatus);
+	}
+
 }
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 0732c2fd1..92d65127b 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
@@ -3573,13 +3573,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long loadScanId = null;
 
 
-		TrunklineCarsLoadScanEntity trunklineCarsLoadScan = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+		TrunklineCarsLoadScanEntity trunklineCarsLoadScan = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId, orderPackageCode,"1");
 		if(!Objects.isNull(trunklineCarsLoadScan)){
-			String scanStatus = trunklineCarsLoadScan.getScanStatus();
-			if("1".equals(scanStatus)){
-				log.warn("##################loadingScan: 包件已装车 orderPackageCode={}", orderPackageCode);
-				return Resp.scanFail(405,"包件已装车","包件已装车");
-			}
+			log.warn("##################loadingScan: 包件已装车 orderPackageCode={}", orderPackageCode);
+			return Resp.scanFail(405,"包件已装车","包件已装车");
 		}
 
 
@@ -6452,7 +6449,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long waybillId = null;
 
 		Date date = new Date();
-		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+//		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCodeAndScanStatus(loadId, orderPackageCode,"1");
 		if (Objects.isNull(carsLoadScanEntity)) {
 			//因为没有装车记录，补装车记录
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);