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/qc/ncr/MesQcNcrServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 ce59c24..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
@@ -9,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;
@@ -47,6 +51,7 @@
*/
@Service
@Validated
+@Slf4j
public class MesQcNcrServiceImpl implements MesQcNcrService {
@Resource
@@ -57,6 +62,12 @@
@Resource
private MdmItemApi mdmItemApi;
+
+ @Resource
+ private MesQcItemResolver qcItemResolver;
+
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
@Lazy
@@ -74,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());
@@ -87,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
@@ -208,9 +233,8 @@
* 鏍¢獙鐗╂枡瀛樺湪
*/
private void validateItemExists(Long itemId) {
- if (itemId != null) {
- mdmItemApi.getItem(itemId).getCheckedData();
- }
+ // 涓嶅悎鏍煎搧鍗曠殑鐗╂枡鍙兘鏉ヨ嚜 MDM 鍗曟嵁鎴� MES 宸ュ崟锛岄渶鍏煎涓ゅ ID
+ qcItemResolver.validateItemExists(itemId);
}
/**
--
Gitblit v1.9.3