Browse Source

Merge branch 'dev' into pre-production

master
汤建军 10 months ago
parent
commit
38aff84b55
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

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

@ -3756,8 +3756,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
if (reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum() == 0){ if (reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum() == 0){
DistributionReservationDTO distributionReservationDTO = new DistributionReservationDTO(); DistributionReservationDTO distributionReservationDTO = new DistributionReservationDTO();
distributionReservationDTO.setId(reservationId); distributionReservationDTO.setId(reservationId);
log.info("#################系统判定取消预约任务:{}",reservationEntity.getReservationCode());
distributionReservationDTO.setCancelReason("无效配送任务,系统取消"); distributionReservationDTO.setCancelReason("无效配送任务,系统取消");
this.cancelReservation(distributionReservationDTO); this.cancelReservation(distributionReservationDTO);
}else { }else {
this.updateById(reservationEntity); this.updateById(reservationEntity);
} }

Loading…
Cancel
Save