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] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=89=A3=E5=87=8F=E5=A2=9E?=
 =?UTF-8?q?=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();
     }