From 7304ca69c45f9a2db2c34aebba0a312241a08974 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 1 Apr 2025 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=8D=B8=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CarsLoadAsyncServiceImpl.java        |  2 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
index 5d1d81720..5946e2af6 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
@@ -596,7 +596,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordEntity.setDealTime(new Date());
 				abnormalRecordEntity.setDealUserId(userId);
 				abnormalRecordEntity.setDealUserName(nickName);
-				abnormalRecordEntity.setRemark("无卸车记录,已入库，系统判定自动完结");
+				abnormalRecordEntity.setRemark("无卸车记录,已在其他车次入库，系统判定自动完结");
 			}
 			addList.add(abnormalRecordEntity);
 //			abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
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 a96a20787..42a9e2c92 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
@@ -13618,7 +13618,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
 					updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
 					updateScanEntity.setIsData(1);
-					updateScanList.add(updateScanEntity);
+
+					DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
+					if(Objects.isNull(parcelList)){
+						updateScanList.add(updateScanEntity);
+					}
+
+
 				}
 			});
 
@@ -13675,14 +13681,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							});
 						}
 
-						DistributionParcelListEntity parcelList = parcelMap.get(orderPackageCode);
-						if(Objects.isNull(parcelList)){
-							TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
-							updateEntity.setId(trunklineAdvanceDetailEntity.getId());
-							updateEntity.setNowWarehouseId(warehouseId);
-							updateEntity.setNowWarehouseName(warehouseName);
-							updateNowWarehouseList.add(updateEntity);
-						}
+						TrunklineAdvanceDetailEntity updateEntity = new TrunklineAdvanceDetailEntity();
+						updateEntity.setId(trunklineAdvanceDetailEntity.getId());
+						updateEntity.setNowWarehouseId(warehouseId);
+						updateEntity.setNowWarehouseName(warehouseName);
+						updateNowWarehouseList.add(updateEntity);
 					}
 				});