From 3d435c4cc2bc89b841a1eb386bdf517e03d95abb Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 26 Apr 2024 16:39:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=8C=E8=A3=85=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A0=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/trunkline/mq/AdvanceToLoadListener.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
index a9d135146..6772e7a32 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
@@ -87,13 +87,16 @@ public class AdvanceToLoadListener {
 				if(r.getCode() == 200){
 					carsLoadScanEntity.setFromWarehouseId(warehouseId);
 					carsLoadScanEntity.setOrderCode(orderCode);
+					carsLoadScanEntity.setIsData(1);
 					Date createTime = carsLoadScanEntity.getCreateTime();
 					Long createUser = carsLoadScanEntity.getCreateUser();
 					Long createDept = carsLoadScanEntity.getCreateDept();
+					String tenantId = carsLoadScanEntity.getTenantId();
 					carsLoadScanService.updateById(carsLoadScanEntity);
 					loadIds.add(carsLoadScanEntity.getLoadId());
 					DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 					parcelListEntity.setWarehouseEntryTimeEnd(CommonUtil.addDate(createTime,-60));
+					parcelListEntity.setTenantId(tenantId);
 					parcelListEntity.setUpdateUser(createUser);
 					parcelListEntity.setCreateUser(createUser);
 					parcelListEntity.setCreateDept(createDept);

From 452db4fb14a2bc0ec0911aeee0268be6018a46c9 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 26 Apr 2024 16:53:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=8C=E8=A3=85=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A0=E5=9B=9E=E6=98=BEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/trunkline/mq/AdvanceToLoadListener.java     | 1 -
 .../trunkline/service/impl/TrunklineAdvanceServiceImpl.java    | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
index 6772e7a32..d01cc828d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceToLoadListener.java
@@ -96,7 +96,6 @@ public class AdvanceToLoadListener {
 					loadIds.add(carsLoadScanEntity.getLoadId());
 					DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 					parcelListEntity.setWarehouseEntryTimeEnd(CommonUtil.addDate(createTime,-60));
-					parcelListEntity.setTenantId(tenantId);
 					parcelListEntity.setUpdateUser(createUser);
 					parcelListEntity.setCreateUser(createUser);
 					parcelListEntity.setCreateDept(createDept);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index 123e3421e..ce9f62387 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -60,6 +60,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
 		Long advanceId = advanceDetailEntity.getAdvanceId();
+		String tenantId = advanceDetailEntity.getTenantId();
 		log.info("############saveOrderAndPackage: 保存订单和包件信息 orderPackageCode={}",orderPackageCode);
 
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@@ -107,6 +108,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			String waybillNo = advanceEntity.getWaybillNo();
 
 			stockArticleEntity = new DistributionStockArticleEntity();
+			stockArticleEntity.setTenantId(tenantId);
 			stockArticleEntity.setCreateUser(userId);
 			stockArticleEntity.setUpdateUser(userId);
 			stockArticleEntity.setCreateDept(deptId);
@@ -228,6 +230,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		parcelList.setCreateUser(userId);
 		parcelList.setUpdateUser(userId);
 		parcelList.setCreateDept(deptId);
+		parcelList.setTenantId(tenantId);
 		parcelList.setWarehouse(warehouseEntity.getName());
 		parcelList.setWarehouseId(warehouseId);
 		String waybillNo = advanceEntity.getWaybillNo();