From 9711d656d38df70611f3fab05433ea5124443539 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Jan 2024 17:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=A3=85=E8=BD=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BF=90=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=E3=80=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionReservationMapper.xml | 1 +
 .../service/impl/DistributionSignforServiceImpl.java            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index dd74a5209..a571211db 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -1158,6 +1158,7 @@
             ldsa.order_code,
             ldrs.is_have_data,
             ldsa.id AS id,
+            ldsa.waybill_number AS waybillNumber,
             ldrs.is_zero
         FROM
             logpm_distribution_reservation AS lds
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 2997c00de..4b5ce1413 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -389,7 +389,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							if (Func.isNotEmpty(packageLoadingMap.get(p.getId()))){
 								DistributionLoadscanEntity distributionLoadscanEntity = packageLoadingMap.get(p.getId());
 								detailDTO.setLoadingTime(distributionLoadscanEntity.getScanTime());
-								detailDTO.setLoadingStatusName(OrderPackageLoadingStatusConstant.weizhuancghe.getName());
+								detailDTO.setLoadingStatusName(OrderPackageLoadingStatusConstant.yizhuangche.getName());
 								if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){
 									//签收
 									detailDTO.setSigningTime(distributionLoadscanEntity.getSigningTime());