From b04dfde72ea633fe9deba7439ab84487b938796d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:05:54 +0800
Subject: [PATCH] fix(mdm): 物料导入补充技术参数字段映射

---
 yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
index e266489..a434068 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
@@ -19,6 +19,7 @@
 import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
 import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemBatchConfigMapper;
 import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemMapper;
+import cn.iocoder.yudao.module.mdm.dal.mysql.item.MdmItemCodeSequenceMapper;
 import cn.iocoder.yudao.module.mdm.dal.mysql.unit.MdmUnitMeasureMapper;
 import cn.iocoder.yudao.module.mdm.service.brand.MdmBrandService;
 import cn.iocoder.yudao.module.mdm.service.category.MdmItemCategoryService;
@@ -60,6 +61,9 @@
     private MdmItemMapper itemMapper;
 
     @Resource
+    private MdmItemCodeSequenceMapper itemCodeSequenceMapper;
+
+    @Resource
     private MdmItemCategoryService itemCategoryService;
     @Resource
     private MdmUnitMeasureService unitMeasureService;
@@ -85,6 +89,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createItem(MdmItemSaveReqVO createReqVO) {
+        createReqVO.setCode(generateItemCode(createReqVO.getItemType()));
         // 鏍¢獙鏁版嵁
         validateItemSaveData(createReqVO);
 
@@ -107,7 +112,10 @@
     @Transactional(rollbackFor = Exception.class)
     public void updateItem(MdmItemSaveReqVO updateReqVO) {
         // 鏍¢獙瀛樺湪
-        validateItemExists(updateReqVO.getId());
+        MdmItemDO existingItem = validateItemExists(updateReqVO.getId());
+        // 缂栧彿鐢辩郴缁熺敓鎴愶紝淇敼浜у搧鏃朵繚鎸佸師缂栧彿涓嶅彉銆�
+        updateReqVO.setCode(existingItem.getCode());
+        updateReqVO.setItemType(existingItem.getItemType());
         // 鏍¢獙鏁版嵁
         validateItemSaveData(updateReqVO);
 
@@ -127,8 +135,41 @@
     }
 
     private void validateItemSaveData(MdmItemSaveReqVO reqVO) {
+        if (reqVO.getItemType() == null || reqVO.getItemType() < 1 || reqVO.getItemType() > 5) {
+            throw exception(MDM_ITEM_TYPE_INVALID);
+        }
         // 鏍¢獙鐗╂枡缂栫爜鐨勫敮涓�鎬�
         validateItemCodeUnique(reqVO.getId(), reqVO.getCode());
+    }
+
+    /** 鐢熸垚鍥涗綅绫诲瀷鍓嶇紑 + 浜斾綅娴佹按鍙凤紝鍏变節浣嶃�傛祦姘磋鍦ㄤ簨鍔″唴鍔犻攣锛岄伩鍏嶅苟鍙戦噸澶嶃�� */
+    private String generateItemCode(Integer itemType) {
+        String prefix = switch (itemType == null ? 0 : itemType) {
+            case 1 -> "1001";
+            case 2 -> "1002";
+            case 3 -> "1003";
+            case 4 -> "1004";
+            case 5 -> "1005";
+            default -> throw exception(MDM_ITEM_TYPE_INVALID);
+        };
+        itemCodeSequenceMapper.insertIfAbsent(prefix);
+        Integer current = itemCodeSequenceMapper.selectCurrentValueForUpdate(prefix);
+        if (current == null) {
+            current = itemMapper.selectMaxSequenceByPrefix(prefix);
+            itemCodeSequenceMapper.insertIfAbsent(prefix);
+            itemCodeSequenceMapper.updateCurrentValue(prefix, current);
+        }
+        int maxExisting = itemMapper.selectMaxSequenceByPrefix(prefix);
+        if (current < maxExisting) {
+            current = maxExisting;
+            itemCodeSequenceMapper.updateCurrentValue(prefix, current);
+        }
+        if (current >= 99_999) {
+            throw exception(MDM_ITEM_CODE_SEQUENCE_EXHAUSTED);
+        }
+        itemCodeSequenceMapper.increment(prefix);
+        int next = current + 1;
+        return prefix + String.format("%05d", next);
     }
 
     /**
@@ -570,6 +611,7 @@
         saveReqVO.setName(importVO.getName());
         saveReqVO.setBarCode(importVO.getBarCode());
         saveReqVO.setSpecification(importVO.getSpecification());
+        saveReqVO.setTechnicalParameters(importVO.getTechnicalParameters());
         saveReqVO.setCategoryId(categoryId);
         saveReqVO.setUnitMeasureId(unitMeasureId);
         saveReqVO.setUnitMeasureId2(unitMeasureId2);
@@ -609,4 +651,4 @@
                 StrUtil.blankToDefault(importVO.getName(), "锛堝悕绉板拰缂栫爜涓虹┖鐨勮锛�"));
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3