From bfd042c23525b2d5ad4ec03dfa5a6772c0991b12 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 15 Nov 2023 18:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=BC=96=E8=BE=91=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DisStockListDetailMapper.java    | 2 +-
 .../com/logpm/distribution/mapper/DisStockListDetailMapper.xml | 2 +-
 .../service/impl/DistributionReservationServiceImpl.java       | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.java
index 2675500a4..cdcb7f543 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.java
@@ -56,7 +56,7 @@ public interface DisStockListDetailMapper extends BaseMapper<DisStockListDetailE
 	 * 删除该客户下指定库存品类的库存品包件信息
 	 * @param id
 	 */
-    void deleteInventoryByStockListId(@Param("reservationStockListId") Long id);
+    void deleteInventoryByStockListId(@Param("stockListId") Long id ,@Param("reservationId")Long reservationId);
 
 	/**
 	 * 删除客户下的库存品包件信息
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml
index ee738d58e..fe4c4027c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DisStockListDetailMapper.xml
@@ -30,7 +30,7 @@
         <result column="reserve5" property="reserve5"/>
     </resultMap>
     <delete id="deleteInventoryByStockListId">
-        DELETE  FROM  logpm_dis_stock_list_detail WHERE reservation_stock_list_id = #{reservationStockListId}
+        DELETE  FROM  logpm_dis_stock_list_detail WHERE stock_list_id = #{stockListId} and reservation_id = #{reservationId}
     </delete>
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index d6fd5c063..9c8de5a09 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -1700,12 +1700,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			Integer newQuantityOccupied = distributionStockListEntity.getQuantityOccupied() - reservationNum;
 			distributionStockListEntity.setQuantityOccupied(newQuantityOccupied);
 			distributionStockListService.updateById(distributionStockListEntity);
-			disStockListDetailMapper.deleteInventoryByStockListId(distributionReservationStocklistEntity.getId());
+			disStockListDetailMapper.deleteInventoryByStockListId(distributionReservationStocklistEntity.getStocklistId(),distributionReservationStocklistEntity.getReservationId());
 			List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 				.eq(DisStockListDetailEntity::getReservationId, distributionReservationStocklistEntity.getReservationId()).eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId()));
 			list.forEach(l -> l.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()));
 			disStockListDetailService.updateBatchById(list);
-			//TODO 删除库存品包件信息
 		});
 		DistributionReservationEntity reservationEntity = this.getById(id);
 		Integer reservationNum = reservationEntity.getReservationNum();