维护配送任务和客户之间的状态

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

@@ -5845,7 +5845,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		int row = distributionReservationMapper.cancelReservationPackage(reservationId, orderPackageId);
 //				查询该包件是否进行装车
 		if (row == 1) {
-			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).eq(DistributionLoadscanEntity::getReservationId, reservationId).eq(DistributionLoadscanEntity::getPackageId, orderPackageId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).eq(DistributionLoadscanEntity::getReservationId, reservationId)
+				.eq(DistributionLoadscanEntity::getPackageId, orderPackageId)
+				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 			if (Func.isNotEmpty(loadscanEntity)) {
 				//修改包件状态  达到回库的状态
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId());
@@ -6941,16 +6943,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionReservationEntity> distributionReservationEntities = baseMapper.selectReservationByDeliveryListId(deliveryId);
 
 		//查询客户列表
-//		log.info(">>>>>>>>>>>>>>> 车次状态维护3 代码执行 list={}",list);
 		if (Func.isNotEmpty(distributionReservationEntities)){
+			log.info(">>>>>>>>>>>>>>> 维护配送车次客户数量:{}",distributionReservationEntities.size());
 			boolean flag = distributionReservationEntities.stream().allMatch(a -> ReservationSigningStatusConstant.yiqianshou.getValue().equals(a.getSigningStatus()));
 			log.info(">>>>>>>>>>>>>>> 客户是否完全签收 代码执行 list:{}",flag);
 			if (flag) {
 				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 			}
 		}else {
-			log.error(">>>>>>>>>>>>>>> 查询配送车次错误 代码执行 deliveryId={}",deliveryId);
-			throw new RuntimeException("查询配送客户信息失效!!!");
+			//查询不出此配送任务存在预约信息，进行配送车次取消
+			this.cancelDelivery(deliveryListEntity.getId());
+			log.info(deliveryListEntity.getTrainNumber()+">>>>>>>>>>>>>>> 取消全部配送信息:{}",deliveryId);
+			log.info(">>>>>>>>>>>>>>> 进行配送车次任务取消",deliveryId);
 		}