From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java
index 1ec9671..0ae9615 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryTypeServiceImpl.java
@@ -16,6 +16,14 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.type.MesDvMachineryTypeImportRespVO;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璁惧绫诲瀷 Service 瀹炵幇绫�
@@ -188,4 +196,53 @@
return result;
}
+
+ @Override
+ public MesDvMachineryTypeImportRespVO importMachineryTypeList(List<MesDvMachineryTypeImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_MACHINERY_TYPE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvMachineryTypeImportRespVO respVO = MesDvMachineryTypeImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "绫诲瀷缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ Long parentId = MesDvMachineryTypeDO.PARENT_ID_ROOT;
+ if (StrUtil.isNotBlank(importItem.getParentCode())) {
+ MesDvMachineryTypeDO parent = machineryTypeMapper.selectByCode(importItem.getParentCode());
+ if (parent == null) {
+ respVO.getFailureCodes().put(key, "鐖剁被鍨嬩笉瀛樺湪锛�" + importItem.getParentCode());
+ return;
+ }
+ parentId = parent.getId();
+ }
+ try {
+ MesDvMachineryTypeSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvMachineryTypeSaveReqVO.class);
+ saveReqVO.setParentId(parentId);
+ saveReqVO.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
+ saveReqVO.setSort(ObjUtil.defaultIfNull(importItem.getSort(), 0));
+ MesDvMachineryTypeDO exist = machineryTypeMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ createMachineryType(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCode());
+ } else if (updateSupport) {
+ saveReqVO.setId(exist.getId());
+ updateMachineryType(saveReqVO);
+ respVO.getUpdateCodes().add(saveReqVO.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "绫诲瀷缂栫爜宸插瓨鍦細" + importItem.getCode());
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3