From 616a6b2e9a7824da8d11a4e11730fd2f9b615299 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 09:46:53 +0800
Subject: [PATCH] fix(qc): 修复巡检记录校验缺少租户隔离问题

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java |   84 +++++++++++++++++++++++++++++-------------
 1 files changed, 58 insertions(+), 26 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..b807291 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
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.mes.service.qc.rqc;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -21,6 +22,9 @@
 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.enums.qc.MesQcCheckResultEnum;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -39,11 +43,14 @@
 /**
  * MES 閫�璐ф楠屽崟锛圧QC锛� Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
 public class MesQcRqcServiceImpl implements MesQcRqcService {
+
+    @Resource
+    private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
 
     @Resource
     private MesQcRqcMapper rqcMapper;
@@ -77,35 +84,42 @@
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    @Lazy
+    private MesQcNcrService ncrService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createRqc(MesQcRqcSaveReqVO createReqVO) {
         // 1.1 鏍¢獙鏁版嵁
         validateRqcSaveData(createReqVO);
-        // 1.2 鏍规嵁鐗╂枡 + 妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶆ā鏉�
-        MesQcTemplateItemDO templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
-                createReqVO.getItemId(), createReqVO.getType());
-        Long templateId = templateItem.getTemplateId();
+        // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
         // 1.3 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
         String sourceDocCode = validateAndGetSourceDocCode(
                 createReqVO.getSourceDocType(), createReqVO.getSourceDocId());
 
         // 2. 鎻掑叆涓昏〃
         MesQcRqcDO rqc = BeanUtils.toBean(createReqVO, MesQcRqcDO.class)
-                .setTemplateId(templateId)
+                .setTemplateId(null)
                 .setSourceDocCode(sourceDocCode)
                 .setStatus(MesQcStatusEnum.DRAFT.getStatus());
+        if (Objects.equals(createReqVO.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)
+                && createReqVO.getSourceLineId() != null) {
+            var line = returnSalesLineService.validateReturnSalesLineExists(createReqVO.getSourceLineId());
+            if (!Objects.equals(line.getReturnId(), createReqVO.getSourceDocId())
+                    || !Objects.equals(line.getItemId(), createReqVO.getItemId())) {
+                throw exception(WM_RETURN_SALES_DETAIL_SOURCE_MISMATCH);
+            }
+            rqc.setBatchCode(line.getBatchCode());
+        }
         rqcMapper.insert(rqc);
-
-        // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
-        rqcLineService.createLinesFromTemplate(rqc.getId(), templateId);
         return rqc.getId();
     }
 
     @Override
     public void updateRqc(MesQcRqcSaveReqVO updateReqVO) {
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
-        validateRqcStatusPrepare(updateReqVO.getId());
+        MesQcRqcDO existingRqc = validateRqcStatusPrepare(updateReqVO.getId());
         // 1.2 鏍¢獙鏁版嵁
         validateRqcSaveData(updateReqVO);
 
@@ -114,6 +128,8 @@
         updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
         updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
         updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
+        if (Objects.equals(existingRqc.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)
+                && existingRqc.getSourceLineId() != null) updateObj.setBatchCode(null);
         rqcMapper.updateById(updateObj);
     }
 
@@ -128,32 +144,48 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void finishRqc(Long id) {
+        completionHelper.lockDocument("rqc", id);
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
         MesQcRqcDO rqc = validateRqcStatusPrepare(id);
-        // 1.2 鏍¢獙妫�娴嬬粨璁哄繀濉�
-        if (rqc.getCheckResult() == null) {
-            throw exception(QC_RQC_CHECK_RESULT_EMPTY);
-        }
-        // 1.3 鏍¢獙鍚堟牸鍝� + 涓嶅悎鏍煎搧 = 妫�娴嬫暟閲�
-        if (rqc.getCheckQuantity() != null && rqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
-            BigDecimal qualified = rqc.getQualifiedQuantity() != null ? rqc.getQualifiedQuantity() : BigDecimal.ZERO;
-            BigDecimal unqualified = rqc.getUnqualifiedQuantity() != null ? rqc.getUnqualifiedQuantity() : BigDecimal.ZERO;
-            if (qualified.add(unqualified).compareTo(rqc.getCheckQuantity()) != 0) {
-                throw exception(QC_RQC_QUANTITY_MISMATCH);
-            }
-        }
-        // 1.4 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
-        indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.RQC.getType());
+        int result = completionHelper.validateAndGetResult("rqc", id, rqc.getQualifiedQuantity(), rqc.getUnqualifiedQuantity(), rqc.getCheckQuantity());
+        rqc.setCheckResult(result);
+
 
         // 2. 鏇存柊鐘舵�佷负宸插畬鎴�
-        MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+        MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
         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;
+        }
+        String ncrCode = "NCR" + java.time.LocalDateTime.now()
+                .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+        MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
+        saveReqVO.setCode(ncrCode);
+        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);
+    }
+
+    /**
      * 鍥炲啓鏉ユ簮鍗曟嵁锛圧QC 瀹屾垚鍚庯級
      *
      * <p>鏍规嵁 sourceDocType 鍒嗗彂锛�

--
Gitblit v1.9.3