Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -694,7 +694,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
 										loadscanEntity.setOneClick(1);
 										loadscanEntity.setScanType("2");
-										loadscanEntity.setScanStatus("1");
+										loadscanEntity.setScanStatus("2");
 										loadscanEntity.setIsInsert(1);
 										loadscanEntity.setMsg("司机按照预约整托装车");
 										loadscanEntity.setTrayNo(trayTypeDataVO.getTrayCode());
@@ -5634,7 +5634,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				map.put("商场名称", distributionReservationEntity.getMallName());
 				map.put("商场电话", distributionReservationEntity.getReservationCode());
 
-				map.put("送货日期", DateUtil.format(distributionReservationEntity.getReservationDate(), "yyyy-MM-dd") + " 全天");
+				map.put("送货日期", byId.getTaskTime() + " 全天");
 
 				map.put("客户名称", distributionReservationEntity.getConsignee());