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/meteringcheck/MesDvMeteringCheckServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/meteringcheck/MesDvMeteringCheckServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/meteringcheck/MesDvMeteringCheckServiceImpl.java
index b1e0f3c..5b90951 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/meteringcheck/MesDvMeteringCheckServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/meteringcheck/MesDvMeteringCheckServiceImpl.java
@@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.mes.service.dv.meteringcheck;
+import java.util.List;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
@@ -22,6 +23,15 @@
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_CHECK_CODE_DUPLICATE;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_CHECK_NOT_EXISTS;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_CHECK_IMPORT_LIST_IS_EMPTY;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.metering.MesDvMeteringMapper;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.collection.CollUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璁￠噺妫�娴嬭褰� Service 瀹炵幇绫�
@@ -31,6 +41,9 @@
@Service
@Validated
public class MesDvMeteringCheckServiceImpl implements MesDvMeteringCheckService {
+
+ @Resource
+ private MesDvMeteringMapper meteringMapper;
@Resource
private MesDvMeteringCheckMapper meteringCheckMapper;
@@ -162,4 +175,50 @@
}
}
+
+ @Override
+ public MesDvMeteringCheckImportRespVO importMeteringCheckList(List<MesDvMeteringCheckImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_METERING_CHECK_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvMeteringCheckImportRespVO respVO = MesDvMeteringCheckImportRespVO.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.getCheckCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCheckCode())) {
+ respVO.getFailureCodes().put(key, "妫�娴嬬紪鍙蜂笉鑳戒负绌�");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getMeteringCode())) {
+ respVO.getFailureCodes().put(key, "璁￠噺鍣ㄥ叿缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getCheckDate() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getCheckResult() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬬粨璁轰笉鑳戒负绌�");
+ return;
+ }
+ MesDvMeteringDO metering = meteringMapper.selectByCode(importItem.getMeteringCode());
+ if (metering == null) {
+ respVO.getFailureCodes().put(key, "璁￠噺鍣ㄥ叿涓嶅瓨鍦細" + importItem.getMeteringCode());
+ return;
+ }
+ try {
+ MesDvMeteringCheckSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvMeteringCheckSaveReqVO.class);
+ saveReqVO.setMeteringId(metering.getId());
+ createMeteringCheck(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCheckCode());
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3