推送老系统复核签收时间、维护计划数量

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java

@@ -125,6 +125,11 @@ public class SignPushDataDTO {
 	 */
 	private String kind;
 
+	/**
+	 * 复核时间
+	 */
+	private Date reviewTime;
+
 	/**
 	 * 签收客户集合
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -1905,6 +1905,7 @@
         lddl.kind AS kind,
         lddl.warehouse_id AS warehouseId,
         lddl.warehouse_name AS warehouseName,
+        lds.signing_time AS reviewTime,
         CASE lddl.type
         WHEN 1 THEN 2
         WHEN 2 THEN 1

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1364,7 +1364,7 @@
         ldr.delivery_phone AS  phone,
         (ldr.reservation_num + ldr.reservation_stock_list_num) AS plan,
         (lds.loaded_number + lds.loadedin_number) AS actualPlan,
-        lddl.delivery_number AS delivery,
+        ldr.reservation_num  AS delivery,
         (lds.received_quantity + lds.receivedin_quantity) AS sign,
         lds.signing_status AS state,
         lds.create_time AS createTime,

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

@@ -4131,9 +4131,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> newReservationIds = reservationInfos.stream().map(DistributionReservationDTO::getId).collect(Collectors.toList());
 		List<DistributionReservationEntity> distributionReservationEntities = distributionReservationMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda().in(DistributionReservationEntity::getId, newReservationIds));
 		List<DistributionReservationEntity> needStockUpReservationList = distributionReservationEntities.stream().filter(r -> r.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue())).collect(Collectors.toList());
+
 		DistributionStockupEntity stockupEntity = null;
 		BladeUser user = AuthUtil.getUser();
 		if (Func.isNotEmpty(needStockUpReservationList)) {
+			log.info("修改市配配送任务需要进行备货的预约计划>>>reservationCodes:{}",needStockUpReservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(",")));
 			//需要进行备货的预约列表
 			stockupEntity = new DistributionStockupEntity();
 			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
@@ -4159,6 +4161,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionStockupInfoEntity.setStockupId(stockupEntity.getId());
 				distributionStockupInfoEntity.setStockUpType(distributionReservationEntity.getDeliveryType());
 				distributionStockupInfoService.save(distributionStockupInfoEntity);
+				distributionReservationService.update(Wrappers.<DistributionReservationEntity>update().lambda()
+					.eq(DistributionReservationEntity::getId,distributionReservationEntity.getId())
+					.set(DistributionReservationEntity::getStockupStatus,ReservationStockupStatusConstant.daibeihuo.getValue())
+				);
+				log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId());
 			}
 		}
 		//这里暂时不考虑出现新增的情况
@@ -4194,8 +4201,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionSignforEntity.setSigningStatus(SignforStatusConstant.daiqianshou.getValue());
 				distributionSignforEntity.setDriverSigning(SignforStatusConstant.daiqianshou.getValue());
 				distributionSignforService.save(distributionSignforEntity);
-				distributionReservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
-				distributionReservationMapper.updateById(distributionReservationEntity);
 			}
 		});