From 2cc3aac565f8f14c9bb58b24539e8c5ba37d327f Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 16 Apr 2024 15:15:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E9=80=BB=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/mq/OpenOrderToLoadListener.java     |  9 ++++++++-
 .../impl/TrunklineCarsLoadServiceImpl.java        | 15 ++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenOrderToLoadListener.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenOrderToLoadListener.java
index bda3e3f9b..0e0da40b5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenOrderToLoadListener.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenOrderToLoadListener.java
@@ -47,7 +47,7 @@ public class OpenOrderToLoadListener {
 			JSONArray advanceIds = jsonObject.getJSONArray("advanceIds");
 			Set<Long> loadIds = new HashSet<>();
 			for (Object object : advanceIds) {
-				Long advanceId = JSONUtil.toBean((JSONObject) object, Long.class);
+				Long advanceId = (Long) object;
 				List<TrunklineAdvanceDetailEntity> advanceDetailEntityList = advanceDetailService.findListByAdvanceId(advanceId);
 				for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) {
 					String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
@@ -67,6 +67,9 @@ public class OpenOrderToLoadListener {
 					String warehouseName = carsLoadScanEntity.getWarehouseName();
 					String orderCode = carsLoadScanEntity.getOrderCode();
 					Long finalNodeId = carsLoadScanEntity.getFinalNodeId();
+					Long createUser = carsLoadScanEntity.getCreateUser();
+					String tenantId = carsLoadScanEntity.getTenantId();
+					Long createDept = carsLoadScanEntity.getCreateDept();
 					TrunklineCarsLoadLineEntity carsLoadLineEntity = carsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 					if(Objects.isNull(carsLoadLineEntity)){
 						continue;
@@ -74,6 +77,10 @@ public class OpenOrderToLoadListener {
 					TrunklineCarsOrderEntity trunklineCarsOrderEntity = carsOrderService.findEntityByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(loadId, warehouseId, orderCode, waybillNo);
 					if(Objects.isNull(trunklineCarsOrderEntity)){
 						trunklineCarsOrderEntity = new TrunklineCarsOrderEntity();
+						trunklineCarsOrderEntity.setTenantId(tenantId);
+						trunklineCarsOrderEntity.setCreateUser(createUser);
+						trunklineCarsOrderEntity.setCreateDept(createDept);
+						trunklineCarsOrderEntity.setUpdateUser(createUser);
 						trunklineCarsOrderEntity.setLoadId(loadId);
 						trunklineCarsOrderEntity.setNodeId(warehouseId);
 						trunklineCarsOrderEntity.setNodeName(warehouseName);
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 95adfb6c5..067f42525 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
@@ -2125,12 +2125,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					fromWarehouseName = fromWarehouseEntity.getName();
 				}
 				WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
-				if (Objects.isNull(waybillEntity)) {
-					log.warn("##################loadingScan: 运单信息不存在 waybillNumber={}", waybillNumber);
-					return R.fail(405, "运单信息不存在");
+				if (!Objects.isNull(waybillEntity)) {
+					waybillId = waybillEntity.getId();
+					waybillNo = waybillEntity.getWaybillNo();
 				}
-				waybillId = waybillEntity.getId();
-				waybillNo = waybillEntity.getWaybillNo();
 				carsLoadScanEntity.setWaybillId(waybillId);
 				carsLoadScanEntity.setWaybillNo(waybillNo);
 				carsLoadScanEntity.setOrderCode(orderCode);
@@ -2170,11 +2168,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				fromWarehouseName = fromWarehouseEntity.getName();
 			}
 			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if (Objects.isNull(waybillEntity)) {
-				log.warn("##################loadingScan: 运单信息不存在 waybillNo={}", waybillNo);
-				return R.fail(405, "运单信息不存在");
+			if (!Objects.isNull(waybillEntity)) {
+				waybillId = waybillEntity.getId();
 			}
-			waybillId = waybillEntity.getId();
+
 
 			carsLoadScanEntity.setWaybillId(waybillId);
 			carsLoadScanEntity.setWaybillNo(waybillNo);