From 21af312edd4cb2e5d9adec2bcbe659249970f139 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 7 Mar 2025 15:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SmErpInventoryRecordsEntity.java         |  3 +++
 .../service/impl/SmErpSpuServiceImpl.java           | 13 ++++++++++---
 .../mapper/SmErpInventoryRecordsMapper.xml          |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
index 97ae11e38..01e9c9825 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java
@@ -172,4 +172,7 @@ public class SmErpInventoryRecordsEntity extends Model<SmErpInventoryRecordsEnti
 	@Schema(description="经办人名称")
 	@TableField(exist = false)
 	private String handlerUserName;
+
+	@Schema(description="收货数量")
+	private Integer receiveAmount;
 }
\ No newline at end of file
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 82f22b1c7..c4eeb8047 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
@@ -243,8 +243,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         smErpInventoryRecordsEntity.setInventoryType(InventoryTypeEnum.LSCK.getType());
         smErpInventoryRecordsEntity.setOrderType(OrderTypeEnum.CK.getType());
         smErpInventoryRecordsEntity.setDeviceType(updateStockReqDTO.getDeviceType());
-        //生成出入库记录
-        smErpInventoryRecordsMapper.insert(smErpInventoryRecordsEntity);
+
         List<SmErpInventoryRecordsItemEntity> smErpInventoryRecordsItemEntityList = new ArrayList<>();
 
         for (SupermarketSpuUpdateStockReqDTO.Item v : updateStockReqDTO.getItems()) {
@@ -281,12 +280,20 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
             smErpInventoryRecordsItemEntity.setQuantity(incrCount);
             smErpInventoryRecordsItemEntity.setUnitId(v.getId());
             smErpInventoryRecordsItemEntity.setOrderType(OrderTypeEnum.CK.getType());
-            //todo 添加收款金额字段和会员卡号，用于记录零售业务
+            // 添加收款金额字段和会员卡号，用于记录零售业务,后续扩展使用
             smErpInventoryRecordsItemEntity.setUnitPrice
                     (smErpUnitEntity.getPromotionPrice()==null || smErpUnitEntity.getPromotionPrice()==0
                             ?smErpUnitEntity.getRetailPrice():smErpUnitEntity.getPromotionPrice());
             smErpInventoryRecordsItemEntityList.add(smErpInventoryRecordsItemEntity);
         }
+        int sum = smErpInventoryRecordsItemEntityList.stream().map(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getUnitPrice()).mapToInt(Integer::intValue).sum();
+        smErpInventoryRecordsEntity.setTotalAmount(sum);
+        smErpInventoryRecordsEntity.setReceiveAmount(sum);
+        //生成出入库记录
+        smErpInventoryRecordsMapper.insert(smErpInventoryRecordsEntity);
+        smErpInventoryRecordsItemEntityList.forEach(smErpInventoryRecordsItemEntity -> {
+            smErpInventoryRecordsItemEntity.setInventoryId(smErpInventoryRecordsEntity.getId());
+        });
         smErpInventoryRecordsItemMapper.insert(smErpInventoryRecordsItemEntityList);
         return R.ok();
     }
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml
index 9d00a4195..62052c9ba 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml
@@ -27,6 +27,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="deviceType" column="device_type"/>
+      <result property="receiveAmount" column="receive_amount"/>
   </resultMap>
     <select id="getInventoryDetailPageByScope"
             resultType="com.bsd.pjcloud.supermarket.vo.inventoryrecord.InventoryRecordPageVo"  parameterType="com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryDetailQueryDTO">