Merge branch 'dev' into pre-production

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

@@ -4274,11 +4274,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//这里就是取消的预约单，进行状态回退
 			DistributionReservationEntity reservationEntity = n.get(0);
 			reservationEntity.setReservationStatus(ReservationStatusConstant.yiqueren.getValue());
+			reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 			distributionReservationMapper.updateById(reservationEntity);
 			//删除配送预约中间表信息
 			distributionSignforMapper.deleteByReservationAndDeliveryId(reservationEntity.getId(), deliveryListEntity.getId());
 			//删除Redis中的reservationCode
 			bladeRedis.del(user.getTenantId()+":"+ ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME+":reservationLock"+reservationEntity.getReservationCode());
+			//取消备货中间表
+			distributionStockupInfoService.update(Wrappers.<DistributionStockupInfoEntity>update().lambda()
+				.eq(DistributionStockupInfoEntity::getReservationId,reservationEntity.getId())
+				.set(DistributionStockupInfoEntity::getStockStatus,"4")
+			);
 		});
 		//修改备货信息
 		String kind = deliveryListEntity.getKind();