From 60ca6e578fc29f6ecbb80939aa053c185925890a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 20 May 2024 17:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=96=E6=B6=88=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=81=A2=E5=A4=8D=E5=A4=87=E8=B4=A7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 99d77bc5d..6349e6795 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/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();