From 313d1dd9b3724cbf548656cab752daa628adc0d5 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 26 Dec 2024 21:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=89=AB=E6=8F=8FBUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistrilbutionBillLadingMapper.xml  | 2 +-
 .../service/impl/DistrilbutionBillLadingServiceImpl.java   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 2a9ae7338..57fa32f45 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -606,7 +606,7 @@
     </select>
 
     <select id="getInventory" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
-        select ldbl.id ,lddd.stock_list_id stockListId,IFNULL(sum(lddd.quantity),0),,ldsl.description_goods
+        select ldbl.id ,lddd.stock_list_id stockListId,IFNULL(sum(lddd.quantity),0) AS quantity,ldsl.description_goods
         descriptionGoods,ldsl.cargo_unit cargoUnit,ldsl.sku,ldsl.cargo_number,(
         select count(1)
         from logpm_distribution_stock lds
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 47a229fe4..b38789a09 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -333,9 +333,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 				if ("1".equals(i.getStockStatus())) {
 					DistributionStockListEntity stockEntity = new DistributionStockListEntity();
-					stockEntity.setId(i.getStockListId());
-					stockEntity.setQuantityStock(i.getQuantity());
-					stockEntityList.add(stockEntity);
+					distributionStockListMapper.deductionQuantityStock(i.getStockListId(),i.getQuantity());
 					dd.add(i.getId());
 				} else {
 					throw new ServiceException("包含已备货的库存品，无法取消！！！");
@@ -355,7 +353,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						DistributionStockListEntity byId = distributionStockListService.getById(i.getId());
 						DistributionStockListEntity updateWrapper = new DistributionStockListEntity();
 						updateWrapper.setId(i.getId());
-						updateWrapper.setQuantityStock(i.getQuantityStock() + byId.getQuantityStock());
+						updateWrapper.setQuantityStock(i.getQuantityStock());
 						distributionStockListService.updateById(updateWrapper);
 					});
 				}
@@ -3344,6 +3342,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DisStockListDetailEntity> listed = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 				.eq(DisStockListDetailEntity::getReservationId, i.getId())
 				.eq(DisStockListDetailEntity::getSku, i.getSku())
+				.eq(DisStockListDetailEntity::getStockListId, i.getStockListId())
 				.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
 			if (Func.isNotEmpty(listed)) {