From 6fa82a1ad7c3ae061ef499f0d0806a16846e122b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 16:55:02 +0800
Subject: [PATCH] feat(mes): 来料检验与不合格退货闭环优化

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java |   72 +++++++++++++----------------------
 1 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
index fc6a153..e11c611 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -63,6 +63,9 @@
 public class MesQcIqcServiceImpl implements MesQcIqcService {
 
     @Resource
+    private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+    @Resource
     private MesQcIqcMapper iqcMapper;
 
     @Resource
@@ -104,33 +107,15 @@
         // 1.2 鏍¢獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
         String sourceDocCode = validateAndGetSourceDocCode(
                 createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
-        // 1.3 鏍规嵁浜у搧 + IQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
-        List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
-                createReqVO.getItemId(), MesQcTypeEnum.IQC.getType(), null, null);
-        if (CollUtil.isEmpty(templateItems)) {
-            throw exception(QC_NO_TEMPLATE);
-        }
-        MesQcTemplateItemDO templateItem = templateItems.get(0);
-        if (createReqVO.getTemplateId() != null) {
-            templateItem = templateItems.stream()
-                    .filter(item -> Objects.equals(item.getTemplateId(), createReqVO.getTemplateId()))
-                    .findFirst().orElse(null);
-            if (templateItem == null) {
-                throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
-            }
-        }
-        Long templateId = templateItem.getTemplateId();
+        // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
 
         // 2. 鎻掑叆涓昏〃
         MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
-                .setTemplateId(templateId)
-                .setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity()))
+                .setTemplateId(null)
+                .setCheckQuantity(resolveCheckQuantity(createReqVO.getQualifiedQuantity(), createReqVO.getUnqualifiedQuantity()))
                 .setSourceDocCode(sourceDocCode)
                 .setStatus(MesQcStatusEnum.DRAFT.getStatus());
         iqcMapper.insert(iqc);
-
-        // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
-        iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
         return iqc.getId();
     }
 
@@ -146,8 +131,18 @@
         updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
         updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
         updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
-        updateObj.setCheckQuantity(updateReqVO.getQualifiedQuantity().add(updateReqVO.getUnqualifiedQuantity()));
+        updateObj.setCheckQuantity(resolveCheckQuantity(updateReqVO.getQualifiedQuantity(), updateReqVO.getUnqualifiedQuantity()));
         iqcMapper.updateById(updateObj);
+    }
+
+    /**
+     * 妫�楠屾暟閲� = 鍚堟牸鏁伴噺 + 涓嶅悎鏍兼暟閲忥紱涓よ�呮湭濉叏鏃剁暀绌猴紝绛夋楠屽憳褰曞叆鍚庡啀璁$畻
+     */
+    private BigDecimal resolveCheckQuantity(BigDecimal qualified, BigDecimal unqualified) {
+        if (qualified == null || unqualified == null) {
+            return null;
+        }
+        return qualified.add(unqualified);
     }
 
     private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
@@ -175,17 +170,16 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void finishIqc(Long id) {
+        completionHelper.lockDocument("iqc", id);
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
         MesQcIqcDO iqc = validateIqcStatusPrepare(id);
-        if (iqc.getCheckResult() == null) {
-            throw exception(QC_IQC_CHECK_RESULT_EMPTY);
-        }
-        // 1.2 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
-        indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IQC.getType());
+        int result = completionHelper.validateAndGetResult("iqc", id, iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity(), iqc.getCheckQuantity());
+        iqc.setCheckResult(result);
+
 
         // 2. 鏇存柊鐘舵�佷负宸插畬鎴�
         MesQcIqcDO updateObj = new MesQcIqcDO()
-                .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+                .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
         iqcMapper.updateById(updateObj);
 
         // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
@@ -387,17 +381,6 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createIqcFromArrivalNotice(Long noticeId, MesWmArrivalNoticeLineDO line, String noticeCode, Long vendorId) {
-        // 1. 鏍¢獙鐗╂枡鏄惁閰嶇疆浜� IQC 妫�楠屾ā鏉�
-        MesQcTemplateItemDO templateItem;
-        try {
-            templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
-                    line.getItemId(), MesQcTypeEnum.IQC.getType());
-        } catch (Exception e) {
-            // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
-            String itemInfo = getItemInfo(line.getItemId());
-            throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
-        }
-        Long templateId = templateItem.getTemplateId();
 
         // 2. 鐢熸垚妫�楠屽崟缂栫爜
         String code = "IQC" + System.currentTimeMillis();
@@ -406,7 +389,7 @@
         MesQcIqcDO iqc = new MesQcIqcDO();
         iqc.setCode(code);
         iqc.setName(noticeCode + "-鐗╂枡妫�楠�");
-        iqc.setTemplateId(templateId);
+
         iqc.setSourceDocType(MesBizTypeConstants.WM_ARRIVAL_NOTICE);
         iqc.setSourceDocId(noticeId);
         iqc.setSourceLineId(line.getId());
@@ -420,15 +403,14 @@
         }
         iqc.setItemId(line.getItemId());
         iqc.setReceivedQuantity(line.getArrivalQuantity());
-        iqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭~鍐�
-        iqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
-        iqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
+        // 鍚堟牸/涓嶅悎鏍兼暟閲忕暀绌猴紝鐢辨楠屽憳濉啓鏃跺綍鍏ワ紙涓嶅啀榛樿 0锛岄伩鍏嶈鍒や负銆屽凡妫�楠屽悎鏍� 0銆嶏級
+        iqc.setCheckQuantity(null);
+        iqc.setQualifiedQuantity(null);
+        iqc.setUnqualifiedQuantity(null);
         iqc.setReceiveDate(java.time.LocalDateTime.now());
         iqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
         iqcMapper.insert(iqc);
 
-        // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
-        iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
 
         return iqc.getId();
     }

--
Gitblit v1.9.3