From 1fb5fc73e8df33b25337ab34f669ab03e0d9ce06 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 02 九月 2026 17:18:43 +0800
Subject: [PATCH] feat(mdm/mes): 基础数据物料管理/物料分类/计量单位支持Excel导出
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 d71bea1..cb23410 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
@@ -15,7 +15,6 @@
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
-import cn.iocoder.yudao.module.mdm.dal.mysql.category.MdmItemCategoryMapper;
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.unit.MdmUnitMeasureMapper;
@@ -65,9 +64,6 @@
private MesMdItemApi mesMdItemApi;
@Resource
private MdmItemBatchConfigMapper itemBatchConfigMapper;
-
- @Resource
- private MdmItemCategoryMapper itemCategoryMapper;
@Resource
private MdmUnitMeasureMapper unitMeasureMapper;
@@ -443,11 +439,13 @@
.createList(new ArrayList<>()).updateList(new ArrayList<>())
.failureList(new LinkedHashMap<>()).build();
- // 1. 棰勭儹锛氬垎绫荤紪鐮� -> ID銆佸崟浣嶇紪鐮� -> ID
+ // 1. 棰勭儹锛氬垎绫荤紪鐮� -> ID锛圡ES 鐗╂枡鍒嗙被锛屼笌鐗╂枡琛ㄥ崟涓嬫媺鏁版嵁婧愪竴鑷达級銆佸崟浣嶇紪鐮� -> ID
Map<String, Long> categoryCodeIdMap = new HashMap<>();
- for (MdmItemCategoryDO category : itemCategoryMapper.selectList()) {
- if (category.getCode() != null) {
- categoryCodeIdMap.put(category.getCode(), category.getId());
+ for (String categoryCode : importList.stream()
+ .map(MdmItemImportExcelVO::getCategoryCode).filter(StrUtil::isNotBlank).distinct().toList()) {
+ CommonResult<MesMdItemTypeRespDTO> categoryResult = mesMdItemTypeApi.getItemTypeByCode(categoryCode);
+ if (categoryResult != null && categoryResult.getData() != null) {
+ categoryCodeIdMap.put(categoryCode, categoryResult.getData().getId());
}
}
Map<String, Long> unitCodeIdMap = new HashMap<>();
--
Gitblit v1.9.3