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/qc/template/MesQcTemplateServiceImpl.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateServiceImpl.java
index 912153b..1a633af 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateServiceImpl.java
@@ -20,6 +20,13 @@
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.qc.template.vo.MesQcTemplateImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.MesQcTemplateImportRespVO;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璐ㄦ鏂规 Service 瀹炵幇绫�
@@ -119,5 +126,62 @@
return templateMapper.selectByIds(ids);
}
+
+ @Override
+ public MesQcTemplateImportRespVO importTemplateList(List<MesQcTemplateImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_TEMPLATE_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcTemplateImportRespVO respVO = MesQcTemplateImportRespVO.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;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "鏂规鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getTypes())) {
+ respVO.getFailureCodes().put(key, "妫�娴嬬绫讳笉鑳戒负绌�");
+ return;
+ }
+ List<Integer> types;
+ try {
+ types = StrUtil.split(importItem.getTypes(), ',').stream()
+ .map(s -> Integer.valueOf(s.trim())).collect(java.util.stream.Collectors.toList());
+ } catch (NumberFormatException e) {
+ respVO.getFailureCodes().put(key, "妫�娴嬬绫绘牸寮忎笉姝ｇ‘");
+ return;
+ }
+ Integer status = ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus());
+ MesQcTemplateDO exist = templateMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ MesQcTemplateDO template = BeanUtils.toBean(importItem, MesQcTemplateDO.class);
+ template.setId(null);
+ template.setTypes(types);
+ template.setStatus(status);
+ templateMapper.insert(template);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ MesQcTemplateDO updateObj = BeanUtils.toBean(importItem, MesQcTemplateDO.class);
+ updateObj.setId(exist.getId());
+ updateObj.setCode(exist.getCode());
+ updateObj.setTypes(types);
+ updateObj.setStatus(status);
+ templateMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "鏂规缂栧彿宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3