From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java
index feb85e3..29851d5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectServiceImpl.java
@@ -18,11 +18,17 @@
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.qc.defect.vo.MesQcDefectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectImportRespVO;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 缂洪櫡绫诲瀷 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -116,4 +122,52 @@
return defectMapper.selectByIds(ids);
}
+
+ @Override
+ public MesQcDefectImportRespVO importDefectList(List<MesQcDefectImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_DEFECT_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcDefectImportRespVO respVO = MesQcDefectImportRespVO.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 (importItem.getType() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬮」绫诲瀷涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getLevel() == null) {
+ respVO.getFailureCodes().put(key, "缂洪櫡绛夌骇涓嶈兘涓虹┖");
+ return;
+ }
+ MesQcDefectDO exist = defectMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ MesQcDefectDO defect = BeanUtils.toBean(importItem, MesQcDefectDO.class);
+ defect.setId(null);
+ defectMapper.insert(defect);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } else if (updateSupport) {
+ MesQcDefectDO updateObj = BeanUtils.toBean(importItem, MesQcDefectDO.class);
+ updateObj.setId(exist.getId());
+ updateObj.setCode(exist.getCode());
+ defectMapper.updateById(updateObj);
+ respVO.getUpdateCodes().add(importItem.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "缂洪櫡缂栫爜宸插瓨鍦�");
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3