From 8c84cbd2c3bbc38e20569d07689fb86d94ff912b Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 6 Nov 2024 14:00:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=B9=B2=E7=BA=BF=E5=BC=80?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改干线开单时发送消息包含运单发站到站信息
---
 .../impl/TrunklineWaybillPackageServiceImpl.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
index ebcd64cd3..f0dc3607c 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java
@@ -76,12 +76,14 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 
 		List<String> orderPackageCodes = new ArrayList<>();
 		List<TrunklineWaybillPackageEntity> ls = new ArrayList<>();
+		String nowWarehouseName = null;
 		for (TrunklineAdvanceDetailVO trunklineAdvanceDetailVO : list) {
 			Long advanceDetailId = trunklineAdvanceDetailVO.getId();
 			Long advanceId = trunklineAdvanceDetailVO.getAdvanceId();
 			String orderCode = trunklineAdvanceDetailVO.getOrderCode();
 			String orderPackageCode = trunklineAdvanceDetailVO.getOrderPackageCode();
 			String packageStatus = trunklineAdvanceDetailVO.getPackageStatus();
+			nowWarehouseName = trunklineAdvanceDetailVO.getWarehouseName();
 			TrunklineWaybillPackageEntity waybillPackageEntity = new TrunklineWaybillPackageEntity();
 			waybillPackageEntity.setWaybillId(waybillId);
 			waybillPackageEntity.setWaybillNo(waybillNo);
@@ -128,6 +130,9 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 				jsonObject.put("totalCount",totalCount);
 				jsonObject.put("totalPrice", "0");
 				jsonObject.put("waybillNo", waybillNo);
+				jsonObject.put("departureWarehouseName", departureWarehouseName);
+				jsonObject.put("destinationWarehouseName", destinationWarehouseName);
+				String finalNowWarehouseName = nowWarehouseName;
 				NodePushMsg msg = NodePushMsg.builder()
 					.operator(AuthUtil.getNickName())
 					.operatorTime(new Date())
@@ -135,12 +140,14 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 					.node(WorkNodeEnums.OPEN_ORDER)
 					.startWarehouse(departureWarehouseName)
 					.endWarehouse(destinationWarehouseName)
-					.warehouse(departureWarehouseName)
+					.warehouse(finalNowWarehouseName)
 					.main(jsonObject)
 					.content(value.stream().map(data->{
 						return PushData.builder()
 							.packageCode(data.getOrderPackageCode())
-							.warehouseName(departureWarehouseName)
+							.waybillStartWarehouse(departureWarehouseName)
+							.destinationWarehouse(destinationWarehouseName)
+							.warehouseName(finalNowWarehouseName)
 							.orderCode(data.getOrderCode())
 							.waybillNumber(waybillNo)
 							.build();