From 581aae987e17d99f9e62275b22502ad08d748696 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 21 八月 2026 09:31:00 +0800
Subject: [PATCH] 物料管理/物料分类/计量单位增加Excel导入功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeServiceImpl.java | 76 ++++++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 31 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java | 31 ++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java | 128 +++++++++++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java | 86 +++++++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java | 45 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeService.java | 11 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportRespVO.java | 24 ++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportRespVO.java | 24 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 1
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/enums/ErrorCodeConstants.java | 2
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureService.java | 11 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java | 72 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportRespVO.java | 24 ++
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemService.java | 11 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 29 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java | 39 +++
17 files changed, 645 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
index 664126c..97e1853 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
@@ -3,6 +3,9 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
@@ -22,13 +25,17 @@
import cn.iocoder.yudao.module.mes.api.wm.warehouse.dto.MesWmWarehouseRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -268,4 +275,26 @@
}
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鐗╂枡妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MdmItemImportExcelVO> list = Arrays.asList(
+ MdmItemImportExcelVO.builder().code("ITEM001").name("绀轰緥鐗╂枡").specification("瑙勬牸").status(0).isBatchManaged(false).build()
+ );
+ ExcelUtils.write(response, "鐗╂枡瀵煎叆妯℃澘.xls", "鐗╂枡", MdmItemImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鐗╂枡")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mdm:item:import')")
+ public CommonResult<MdmItemImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MdmItemImportExcelVO> list = ExcelUtils.read(file, MdmItemImportExcelVO.class);
+ return success(itemService.importItemList(list, updateSupport));
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
new file mode 100644
index 0000000..9fa5c81
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.mdm.controller.admin.item.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * MDM 鐗╂枡瀵煎叆 Excel VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MdmItemImportExcelVO {
+
+ @ExcelProperty("鐗╂枡缂栫爜")
+ private String code;
+
+ @ExcelProperty("鐗╂枡鍚嶇О")
+ private String name;
+
+ @ExcelProperty("鏉＄爜")
+ private String barCode;
+
+ @ExcelProperty("瑙勬牸鍨嬪彿")
+ private String specification;
+
+ @ExcelProperty("鐗╂枡鍒嗙被缂栫爜")
+ private String categoryCode;
+
+ @ExcelProperty("璁￠噺鍗曚綅缂栫爜")
+ private String unitMeasureCode;
+
+ @ExcelProperty("杈呭崟浣�1缂栫爜")
+ private String unitMeasureCode2;
+
+ @ExcelProperty("杈呭崟浣�1鎹㈢畻姣旂巼")
+ private BigDecimal unitMeasureRate1;
+
+ @ExcelProperty("杈呭崟浣�2缂栫爜")
+ private String unitMeasureCode3;
+
+ @ExcelProperty("杈呭崟浣�2鎹㈢畻姣旂巼")
+ private BigDecimal unitMeasureRate2;
+
+ @ExcelProperty("榛樿浠撳簱缂栫爜")
+ private String warehouseCode;
+
+ @ExcelProperty("閲囪喘浠�")
+ private BigDecimal purchasePrice;
+
+ @ExcelProperty("閿�鍞环")
+ private BigDecimal salesPrice;
+
+ @ExcelProperty("鎴愭湰浠�")
+ private BigDecimal costPrice;
+
+ @ExcelProperty("瀹夊叏搴撳瓨")
+ private BigDecimal safetyStock;
+
+ @ExcelProperty("鏈�浣庡簱瀛�")
+ private BigDecimal minStock;
+
+ @ExcelProperty("鏈�楂樺簱瀛�")
+ private BigDecimal maxStock;
+
+ @ExcelProperty("鏄惁鎵规绠＄悊")
+ private Boolean isBatchManaged;
+
+ @ExcelProperty("淇濊川鏈�(澶�)")
+ private Integer expiryDay;
+
+ @ExcelProperty("鐘舵��")
+ private Integer status;
+
+ @ExcelProperty("鏄惁鍚屾鍒癕ES")
+ private Boolean syncMes;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportRespVO.java
new file mode 100644
index 0000000..f77601d
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mdm.controller.admin.item.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "绠＄悊鍚庡彴 - MDM 鐗╂枡瀵煎叆 Response VO")
+@Data
+@Builder
+public class MdmItemImportRespVO {
+
+ @Schema(description = "鍒涘缓鎴愬姛鐨勭墿鏂欐暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> createList;
+
+ @Schema(description = "鏇存柊鎴愬姛鐨勭墿鏂欐暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> updateList;
+
+ @Schema(description = "瀵煎叆澶辫触鐨勭墿鏂欓泦鍚� key 涓虹墿鏂欏悕锛寁alue 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Map<String, String> failureList;
+
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
index 87c4dd1..072e4d0 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
@@ -3,19 +3,27 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -93,4 +101,27 @@
return success(unitMeasureService.getUnitMeasureList(ids));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆璁￠噺鍗曚綅妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MdmUnitMeasureImportExcelVO> list = Arrays.asList(
+ MdmUnitMeasureImportExcelVO.builder().code("PC").name("鐗�").primaryFlag(true).changeRate(new java.math.BigDecimal("1")).status(0).remark("绀轰緥锛氫富鍗曚綅").build(),
+ MdmUnitMeasureImportExcelVO.builder().code("XIA").name("绠�").primaryFlag(false).primaryCode("PC").changeRate(new java.math.BigDecimal("100")).status(0).remark("绀轰緥锛�1绠�=100鐗�").build()
+ );
+ ExcelUtils.write(response, "璁￠噺鍗曚綅瀵煎叆妯℃澘.xls", "璁￠噺鍗曚綅", MdmUnitMeasureImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆璁￠噺鍗曚綅")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mdm:unit-measure:import')")
+ public CommonResult<MdmUnitMeasureImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MdmUnitMeasureImportExcelVO> list = ExcelUtils.read(file, MdmUnitMeasureImportExcelVO.class);
+ return success(unitMeasureService.importUnitMeasureList(list, updateSupport));
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java
new file mode 100644
index 0000000..6216134
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportExcelVO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mdm.controller.admin.unit.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * MDM 璁￠噺鍗曚綅瀵煎叆 Excel VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MdmUnitMeasureImportExcelVO {
+
+ @ExcelProperty("鍗曚綅缂栫爜")
+ private String code;
+
+ @ExcelProperty("鍗曚綅鍚嶇О")
+ private String name;
+
+ @ExcelProperty("鏄惁涓诲崟浣�")
+ private Boolean primaryFlag;
+
+ @ExcelProperty("涓诲崟浣嶇紪鐮�")
+ private String primaryCode;
+
+ @ExcelProperty("涓庝富鍗曚綅鎹㈢畻姣斾緥")
+ private BigDecimal changeRate;
+
+ @ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.COMMON_STATUS)
+ private Integer status;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportRespVO.java
new file mode 100644
index 0000000..e33b673
--- /dev/null
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mdm.controller.admin.unit.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "绠＄悊鍚庡彴 - MDM 璁￠噺鍗曚綅瀵煎叆 Response VO")
+@Data
+@Builder
+public class MdmUnitMeasureImportRespVO {
+
+ @Schema(description = "鍒涘缓鎴愬姛鐨勫崟浣嶆暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> createList;
+
+ @Schema(description = "鏇存柊鎴愬姛鐨勫崟浣嶆暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> updateList;
+
+ @Schema(description = "瀵煎叆澶辫触鐨勫崟浣嶉泦鍚� key 涓哄崟浣嶅悕锛寁alue 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Map<String, String> failureList;
+
+}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/enums/ErrorCodeConstants.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/enums/ErrorCodeConstants.java
index 747fc12..a3df052 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/enums/ErrorCodeConstants.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/enums/ErrorCodeConstants.java
@@ -17,6 +17,7 @@
ErrorCode MDM_ITEM_SKU_IS_DISABLE = new ErrorCode(1_050_005, "鐗╂枡SKU宸茬鐢�");
ErrorCode MDM_ITEM_SKU_CODE_DUPLICATE = new ErrorCode(1_050_006, "SKU缂栫爜宸插瓨鍦�");
ErrorCode MDM_ITEM_EXISTS_REFERENCE = new ErrorCode(1_050_007, "鐗╂枡宸茶涓氬姟寮曠敤锛屾棤娉曞垹闄�");
+ ErrorCode MDM_ITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_050_008, "瀵煎叆鐨勭墿鏂欐暟鎹笉鑳戒负绌�");
// ========== 鐗╂枡鍒嗙被鐩稿叧 1-050-051 ~ 1-050-100 ==========
ErrorCode MDM_ITEM_CATEGORY_NOT_EXISTS = new ErrorCode(1_050_051, "鐗╂枡鍒嗙被涓嶅瓨鍦�");
@@ -31,6 +32,7 @@
ErrorCode MDM_UNIT_MEASURE_CODE_DUPLICATE = new ErrorCode(1_050_102, "璁￠噺鍗曚綅缂栫爜宸插瓨鍦�");
ErrorCode MDM_UNIT_MEASURE_NAME_DUPLICATE = new ErrorCode(1_050_103, "璁￠噺鍗曚綅鍚嶇О宸插瓨鍦�");
ErrorCode MDM_UNIT_MEASURE_EXISTS_ITEM = new ErrorCode(1_050_104, "璁￠噺鍗曚綅琚墿鏂欎娇鐢紝鏃犳硶鍒犻櫎");
+ ErrorCode MDM_UNIT_MEASURE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_050_105, "瀵煎叆鐨勮閲忓崟浣嶆暟鎹笉鑳戒负绌�");
// ========== 鍝佺墝鐩稿叧 1-050-151 ~ 1-050-200 ==========
ErrorCode MDM_BRAND_NOT_EXISTS = new ErrorCode(1_050_151, "鍝佺墝涓嶅瓨鍦�");
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemService.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemService.java
index 3ade231..aee19e7 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemService.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mdm.service.item;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
@@ -153,4 +155,13 @@
*/
List<MdmItemDO> getItemSimpleList();
+ /**
+ * 瀵煎叆鐗╂枡
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param isUpdateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MdmItemImportRespVO importItemList(List<MdmItemImportExcelVO> importList, Boolean isUpdateSupport);
+
}
\ No newline at end of file
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 138b8e0..d71bea1 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
@@ -2,18 +2,23 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemPageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
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;
import cn.iocoder.yudao.module.mdm.service.brand.MdmBrandService;
import cn.iocoder.yudao.module.mdm.service.category.MdmItemCategoryService;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
@@ -60,6 +65,12 @@
private MesMdItemApi mesMdItemApi;
@Resource
private MdmItemBatchConfigMapper itemBatchConfigMapper;
+
+ @Resource
+ private MdmItemCategoryMapper itemCategoryMapper;
+
+ @Resource
+ private MdmUnitMeasureMapper unitMeasureMapper;
@Resource
private MesMdItemTypeApi mesMdItemTypeApi;
@@ -422,4 +433,121 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MdmItemImportRespVO importItemList(List<MdmItemImportExcelVO> importList, Boolean isUpdateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MDM_ITEM_IMPORT_LIST_IS_EMPTY);
+ }
+ MdmItemImportRespVO respVO = MdmItemImportRespVO.builder()
+ .createList(new ArrayList<>()).updateList(new ArrayList<>())
+ .failureList(new LinkedHashMap<>()).build();
+
+ // 1. 棰勭儹锛氬垎绫荤紪鐮� -> ID銆佸崟浣嶇紪鐮� -> ID
+ Map<String, Long> categoryCodeIdMap = new HashMap<>();
+ for (MdmItemCategoryDO category : itemCategoryMapper.selectList()) {
+ if (category.getCode() != null) {
+ categoryCodeIdMap.put(category.getCode(), category.getId());
+ }
+ }
+ Map<String, Long> unitCodeIdMap = new HashMap<>();
+ for (MdmUnitMeasureDO unit : unitMeasureMapper.selectList()) {
+ unitCodeIdMap.put(unit.getCode(), unit.getId());
+ }
+
+ // 2. 閬嶅巻瀵煎叆
+ for (MdmItemImportExcelVO importVO : importList) {
+ // 2.1 鍩虹鏍￠獙
+ if (StrUtil.isBlank(importVO.getCode()) || StrUtil.isBlank(importVO.getName())) {
+ respVO.getFailureList().put(StrUtil.blankToDefault(importVO.getName(), importVO.getCode()), "鐗╂枡缂栫爜鍜岀墿鏂欏悕绉颁笉鑳戒负绌�");
+ continue;
+ }
+ // 2.2 瑙ｆ瀽鍒嗙被
+ Long categoryId = null;
+ if (StrUtil.isNotBlank(importVO.getCategoryCode())) {
+ categoryId = categoryCodeIdMap.get(importVO.getCategoryCode());
+ if (categoryId == null) {
+ respVO.getFailureList().put(importVO.getName(), "鐗╂枡鍒嗙被缂栫爜涓嶅瓨鍦細" + importVO.getCategoryCode());
+ continue;
+ }
+ }
+ // 2.3 瑙ｆ瀽涓诲崟浣�
+ Long unitMeasureId = null;
+ if (StrUtil.isNotBlank(importVO.getUnitMeasureCode())) {
+ unitMeasureId = unitCodeIdMap.get(importVO.getUnitMeasureCode());
+ if (unitMeasureId == null) {
+ respVO.getFailureList().put(importVO.getName(), "璁￠噺鍗曚綅缂栫爜涓嶅瓨鍦細" + importVO.getUnitMeasureCode());
+ continue;
+ }
+ }
+ // 2.4 瑙ｆ瀽杈呭崟浣�1
+ Long unitMeasureId2 = null;
+ if (StrUtil.isNotBlank(importVO.getUnitMeasureCode2())) {
+ unitMeasureId2 = unitCodeIdMap.get(importVO.getUnitMeasureCode2());
+ if (unitMeasureId2 == null) {
+ respVO.getFailureList().put(importVO.getName(), "杈呭崟浣�1缂栫爜涓嶅瓨鍦細" + importVO.getUnitMeasureCode2());
+ continue;
+ }
+ }
+ // 2.5 瑙ｆ瀽杈呭崟浣�2
+ Long unitMeasureId3 = null;
+ if (StrUtil.isNotBlank(importVO.getUnitMeasureCode3())) {
+ unitMeasureId3 = unitCodeIdMap.get(importVO.getUnitMeasureCode3());
+ if (unitMeasureId3 == null) {
+ respVO.getFailureList().put(importVO.getName(), "杈呭崟浣�2缂栫爜涓嶅瓨鍦細" + importVO.getUnitMeasureCode3());
+ continue;
+ }
+ }
+
+ // 2.6 缁勮 SaveReqVO锛堝鐢� create/update 閫昏緫锛�
+ MdmItemSaveReqVO saveReqVO = new MdmItemSaveReqVO();
+ saveReqVO.setCode(importVO.getCode());
+ saveReqVO.setName(importVO.getName());
+ saveReqVO.setBarCode(importVO.getBarCode());
+ saveReqVO.setSpecification(importVO.getSpecification());
+ saveReqVO.setCategoryId(categoryId);
+ saveReqVO.setUnitMeasureId(unitMeasureId);
+ saveReqVO.setUnitMeasureId2(unitMeasureId2);
+ saveReqVO.setUnitMeasureRate1(importVO.getUnitMeasureRate1());
+ saveReqVO.setUnitMeasureId3(unitMeasureId3);
+ saveReqVO.setUnitMeasureRate2(importVO.getUnitMeasureRate2());
+ saveReqVO.setPurchasePrice(importVO.getPurchasePrice());
+ saveReqVO.setSalesPrice(importVO.getSalesPrice());
+ saveReqVO.setCostPrice(importVO.getCostPrice());
+ saveReqVO.setSafetyStock(importVO.getSafetyStock());
+ saveReqVO.setMinStock(importVO.getMinStock());
+ saveReqVO.setMaxStock(importVO.getMaxStock());
+ saveReqVO.setIsBatchManaged(importVO.getIsBatchManaged());
+ saveReqVO.setExpiryDay(importVO.getExpiryDay());
+ saveReqVO.setStatus(importVO.getStatus() != null ? importVO.getStatus() : cn.iocoder.yudao.framework.common.enums.CommonStatusEnum.ENABLE.getStatus());
+ saveReqVO.setSyncMes(importVO.getSyncMes() != null ? importVO.getSyncMes() : false);
+ saveReqVO.setRemark(importVO.getRemark());
+ saveReqVO.setItemType(1); // 榛樿鐗╂枡绫诲瀷锛氱墿鏂�
+
+ // 2.7 宸插瓨鍦紙鎸夌紪鐮佸垽鏂級
+ MdmItemDO existByCode = itemMapper.selectByCode(importVO.getCode());
+ try {
+ if (existByCode != null) {
+ if (!Boolean.TRUE.equals(isUpdateSupport)) {
+ respVO.getFailureList().put(importVO.getName(), "鐗╂枡缂栫爜宸插瓨鍦�");
+ continue;
+ }
+ saveReqVO.setId(existByCode.getId());
+ updateItem(saveReqVO);
+ respVO.getUpdateList().add(importVO.getName());
+ } else {
+ createItem(saveReqVO);
+ respVO.getCreateList().add(importVO.getName());
+ }
+ } catch (Exception ex) {
+ // 鍗曟潯澶辫触锛岃褰曞苟缁х画
+ String reason = ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException
+ ? ((cn.iocoder.yudao.framework.common.exception.ServiceException) ex).getMessage()
+ : ex.getMessage();
+ respVO.getFailureList().put(importVO.getName(), reason == null ? "瀵煎叆澶辫触" : reason);
+ }
+ }
+ return respVO;
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureService.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureService.java
index 1170228..db48241 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureService.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mdm.service.unit;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
@@ -99,4 +101,13 @@
*/
MdmUnitMeasureDO getUnitMeasureByCode(String code);
+ /**
+ * 瀵煎叆璁￠噺鍗曚綅
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param isUpdateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MdmUnitMeasureImportRespVO importUnitMeasureList(List<MdmUnitMeasureImportExcelVO> importList, Boolean isUpdateSupport);
+
}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
index 3b393d3..8660a6a 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java
@@ -2,8 +2,11 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
@@ -125,4 +128,73 @@
return unitMeasureMapper.selectByCode(code);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public MdmUnitMeasureImportRespVO importUnitMeasureList(List<MdmUnitMeasureImportExcelVO> importList, Boolean isUpdateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MDM_UNIT_MEASURE_IMPORT_LIST_IS_EMPTY);
+ }
+ MdmUnitMeasureImportRespVO respVO = MdmUnitMeasureImportRespVO.builder()
+ .createList(new ArrayList<>()).updateList(new ArrayList<>())
+ .failureList(new LinkedHashMap<>()).build();
+
+ // 1. 寤虹珛缂栫爜 -> ID 鏄犲皠锛堝厛鍔犺浇鐜版湁鍗曚綅锛屽啀鍙犲姞鏈鏂板缓鐨勫崟浣嶏級锛岀敤浜庤В鏋�"涓诲崟浣嶇紪鐮�"鍒�
+ Map<String, Long> codeIdMap = new HashMap<>();
+ for (MdmUnitMeasureDO unit : unitMeasureMapper.selectList()) {
+ codeIdMap.put(unit.getCode(), unit.getId());
+ }
+ // 璁板綍鏈瀵煎叆宸插鐞嗚繃鐨勭紪鐮侊紝閬垮厤鍚屼竴鏂囦欢鍐呭悗缁鎵句笉鍒板垰瀵煎叆鐨勪富鍗曚綅
+ Map<String, Long> importedCodeIdMap = new HashMap<>();
+
+ // 2. 閬嶅巻瀵煎叆
+ for (MdmUnitMeasureImportExcelVO importVO : importList) {
+ // 2.1 鍩虹鏍￠獙
+ if (StrUtil.isBlank(importVO.getCode()) || StrUtil.isBlank(importVO.getName())) {
+ respVO.getFailureList().put(StrUtil.blankToDefault(importVO.getName(), importVO.getCode()), "鍗曚綅缂栫爜鍜屽崟浣嶅悕绉颁笉鑳戒负绌�");
+ continue;
+ }
+ // 2.2 瑙ｆ瀽涓诲崟浣� ID锛堥潪涓诲崟浣嶆椂蹇呭～涓诲崟浣嶇紪鐮侊級
+ Long primaryId = null;
+ if (StrUtil.isNotBlank(importVO.getPrimaryCode())) {
+ primaryId = importedCodeIdMap.get(importVO.getPrimaryCode()) != null
+ ? importedCodeIdMap.get(importVO.getPrimaryCode())
+ : codeIdMap.get(importVO.getPrimaryCode());
+ if (primaryId == null) {
+ respVO.getFailureList().put(importVO.getName(), "涓诲崟浣嶇紪鐮佷笉瀛樺湪锛�" + importVO.getPrimaryCode());
+ continue;
+ }
+ }
+
+ // 2.3 宸插瓨鍦紙鎸夌紪鐮佸垽鏂級
+ MdmUnitMeasureDO existByCode = unitMeasureMapper.selectByCode(importVO.getCode());
+ if (existByCode != null) {
+ if (!Boolean.TRUE.equals(isUpdateSupport)) {
+ respVO.getFailureList().put(importVO.getName(), "鍗曚綅缂栫爜宸插瓨鍦�");
+ continue;
+ }
+ // 鏀寔鏇存柊锛氫互缂栫爜涓哄噯鏇存柊
+ MdmUnitMeasureDO updateObj = BeanUtils.toBean(importVO, MdmUnitMeasureDO.class);
+ updateObj.setId(existByCode.getId());
+ updateObj.setPrimaryId(primaryId);
+ unitMeasureMapper.updateById(updateObj);
+ respVO.getUpdateList().add(importVO.getName());
+ } else {
+ // 2.4 鏍￠獙鍚嶇О鍞竴锛堟柊澧炲満鏅級
+ MdmUnitMeasureDO existByName = unitMeasureMapper.selectByName(importVO.getName());
+ if (existByName != null) {
+ respVO.getFailureList().put(importVO.getName(), "鍗曚綅鍚嶇О宸插瓨鍦�");
+ continue;
+ }
+ // 2.5 鏂板
+ MdmUnitMeasureDO newObj = BeanUtils.toBean(importVO, MdmUnitMeasureDO.class);
+ newObj.setPrimaryId(primaryId);
+ unitMeasureMapper.insert(newObj);
+ respVO.getCreateList().add(importVO.getName());
+ // 璁板綍鏈鏂板缓鐨勭紪鐮侊紝渚涘悓鏂囦欢鍚庣画琛屽紩鐢�
+ importedCodeIdMap.put(importVO.getCode(), newObj.getId());
+ }
+ }
+ return respVO;
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
index 3e0a69d..bd91d3f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemTypeController.java
@@ -3,6 +3,9 @@
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeSaveReqVO;
@@ -10,13 +13,18 @@
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -83,4 +91,27 @@
.setItemOrProduct(itemType.getItemOrProduct())));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鐗╂枡浜у搧鍒嗙被妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MesMdItemTypeImportExcelVO> list = Arrays.asList(
+ MesMdItemTypeImportExcelVO.builder().code("RAW").name("鍘熸潗鏂�").itemOrProduct("ITEM").sort(1).status(0).remark("绀轰緥锛氶《绾у垎绫�").build(),
+ MesMdItemTypeImportExcelVO.builder().code("METAL").name("閲戝睘鏉愭枡").parentCode("RAW").itemOrProduct("ITEM").sort(1).status(0).remark("绀轰緥锛氱埗鍒嗙被缂栫爜涓� RAW").build()
+ );
+ ExcelUtils.write(response, "鐗╂枡鍒嗙被瀵煎叆妯℃澘.xls", "鐗╂枡鍒嗙被", MesMdItemTypeImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鐗╂枡浜у搧鍒嗙被")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:md-item-type:import')")
+ public CommonResult<MesMdItemTypeImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesMdItemTypeImportExcelVO> list = ExcelUtils.read(file, MesMdItemTypeImportExcelVO.class);
+ return success(itemTypeService.importItemTypeList(list, updateSupport));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java
new file mode 100644
index 0000000..a4c4ce2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportExcelVO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * MES 鐗╂枡浜у搧鍒嗙被瀵煎叆 Excel VO
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MesMdItemTypeImportExcelVO {
+
+ @ExcelProperty("鍒嗙被缂栫爜")
+ private String code;
+
+ @ExcelProperty("鍒嗙被鍚嶇О")
+ private String name;
+
+ @ExcelProperty("鐖跺垎绫荤紪鐮�")
+ private String parentCode;
+
+ @ExcelProperty("鐗╂枡/浜у搧鏍囪瘑")
+ private String itemOrProduct;
+
+ @ExcelProperty("鏄剧ず鎺掑簭")
+ private Integer sort;
+
+ @ExcelProperty("鐘舵��")
+ private Integer status;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportRespVO.java
new file mode 100644
index 0000000..d5c99c7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/type/MesMdItemTypeImportRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "绠＄悊鍚庡彴 - MES 鐗╂枡浜у搧鍒嗙被瀵煎叆 Response VO")
+@Data
+@Builder
+public class MesMdItemTypeImportRespVO {
+
+ @Schema(description = "鍒涘缓鎴愬姛鐨勫垎绫绘暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> createList;
+
+ @Schema(description = "鏇存柊鎴愬姛鐨勫垎绫绘暟缁�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<String> updateList;
+
+ @Schema(description = "瀵煎叆澶辫触鐨勫垎绫婚泦鍚� key 涓哄垎绫诲悕锛寁alue 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Map<String, String> failureList;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 4f717ea..efc8ff9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -18,6 +18,7 @@
ErrorCode MD_ITEM_TYPE_CODE_DUPLICATE = new ErrorCode(1_040_100_005, "鍚屼竴鐖跺垎绫讳笅宸插瓨鍦ㄨ缂栫爜鐨勫垎绫�");
ErrorCode MD_ITEM_TYPE_PARENT_IS_CHILD = new ErrorCode(1_040_100_006, "涓嶈兘璁剧疆鑷繁鐨勫瓙鍒嗙被涓虹埗鍒嗙被");
ErrorCode MD_ITEM_TYPE_EXITS_ITEM = new ErrorCode(1_040_100_007, "璇ュ垎绫讳笅瀛樺湪鐗╂枡锛屾棤娉曞垹闄�");
+ ErrorCode MD_ITEM_TYPE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_100_008, "瀵煎叆鐨勭墿鏂欏垎绫绘暟鎹笉鑳戒负绌�");
// ========== MES 鍩虹鏁版嵁-璁￠噺鍗曚綅锛�1-040-101-000锛� ==========
ErrorCode MD_UNIT_MEASURE_NOT_EXISTS = new ErrorCode(1_040_101_000, "璁￠噺鍗曚綅涓嶅瓨鍦�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeService.java
index e6864f0..8ed799b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeService.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.mes.service.md.item;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
@@ -90,4 +92,13 @@
*/
List<MesMdItemTypeDO> getItemTypeChildrenList(Long parentId);
+ /**
+ * 瀵煎叆鐗╂枡浜у搧鍒嗙被
+ *
+ * @param importList 瀵煎叆鍒楄〃
+ * @param isUpdateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MesMdItemTypeImportRespVO importItemTypeList(List<MesMdItemTypeImportExcelVO> importList, Boolean isUpdateSupport);
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeServiceImpl.java
index ab5b7a2..9d51f7c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemTypeServiceImpl.java
@@ -2,10 +2,13 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mdm.api.category.MdmItemCategoryApi;
import cn.iocoder.yudao.module.mdm.api.category.dto.MdmItemCategoryRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.type.MesMdItemTypeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
@@ -230,4 +233,77 @@
return mesDO;
}
+ @Override
+ @org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
+ public MesMdItemTypeImportRespVO importItemTypeList(List<MesMdItemTypeImportExcelVO> importList, Boolean isUpdateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(MD_ITEM_TYPE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesMdItemTypeImportRespVO respVO = MesMdItemTypeImportRespVO.builder()
+ .createList(new ArrayList<>()).updateList(new ArrayList<>())
+ .failureList(new LinkedHashMap<>()).build();
+
+ // 1. 寤虹珛缂栫爜 -> ID 鏄犲皠锛堢幇鏈夊垎绫� + 鏈鏂板缓鍒嗙被锛夛紝鐢ㄤ簬瑙ｆ瀽"鐖跺垎绫荤紪鐮�"鍒�
+ Map<String, Long> codeIdMap = new HashMap<>();
+ for (MesMdItemTypeDO itemType : itemTypeMapper.selectList()) {
+ codeIdMap.put(itemType.getCode(), itemType.getId());
+ }
+ Map<String, Long> importedCodeIdMap = new HashMap<>();
+
+ // 2. 閬嶅巻瀵煎叆
+ for (MesMdItemTypeImportExcelVO importVO : importList) {
+ // 2.1 鍩虹鏍￠獙
+ if (StrUtil.isBlank(importVO.getCode()) || StrUtil.isBlank(importVO.getName())) {
+ respVO.getFailureList().put(StrUtil.blankToDefault(importVO.getName(), importVO.getCode()), "鍒嗙被缂栫爜鍜屽垎绫诲悕绉颁笉鑳戒负绌�");
+ continue;
+ }
+ // 2.2 瑙ｆ瀽鐖跺垎绫� ID
+ Long parentId = MesMdItemTypeDO.PARENT_ID_ROOT;
+ if (StrUtil.isNotBlank(importVO.getParentCode())) {
+ Long pid = importedCodeIdMap.get(importVO.getParentCode()) != null
+ ? importedCodeIdMap.get(importVO.getParentCode())
+ : codeIdMap.get(importVO.getParentCode());
+ if (pid == null) {
+ respVO.getFailureList().put(importVO.getName(), "鐖跺垎绫荤紪鐮佷笉瀛樺湪锛�" + importVO.getParentCode());
+ continue;
+ }
+ parentId = pid;
+ }
+
+ // 2.3 宸插瓨鍦紙鎸夌紪鐮佸垽鏂級
+ MesMdItemTypeDO existByCode = itemTypeMapper.selectByCode(importVO.getCode());
+ if (existByCode != null) {
+ if (!Boolean.TRUE.equals(isUpdateSupport)) {
+ respVO.getFailureList().put(importVO.getName(), "鍒嗙被缂栫爜宸插瓨鍦�");
+ continue;
+ }
+ MesMdItemTypeDO updateObj = BeanUtils.toBean(importVO, MesMdItemTypeDO.class);
+ updateObj.setId(existByCode.getId());
+ updateObj.setParentId(parentId);
+ itemTypeMapper.updateById(updateObj);
+ respVO.getUpdateList().add(importVO.getName());
+ } else {
+ // 2.4 鏍￠獙鍚屼竴鐖跺垎绫讳笅鍚嶇О鍞竴
+ MesMdItemTypeDO existByName = itemTypeMapper.selectByParentIdAndName(parentId, importVO.getName());
+ if (existByName != null) {
+ respVO.getFailureList().put(importVO.getName(), "鍚屼竴鐖跺垎绫讳笅宸插瓨鍦ㄨ鍚嶇О鐨勫垎绫�");
+ continue;
+ }
+ // 2.5 鏍￠獙鍚屼竴鐖跺垎绫讳笅缂栫爜鍞竴
+ MesMdItemTypeDO existByParentCode = itemTypeMapper.selectByParentIdAndCode(parentId, importVO.getCode());
+ if (existByParentCode != null) {
+ respVO.getFailureList().put(importVO.getName(), "鍚屼竴鐖跺垎绫讳笅宸插瓨鍦ㄨ缂栫爜鐨勫垎绫�");
+ continue;
+ }
+ // 2.6 鏂板
+ MesMdItemTypeDO newObj = BeanUtils.toBean(importVO, MesMdItemTypeDO.class);
+ newObj.setParentId(parentId);
+ itemTypeMapper.insert(newObj);
+ respVO.getCreateList().add(importVO.getName());
+ importedCodeIdMap.put(importVO.getCode(), newObj.getId());
+ }
+ }
+ return respVO;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3