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 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=89=A3=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);

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

---
 .../service/impl/SmErpSpuServiceImpl.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 c0d4b06dd..d7d4d5724 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
@@ -224,14 +224,14 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         }
         smErpStockService.updateStock(updateStockDTOS);
         //todo 生成出入库记录
-//        SmErpInventoryRecordsEntity smErpInventoryRecordsEntity = new SmErpInventoryRecordsEntity();
-//        String s = sequence.nextNo();
-//        String result = InventoryTypeEnum.LSCK.getValue() + "-" + s;
-//        smErpInventoryRecordsEntity.setInventoryCode(result);
-//        smErpInventoryRecordsEntity.setInventoryDate(LocalDate.now());
-//        smErpInventoryRecordsEntity.setInventoryType(InventoryTypeEnum.LSCK.getType());
-//        smErpInventoryRecordsEntity.setOrderType(OrderTypeEnum.CK.getType());
-//        smErpInventoryRecordsEntity.setDeviceType(updateStockReqDTO.getDeviceType());
+        SmErpInventoryRecordsEntity smErpInventoryRecordsEntity = new SmErpInventoryRecordsEntity();
+        String s = sequence.nextNo();
+        String result = InventoryTypeEnum.LSCK.getValue() + "-" + s;
+        smErpInventoryRecordsEntity.setInventoryCode(result);
+        smErpInventoryRecordsEntity.setInventoryDate(LocalDate.now());
+        smErpInventoryRecordsEntity.setInventoryType(InventoryTypeEnum.LSCK.getType());
+        smErpInventoryRecordsEntity.setOrderType(OrderTypeEnum.CK.getType());
+        smErpInventoryRecordsEntity.setDeviceType(updateStockReqDTO.getDeviceType());
 
         return R.ok();
     }

From b333c59e23c70657af6bf58d6c5b0e5c3e330c3f Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 5 Mar 2025 18:01:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=89=A3=E5=87=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SmErpInventoryRecordsServiceImpl.java     | 12 ++++--
 .../service/impl/SmErpSpuServiceImpl.java     | 37 +++++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java
index d1681ae81..fcf944ed3 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java
@@ -142,10 +142,14 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
                 ));
         // 设置商品名称到主表实体
         records.forEach(plan -> {
-            SysUser sysUser = userMap.getOrDefault(plan.getHandlerUserId(), new SysUser());
-            plan.setHandlerUserName(sysUser.getUsername());
-            List<String> names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList());
-            plan.setProductName(String.join(", ", names));
+            //移动端自动扣款入库，无需经办人
+            if (null!=plan.getHandlerUserId()){
+                SysUser sysUser = userMap.getOrDefault(plan.getHandlerUserId(), new SysUser());
+                plan.setHandlerUserName(sysUser.getUsername());
+                List<String> names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList());
+                plan.setProductName(String.join(", ", names));
+            }
+
         });
         return pageData;
     }
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 d7d4d5724..ce7da6ba5 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
@@ -79,6 +79,9 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
 
     private final RemoteMchService remoteMchService;
 
+    private final SmErpInventoryRecordsMapper smErpInventoryRecordsMapper;
+    private final SmErpInventoryRecordsItemMapper smErpInventoryRecordsItemMapper;
+
 
     @Autowired
     private Sequence sequence;
@@ -221,18 +224,30 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
 
             UpdateStockDTO updateStockDTO = new UpdateStockDTO(spuId, v.getIncrCount());
             updateStockDTOS.add(updateStockDTO);
-        }
-        smErpStockService.updateStock(updateStockDTOS);
-        //todo 生成出入库记录
-        SmErpInventoryRecordsEntity smErpInventoryRecordsEntity = new SmErpInventoryRecordsEntity();
-        String s = sequence.nextNo();
-        String result = InventoryTypeEnum.LSCK.getValue() + "-" + s;
-        smErpInventoryRecordsEntity.setInventoryCode(result);
-        smErpInventoryRecordsEntity.setInventoryDate(LocalDate.now());
-        smErpInventoryRecordsEntity.setInventoryType(InventoryTypeEnum.LSCK.getType());
-        smErpInventoryRecordsEntity.setOrderType(OrderTypeEnum.CK.getType());
-        smErpInventoryRecordsEntity.setDeviceType(updateStockReqDTO.getDeviceType());
+            smErpStockService.updateStock(updateStockDTOS);
 
+            //todo 生成出入库记录
+            SmErpInventoryRecordsEntity smErpInventoryRecordsEntity = new SmErpInventoryRecordsEntity();
+            String s = sequence.nextNo();
+            String result = InventoryTypeEnum.LSCK.getValue() + "-" + s;
+            smErpInventoryRecordsEntity.setInventoryCode(result);
+            smErpInventoryRecordsEntity.setInventoryDate(LocalDate.now());
+            smErpInventoryRecordsEntity.setInventoryType(InventoryTypeEnum.LSCK.getType());
+            smErpInventoryRecordsEntity.setOrderType(OrderTypeEnum.CK.getType());
+            smErpInventoryRecordsEntity.setDeviceType(updateStockReqDTO.getDeviceType());
+            smErpInventoryRecordsMapper.insert(smErpInventoryRecordsEntity);
+            SmErpInventoryRecordsItemEntity smErpInventoryRecordsItemEntity = new SmErpInventoryRecordsItemEntity();
+            smErpInventoryRecordsItemEntity.setInventoryId(smErpInventoryRecordsEntity.getId());
+            smErpInventoryRecordsItemEntity.setErpSpuId(spuId);
+            smErpInventoryRecordsItemEntity.setQuantity(v.getIncrCount());
+            smErpInventoryRecordsItemEntity.setUnitId(v.getId());
+            smErpInventoryRecordsItemEntity.setOrderType(OrderTypeEnum.CK.getType());
+            //todo 添加收款金额字段和会员卡号，用于记录零售业务
+            smErpInventoryRecordsItemEntity.setUnitPrice
+                    (smErpUnitEntity.getPromotionPrice()==null || smErpUnitEntity.getPromotionPrice()==0
+                            ?smErpUnitEntity.getRetailPrice():smErpUnitEntity.getPromotionPrice());
+            smErpInventoryRecordsItemMapper.insert(smErpInventoryRecordsItemEntity);
+        }
         return R.ok();
     }