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/checkrecord/MesDvCheckRecordServiceImpl.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/checkrecord/MesDvCheckRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java
index bedce08..8b6980c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java
@@ -28,6 +28,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.checkrecord.vo.MesDvCheckRecordImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.checkrecord.vo.MesDvCheckRecordImportRespVO;
+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.module.mes.dal.dataobject.dv.checkplan.MesDvCheckPlanDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.checkplan.MesDvCheckPlanMapper;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璁惧鐐规璁板綍 Service 瀹炵幇绫�
@@ -37,6 +47,12 @@
@Service
@Validated
public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
+
+ @Resource
+ private MesDvCheckPlanMapper checkPlanMapper;
+
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
@Resource
@@ -198,4 +214,52 @@
checkRecordLineService.createCheckRecordLineList(lines);
}
+
+ @Override
+ public MesDvCheckRecordImportRespVO importCheckRecordList(List<MesDvCheckRecordImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_CHECK_RECORD_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvCheckRecordImportRespVO respVO = MesDvCheckRecordImportRespVO.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 = "绗� " + currentIndex + " 琛�";
+ if (StrUtil.isBlank(importItem.getMachineryCode())) {
+ respVO.getFailureCodes().put(key, "璁惧缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getCheckTime() == null) {
+ respVO.getFailureCodes().put(key, "鐐规鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+ MesDvMachineryDO machinery = machineryMapper.selectByCode(importItem.getMachineryCode());
+ if (machinery == null) {
+ respVO.getFailureCodes().put(key, "璁惧涓嶅瓨鍦細" + importItem.getMachineryCode());
+ return;
+ }
+ Long planId = null;
+ if (StrUtil.isNotBlank(importItem.getPlanCode())) {
+ MesDvCheckPlanDO plan = checkPlanMapper.selectByCode(importItem.getPlanCode());
+ if (plan == null) {
+ respVO.getFailureCodes().put(key, "鐐规淇濆吇鏂规涓嶅瓨鍦細" + importItem.getPlanCode());
+ return;
+ }
+ planId = plan.getId();
+ }
+ try {
+ MesDvCheckRecordSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvCheckRecordSaveReqVO.class);
+ saveReqVO.setMachineryId(machinery.getId());
+ saveReqVO.setPlanId(planId);
+ Long id = createCheckRecord(saveReqVO);
+ respVO.getCreateCodes().add(String.valueOf(id));
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3