From 9b0622f64312e59c2df24b23c6f938e1297f335c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Nov 2023 18:39:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B8=82=E9=85=8D=E5=8D=95=E5=AD=90=20?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E6=97=A5=E6=9C=9F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index ba9623202..2b27a2cf2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -5635,7 +5635,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				map.put("商场电话", distributionReservationEntity.getReservationCode());
 				String taskTime = byId.getTaskTime();
 				log.info("#############送货日期： id={} taskTime={}",id,taskTime);
-				map.put("送货日期", taskTime + " 全天");
+				String periodOfTime = distributionReservationEntity.getPeriodOfTime();
+
+				String period = DictBizCache.getValue("period_of_time", periodOfTime);
+
+				map.put("送货日期", DateUtil.format(distributionReservationEntity.getReservationDate(), "yyyy-MM-dd") + " " +period);
 
 				map.put("客户名称", distributionReservationEntity.getConsignee());
 

From f5426b30f5d72a8e67e398b98ab57970f2c4bc26 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Nov 2023 18:54:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B8=82=E9=85=8D=E5=8D=95=E5=AD=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 2b27a2cf2..ea3a6bd74 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -5626,6 +5626,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			for (DistributionReservationEntity distributionReservationEntity : distributionReservationEntityList) {
 				Map<String, Object> map = new HashMap<>();
 				log.debug(">>>> distributionReservationEntity {}", distributionReservationEntity);
+				map.put("车次号", byId.getTrainNumber());
 				map.put("配送单号", distributionReservationEntity.getReservationCode());
 				String fileTypeName = QRCodeUtil.createCodeToFile(distributionReservationEntity.getReservationCode());
 				map.put("配送单二维码", QRCodeUtil.getEmpAutograph(fileTypeName));
@@ -5639,7 +5640,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 				String period = DictBizCache.getValue("period_of_time", periodOfTime);
 
-				map.put("送货日期", DateUtil.format(distributionReservationEntity.getReservationDate(), "yyyy-MM-dd") + " " +period);
+				map.put("预约单创建时间", DateUtil.format(distributionReservationEntity.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+				map.put("预约单送货日期", DateUtil.format(distributionReservationEntity.getReservationDate(), "yyyy-MM-dd") + " " +period);
 
 				map.put("客户名称", distributionReservationEntity.getConsignee());