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/rqc/MesQcRqcServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
index 0273c75..d20475f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
@@ -21,6 +23,10 @@
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
+import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -35,11 +41,21 @@
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.rqc.vo.MesQcRqcImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcImportRespVO;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.date.DateUtil;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 閫�璐ф楠屽崟锛圧QC锛� Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -55,6 +71,10 @@
@Resource
@Lazy
private MesMdItemService itemService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MesQcItemResolver qcItemResolver;
@Resource
@Lazy
private MesQcDefectRecordService defectRecordService;
@@ -76,6 +96,10 @@
@Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ @Lazy
+ private MesQcNcrService ncrService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -120,8 +144,8 @@
private void validateRqcSaveData(MesQcRqcSaveReqVO reqVO) {
// 鏍￠獙缂栧彿鍞竴
validateRqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦�
- itemService.validateItemExists(reqVO.getItemId());
+ // 鏍￠獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦紙鍏煎 mdm_item.id / mes_md_item.id锛�
+ qcItemResolver.validateItemExists(reqVO.getItemId());
adminUserApi.validateUser(reqVO.getInspectorUserId());
}
@@ -149,8 +173,31 @@
MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
rqcMapper.updateById(updateObj);
- // 3. 鍥炲啓鏉ユ簮鍗曟嵁
+ // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
+ generateNcrIfNeeded(rqc);
+
+ // 4. 鍥炲啓鏉ユ簮鍗曟嵁
writeBackSourceDoc(rqc);
+ }
+
+ /**
+ * 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR锛堜笉鍚堟牸鍝佸鐞嗗崟锛�
+ *
+ * @param rqc 閫�璐ф楠屽崟
+ */
+ private void generateNcrIfNeeded(MesQcRqcDO rqc) {
+ BigDecimal unqualifiedQty = rqc.getUnqualifiedQuantity();
+ if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
+ saveReqVO.setName("涓嶅悎鏍煎搧澶勭悊鍗�");
+ saveReqVO.setQcType(MesQcTypeEnum.RQC.getType());
+ saveReqVO.setQcId(rqc.getId());
+ saveReqVO.setItemId(rqc.getItemId());
+ saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
+ saveReqVO.setDefectDescription("鐢遍��璐ф楠�(" + rqc.getCode() + ")鑷姩鐢熸垚");
+ ncrService.createNcr(saveReqVO);
}
/**
@@ -303,4 +350,64 @@
rqcMapper.updateById(updateRqc);
}
+
+ @Override
+ public MesQcRqcImportRespVO importRqcList(List<MesQcRqcImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(QC_RQC_IMPORT_LIST_IS_EMPTY);
+ }
+ MesQcRqcImportRespVO respVO = MesQcRqcImportRespVO.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 = "绗� " + currentIndex + " 琛�";
+ if (StrUtil.isBlank(importItem.getItemCode())) {
+ respVO.getFailureCodes().put(key, "浜у搧鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getCheckQuantity() == null || importItem.getQualifiedQuantity() == null || importItem.getUnqualifiedQuantity() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫暟閲忋�佸悎鏍煎搧鏁伴噺銆佷笉鍚堟牸鏁伴噺鍧囦笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getCheckQuantity().compareTo(importItem.getQualifiedQuantity().add(importItem.getUnqualifiedQuantity())) != 0) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫暟閲忓繀椤荤瓑浜庡悎鏍煎搧鏁伴噺涓庝笉鍚堟牸鍝佹暟閲忎箣鍜�");
+ return;
+ }
+ if (importItem.getInspectorUserId() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬩汉鍛樹笉鑳戒负绌�");
+ return;
+ }
+ if (importItem.getInspectDate() == null) {
+ respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
+ return;
+ }
+ // 閫�璐ф楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙ｆ瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
+ if (item == null) {
+ respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
+ return;
+ }
+ try {
+ MesQcRqcSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcRqcSaveReqVO.class);
+ createReqVO.setCode(generateImportCode("RQC", index));
+ createReqVO.setName(StrUtil.blankToDefault(importItem.getName(), "閫�璐ф楠屽崟"));
+ createReqVO.setItemId(item.getId());
+ createReqVO.setType(ObjUtil.defaultIfNull(importItem.getType(), MesQcTypeEnum.RQC.getType()));
+ Long id = createRqc(createReqVO);
+ MesQcRqcDO created = rqcMapper.selectById(id);
+ respVO.getCreateCodes().add(created != null && StrUtil.isNotBlank(created.getCode()) ? created.getCode() : key);
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ private String generateImportCode(String prefix, AtomicInteger seq) {
+ return prefix + DateUtil.format(LocalDateTime.now(), "yyyyMMddHHmmss")
+ + String.format("%03d", seq.incrementAndGet());
+ }
+
}
--
Gitblit v1.9.3