From 964b176bf13ce4dc94a4a7950750adab4adeb594 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 29 Oct 2024 00:33:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=B9=B2?=
 =?UTF-8?q?=E7=BA=BF=E5=8D=B8=E8=BD=A6=E5=8D=B8=E8=BD=A6=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 卸车和卸车确认回传增加运单号
---
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

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 448849d43..35829b177 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
@@ -522,6 +522,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					.content(value.stream().map(data->{
 						return PushData.builder()
 							.packageCode(data.getPackageCode())
+							.waybillNumber(data.getWaybillNumber())
 							.warehouseName(warehouseEntity.getName())
 							.orderCode(data.getOrderCode())
 							.build();
@@ -9552,6 +9553,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						.content(Collections.singletonList(PushData.builder()
                                 .packageCode(orderPackageCode)
                                 .warehouseName(warehouseName)
+								.waybillNumber(parcelListEntity.getWaybillNumber())
 								.destinationWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getAcceptWarehouseName():"")
 								.waybillStartWarehouse(ObjectUtil.isNotEmpty(parcelListEntity)  ? parcelListEntity.getSendWarehouseName():"")
                                 .orderCode(orderCode)