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/repair/MesDvRepairServiceImpl.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java
index b6d5e36..c166e6b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairServiceImpl.java
@@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.mes.service.dv.repair;
+import java.util.List;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -18,6 +19,16 @@
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.repair.vo.MesDvRepairImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 缁翠慨宸ュ崟 Service 瀹炵幇绫�
@@ -27,6 +38,9 @@
@Service
@Validated
public class MesDvRepairServiceImpl implements MesDvRepairService {
+
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
@Resource
private MesDvRepairMapper repairMapper;
@@ -170,4 +184,54 @@
.setConfirmUserId(userId).setConfirmDate(LocalDateTime.now()));
}
+
+ @Override
+ public MesDvRepairImportRespVO importRepairList(List<MesDvRepairImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_REPAIR_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvRepairImportRespVO respVO = MesDvRepairImportRespVO.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.getMachineryCode())) {
+ respVO.getFailureCodes().put(key, "璁惧缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getRequireDate() == null) {
+ respVO.getFailureCodes().put(key, "鎶ヤ慨鏃ユ湡涓嶈兘涓虹┖");
+ return;
+ }
+ if (repairMapper.selectByCode(importItem.getCode()) != null) {
+ respVO.getFailureCodes().put(key, "缁翠慨宸ュ崟缂栫爜宸插瓨鍦細" + importItem.getCode());
+ return;
+ }
+ MesDvMachineryDO machinery = machineryMapper.selectByCode(importItem.getMachineryCode());
+ if (machinery == null) {
+ respVO.getFailureCodes().put(key, "璁惧涓嶅瓨鍦細" + importItem.getMachineryCode());
+ return;
+ }
+ try {
+ MesDvRepairSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvRepairSaveReqVO.class);
+ saveReqVO.setMachineryId(machinery.getId());
+ Long id = createRepair(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCode());
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3