From 2dd72291ce2eeee26458b18de59d6f4ff6f4c9dc Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 5 Mar 2025 17:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98=E6=89=A3?=
 =?UTF-8?q?=E5=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/SupermarketSpuUpdateStockReqDTO.java           |  2 +-
 .../supermarket/service/impl/SmErpSpuServiceImpl.java  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuUpdateStockReqDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuUpdateStockReqDTO.java
index 1f28b19a8..50359909d 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuUpdateStockReqDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuUpdateStockReqDTO.java
@@ -35,7 +35,7 @@ public class SupermarketSpuUpdateStockReqDTO {
         /**
          * 商品 SKU 编号
          */
-        @NotNull(message = "商品 SPU 编号不能为空")
+        @NotNull(message = "包装单位unit 编号不能为空")
         private Long id;
 
         /**
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
index f62c4bfdc..c0d4b06dd 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java
@@ -199,16 +199,18 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
     public R updateSpuStock(SupermarketSpuUpdateStockReqDTO updateStockReqDTO) {
         List<UpdateStockDTO> updateStockDTOS = new ArrayList<UpdateStockDTO>();
         for (SupermarketSpuUpdateStockReqDTO.Item v : updateStockReqDTO.getItems()) {
+            SmErpUnitEntity smErpUnitEntity = smErpUnitService.getById(v.getId());
             // 查询当前库存
-            SmErpSpuEntity spu = baseMapper.selectById(v.getId());
-            if (spu == null) {
+            Long spuId = smErpUnitEntity.getSpuId();
+            SmErpSpuEntity spu = baseMapper.selectById(spuId);
+            if (null==spu) {
                 return R.failed(spu.getProductName() + "商品不存在");
             }
             if (v.getIncrCount() == 0) {
                 return R.failed("扣减不能为0");
             }
             LambdaUpdateWrapper<SmErpStockEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-            lambdaUpdateWrapper.eq(SmErpStockEntity::getErpSpuId, v.getId());
+            lambdaUpdateWrapper.eq(SmErpStockEntity::getErpSpuId, spuId);
             SmErpStockEntity smErpStockEntity = smErpStockMapper.selectOne(lambdaUpdateWrapper);
 
 
@@ -217,7 +219,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
                 return R.failed(spu.getProductName() + "库存不足，无法完成操作");
             }
 
-            UpdateStockDTO updateStockDTO = new UpdateStockDTO(v.getId(), v.getIncrCount());
+            UpdateStockDTO updateStockDTO = new UpdateStockDTO(spuId, v.getIncrCount());
             updateStockDTOS.add(updateStockDTO);
         }
         smErpStockService.updateStock(updateStockDTOS);