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/checkplan/MesDvCheckPlanServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
index fde330c..a93d222 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
@@ -21,6 +21,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.checkplan.vo.MesDvCheckPlanImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.checkplan.vo.MesDvCheckPlanImportRespVO;
+import cn.iocoder.yudao.module.mes.enums.dv.MesDvCheckPlanTypeEnum;
+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 瀹炵幇绫�
@@ -182,4 +190,48 @@
return checkPlanMapper.selectByIds(ids);
}
+
+ @Override
+ public MesDvCheckPlanImportRespVO importCheckPlanList(List<MesDvCheckPlanImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_CHECK_PLAN_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvCheckPlanImportRespVO respVO = MesDvCheckPlanImportRespVO.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;
+ }
+ try {
+ MesDvCheckPlanSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvCheckPlanSaveReqVO.class);
+ saveReqVO.setType(ObjUtil.defaultIfNull(importItem.getType(), MesDvCheckPlanTypeEnum.CHECK.getType()));
+ saveReqVO.setCycleType(ObjUtil.defaultIfNull(importItem.getCycleType(), 1));
+ saveReqVO.setCycleCount(ObjUtil.defaultIfNull(importItem.getCycleCount(), 1));
+ MesDvCheckPlanDO exist = checkPlanMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ createCheckPlan(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCode());
+ } else if (updateSupport) {
+ if (ObjUtil.notEqual(MesDvCheckPlanStatusEnum.PREPARE.getStatus(), exist.getStatus())) {
+ respVO.getFailureCodes().put(key, "鏂规宸插惎鐢紝涓嶈兘鏇存柊锛�" + importItem.getCode());
+ return;
+ }
+ saveReqVO.setId(exist.getId());
+ updateCheckPlan(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