From 638c546d37e0734aef66d0d97e985543905fb79d Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 12 Jun 2025 16:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B6=85=E5=B8=82=E8=BE=85?=
 =?UTF-8?q?=E5=8A=A9=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SmErpAuxiliaryCodeEntity.java      |  5 +++++
 .../service/impl/SmErpSpuServiceImpl.java     | 20 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java
index d83d8b48b..8b06edc5e 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java
@@ -85,4 +85,9 @@ public class SmErpAuxiliaryCodeEntity extends Model<SmErpAuxiliaryCodeEntity> {
 
 	@Schema(description="包装单位id")
 	private Long unitId;
+
+
+	@Schema(description="包装单位")
+	@TableField(exist = false)
+	private String unit;
 }
\ 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 cdadbe179..2472f4764 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
@@ -108,6 +108,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
 
         baseMapper.insert(supermarketSpu);
 
+
         //库存表
         SmErpStockEntity smErpStockEntity = new SmErpStockEntity();
         smErpStockEntity.setErpSpuId(supermarketSpu.getId());
@@ -129,10 +130,16 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         } else {
             return R.failed("包装类型不能为空");
         }
+        Map<String, SmErpUnitEntity> unitMap = smErpUnitEntityList.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity));
+
         //辅助条码
         List<SmErpAuxiliaryCodeEntity> smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList();
         if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) {
-            smErpAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
+            for (int i = 0; i < smErpAuxiliaryCodeEntityList.size(); i++) {
+                SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = smErpAuxiliaryCodeEntityList.get(i);
+                smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId());
+                smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId());
+            }
             smErpAuxiliaryCodeService.saveBatch(smErpAuxiliaryCodeEntityList);
         }
 
@@ -165,7 +172,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
 
         //新增包装类型
         List<SmErpUnitEntity> smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList();
-
+        List<SmErpUnitEntity> insertUnits= new ArrayList<>();
         if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) {
 
             List<SmErpUnitEntity>  baseUnits = smErpUnitEntityList.stream()
@@ -178,7 +185,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
             }
 
             //id为null新增
-            List<SmErpUnitEntity> insertUnits = smErpUnitEntityList.stream()
+            insertUnits = smErpUnitEntityList.stream()
                     .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList());
             insertUnits.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
             List<SmErpUnitEntity> updateUnits = smErpUnitEntityList.stream()
@@ -234,7 +241,12 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) {
             List<SmErpAuxiliaryCodeEntity> insertCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList());
             List<SmErpAuxiliaryCodeEntity> updateCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList());
-            insertCollect.stream().forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
+            Map<String, SmErpUnitEntity> unitMap = insertUnits.stream().collect(Collectors.toMap(smErpUnitEntity -> smErpUnitEntity.getUnit(), smErpUnitEntity -> smErpUnitEntity));
+            for (int i = 0; i < insertCollect.size(); i++) {
+                SmErpAuxiliaryCodeEntity smErpAuxiliaryCodeEntity = insertCollect.get(i);
+                smErpAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId());
+                smErpAuxiliaryCodeEntity.setUnitId(unitMap.get(smErpAuxiliaryCodeEntity.getUnit()).getId());
+            }
             smErpAuxiliaryCodeService.saveBatch(insertCollect);
             smErpAuxiliaryCodeService.updateBatchById(updateCollect);