Merge branch 'dev' into pre-production

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

@@ -3753,6 +3753,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			}else {
 				reservationEntity.setReservationStockListNum(0);
 			}
+			if (reservationEntity.getReservationNum() + reservationEntity.getReservationStockListNum() == 0){
+				DistributionReservationDTO distributionReservationDTO = new DistributionReservationDTO();
+				distributionReservationDTO.setId(reservationId);
+				distributionReservationDTO.setCancelReason("无效配送任务，系统取消");
+				this.cancelReservation(distributionReservationDTO);
+			}
 			this.updateById(reservationEntity);
 		}