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/metering/MesDvMeteringServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/metering/MesDvMeteringServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/metering/MesDvMeteringServiceImpl.java
index 6c5ccbe..3362b7b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/metering/MesDvMeteringServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/metering/MesDvMeteringServiceImpl.java
@@ -25,6 +25,14 @@
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_CODE_DUPLICATE;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_HAS_CHECK_RECORD;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.DV_METERING_IMPORT_LIST_IS_EMPTY;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.metering.vo.MesDvMeteringImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.metering.vo.MesDvMeteringImportRespVO;
+import cn.iocoder.yudao.module.mes.enums.dv.MesDvMeteringStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璁￠噺鍣ㄥ叿 Service 瀹炵幇绫�
@@ -178,4 +186,44 @@
return meteringMapper.selectByIds(ids);
}
+
+ @Override
+ public MesDvMeteringImportRespVO importMeteringList(List<MesDvMeteringImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_METERING_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvMeteringImportRespVO respVO = MesDvMeteringImportRespVO.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 {
+ MesDvMeteringSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvMeteringSaveReqVO.class);
+ saveReqVO.setCategory(ObjUtil.defaultIfNull(importItem.getCategory(), 1));
+ saveReqVO.setCheckCycleCount(ObjUtil.defaultIfNull(importItem.getCheckCycleCount(), 12));
+ saveReqVO.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), MesDvMeteringStatusEnum.IN_USE.getStatus()));
+ MesDvMeteringDO exist = meteringMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ createMetering(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCode());
+ } else if (updateSupport) {
+ saveReqVO.setId(exist.getId());
+ updateMetering(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