From bc1b16a708ca7bec89d2e1a435c023477f107a59 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 12:42:04 +0800
Subject: [PATCH] feat(mes): 添加MES系统自动编码规则支持
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
index 56ed686..fbaf135 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
@@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.mes.service.qc.ncr;
+import java.util.List;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -8,16 +9,20 @@
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcNcrMapper;
import cn.iocoder.yudao.module.mes.enums.qc.MesNcrStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.util.Collection;
@@ -28,6 +33,16 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+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 涓嶅悎鏍煎搧澶勭悊鍗曪紙NCR锛� Service 瀹炵幇绫�
@@ -36,13 +51,23 @@
*/
@Service
@Validated
+@Slf4j
public class MesQcNcrServiceImpl implements MesQcNcrService {
+
+ @Resource
+ private MesMdItemService itemService;
@Resource
private MesQcNcrMapper ncrMapper;
@Resource
private MdmItemApi mdmItemApi;
+
+ @Resource
+ private MesQcItemResolver qcItemResolver;
+
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
@Lazy
@@ -60,6 +85,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createNcr(MesQcNcrSaveReqVO createReqVO) {
+ if (StrUtil.isBlank(createReqVO.getCode())) {
+ createReqVO.setCode(generateNcrCode());
+ }
// 1. 鏍¢獙鏁版嵁
validateNcrCodeUnique(null, createReqVO.getCode());
validateItemExists(createReqVO.getItemId());
@@ -73,6 +101,17 @@
}
ncrMapper.insert(ncr);
return ncr.getId();
+ }
+
+ private String generateNcrCode() {
+ try {
+ return autoCodeRecordService.generateAutoCode(MesMdAutoCodeRuleCodeEnum.QC_NCR_CODE.getCode());
+ } catch (Exception e) {
+ log.warn("NCR 缂栫爜瑙勫垯 {} 涓嶅彲鐢紝闄嶇骇浣跨敤鏃堕棿鎴崇紪鐮�",
+ MesMdAutoCodeRuleCodeEnum.QC_NCR_CODE.getCode(), e);
+ return "NCR" + LocalDateTime.now()
+ .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+ }
}
@Override
@@ -194,9 +233,8 @@
* 鏍¢獙鐗╂枡瀛樺湪
*/
private void validateItemExists(Long itemId) {
- if (itemId != null) {
- mdmItemApi.getItem(itemId).getCheckedData();
- }
+ // 涓嶅悎鏍煎搧鍗曠殑鐗╂枡鍙兘鏉ヨ嚜 MDM 鍗曟嵁鎴� MES 宸ュ崟锛岄渶鍏煎涓ゅ ID
+ qcItemResolver.validateItemExists(itemId);
}
/**
@@ -232,4 +270,50 @@
return convertMap(ncrMapper.selectBatchIds(ids), MesQcNcrDO::getId);
}
+
+ @Override
+ public MesQcNcrImportRespVO importNcrList(List<MesQcNcrImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_NCR_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcNcrImportRespVO respVO = MesQcNcrImportRespVO.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, "NCR鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getName())) {
+ respVO.getFailureCodes().put(key, "NCR鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if (StrUtil.isBlank(importItem.getItemCode())) {
+ respVO.getFailureCodes().put(key, "涓嶅悎鏍肩墿鏂欑紪鐮佷笉鑳戒负绌�");
+ return;
+ }
+ MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode());
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
+ return;
+ }
+ if (ncrMapper.selectByCode(importItem.getCode()) != null) {
+ respVO.getFailureCodes().put(key, "NCR鍗曞彿宸插瓨鍦�");
+ return;
+ }
+ try {
+ MesQcNcrSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcNcrSaveReqVO.class);
+ createReqVO.setItemId(item.getId());
+ createNcr(createReqVO);
+ respVO.getCreateCodes().add(importItem.getCode());
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3