From 91e20882924ce9fdfeaf0fcd9cb4d68360118a6f Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 21 Mar 2024 01:51:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BE=85=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=9A=84=E6=95=B0=E6=8D=AEbug-4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 ffb6f62ea..5be495f52 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
@@ -1827,9 +1827,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //			distributionSignfor.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionSignfor.getType()));
 			DistributionSignforExcel signforExcel = new DistributionSignforExcel();
 			BeanUtils.copyProperties(d, signforExcel);
+			signforExcel.setOrderCode(d.getStockArticleId());
+			signforExcel.setDeliveryTime(d.getLoadingTime());
+
 //			signforExcel.setConsignee();
-//			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());
-//			signforExcel.setDeliveryTypeName(value);
+			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());
+			signforExcel.setDeliveryTypeName(value);
 			String value1 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getSigningStatus());
 			signforExcel.setSigningStatusName(value1);
 			String value2 = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_SIGNFOR_STATUS, d.getDriverSigning());