Merge branch 'dev' into pre-production

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));
@@ -5635,7 +5636,12 @@ 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.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+				map.put("预约单送货日期", DateUtil.format(distributionReservationEntity.getReservationDate(), "yyyy-MM-dd") + " " +period);
 
 				map.put("客户名称", distributionReservationEntity.getConsignee());