From 3990ae574c221e3764ce9cbc2e4e3eb71b7b1b52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 23:41:23 +0800
Subject: [PATCH] fix(mes): 修复批次正反向追溯链路

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java |  166 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 148 insertions(+), 18 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
index eb962d7..520c197 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -20,6 +20,7 @@
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -31,9 +32,12 @@
 import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
 import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
 import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
+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.wm.productproduce.MesWmProductProduceLineService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,15 +50,30 @@
 
 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.ipqc.vo.MesQcIpqcImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkstationMapper;
+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 杩囩▼妫�楠屽崟锛圛PQC锛� Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
+@Slf4j
 public class MesQcIpqcServiceImpl implements MesQcIpqcService {
+
+    @Resource
+    private MesMdWorkstationMapper workstationMapper;
 
     /**
      * IPQC 淇濆瓨鏁版嵁鏍¢獙涓婁笅鏂�
@@ -101,6 +120,10 @@
     @Resource
     @Lazy
     private MesWmProductProduceLineService productProduceLineService;
+
+    @Resource
+    @Lazy
+    private MesQcNcrService ncrService;
 
     @Resource
     private AdminUserApi adminUserApi;
@@ -213,8 +236,35 @@
         ipqcMapper.updateById(new MesQcIpqcDO()
                 .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()));
 
-        // 3. 鍥炲啓鏉ユ簮鍗曟嵁
+        // 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
+        generateNcrIfNeeded(ipqc);
+
+        // 4. 鍥炲啓鏉ユ簮鍗曟嵁
         writeBackSourceDoc(ipqc);
+    }
+
+    /**
+     * 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR锛堜笉鍚堟牸鍝佸鐞嗗崟锛�
+     *
+     * @param ipqc 杩囩▼妫�楠屽崟
+     */
+    private void generateNcrIfNeeded(MesQcIpqcDO ipqc) {
+        BigDecimal unqualifiedQty = ipqc.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.IPQC.getType());
+        saveReqVO.setQcId(ipqc.getId());
+        saveReqVO.setItemId(ipqc.getItemId());
+        saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
+        saveReqVO.setDefectDescription("鐢辫繃绋嬫楠�(" + ipqc.getCode() + ")鑷姩鐢熸垚");
+        ncrService.createNcr(saveReqVO);
+        log.info("[generateNcrIfNeeded] IPQC({}) 涓嶅悎鏍硷紝鑷姩鍒涘缓 NCR", ipqc.getId());
     }
 
     /**
@@ -225,25 +275,34 @@
      * @param ipqc 杩囩▼妫�楠屽崟
      */
     private void writeBackSourceDoc(MesQcIpqcDO ipqc) {
-        if (ipqc.getSourceDocType() == null) {
-            return;
-        }
-        if (ipqc.getSourceDocId() == null) {
-            throw new IllegalArgumentException(
-                    "IPQC 鍗昜" + ipqc.getId() + "] sourceDocType 闈炵┖浣� sourceDocId 涓虹┖");
+        // 1. 纭畾 sourceDocType/sourceDocId
+        Long sourceDocId = ipqc.getSourceDocId();
+        Long sourceLineId = ipqc.getSourceLineId();
+
+        // 濡傛灉 IPQC 鍗曟病鏈夎缃潵婧愶紝灏濊瘯閫氳繃 taskId 鏌ユ壘鍏宠仈鐨勫緟妫�楠屾姤宸�
+        if (sourceDocId == null && ipqc.getTaskId() != null) {
+            MesProFeedbackDO feedback = feedbackService.getFeedbackListByTaskId(ipqc.getTaskId()).stream()
+                    .filter(f -> MesProFeedbackStatusEnum.UNCHECK.getStatus().equals(f.getStatus()))
+                    .findFirst().orElse(null);
+            if (feedback != null) {
+                sourceDocId = feedback.getId();
+                log.info("[writeBackSourceDoc] IPQC({}) 鏈缃潵婧愬崟鎹紝閫氳繃 taskId({}) 鎵惧埌寰呮楠屾姤宸�({})",
+                        ipqc.getId(), ipqc.getTaskId(), feedback.getId());
+            }
         }
 
-        if (Objects.equals(ipqc.getSourceDocType(), MesBizTypeConstants.PRO_FEEDBACK)) {
-            feedbackService.updateProFeedbackWhenIpqcFinish(ipqc.getSourceDocId(), ipqc.getSourceLineId(),
-                    ObjectUtil.defaultIfNull(ipqc.getQualifiedQuantity(), BigDecimal.ZERO),
-                    ObjectUtil.defaultIfNull(ipqc.getUnqualifiedQuantity(), BigDecimal.ZERO),
-                    ObjectUtil.defaultIfNull(ipqc.getLaborScrapQuantity(), BigDecimal.ZERO),
-                    ObjectUtil.defaultIfNull(ipqc.getMaterialScrapQuantity(), BigDecimal.ZERO),
-                    ObjectUtil.defaultIfNull(ipqc.getOtherScrapQuantity(), BigDecimal.ZERO));
-        } else {
-            throw new IllegalArgumentException(
-                    "IPQC 鍗昜" + ipqc.getId() + "] sourceDocType=" + ipqc.getSourceDocType() + " 鏃犳硶璇嗗埆锛屾棤娉曞洖鍐欐潵婧愬崟鎹�");
+        if (sourceDocId == null) {
+            log.warn("[writeBackSourceDoc] IPQC({}) 鏃犳硶纭畾鏉ユ簮鎶ュ伐锛岃烦杩囧洖鍐�", ipqc.getId());
+            return;
         }
+
+        // 2. 鍥炲啓鎶ュ伐
+        feedbackService.updateProFeedbackWhenIpqcFinish(sourceDocId, sourceLineId,
+                ObjectUtil.defaultIfNull(ipqc.getQualifiedQuantity(), BigDecimal.ZERO),
+                ObjectUtil.defaultIfNull(ipqc.getUnqualifiedQuantity(), BigDecimal.ZERO),
+                ObjectUtil.defaultIfNull(ipqc.getLaborScrapQuantity(), BigDecimal.ZERO),
+                ObjectUtil.defaultIfNull(ipqc.getMaterialScrapQuantity(), BigDecimal.ZERO),
+                ObjectUtil.defaultIfNull(ipqc.getOtherScrapQuantity(), BigDecimal.ZERO));
     }
 
     @Override
@@ -398,4 +457,75 @@
         ipqcMapper.updateById(updateIpqc);
     }
 
+
+    @Override
+    public MesQcIpqcImportRespVO importIpqcList(List<MesQcIpqcImportExcelVO> importList, boolean updateSupport) {
+        if (CollUtil.isEmpty(importList)) {
+            throw exception(QC_IPQC_IMPORT_LIST_IS_EMPTY);
+        }
+        MesQcIpqcImportRespVO respVO = MesQcIpqcImportRespVO.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.getWorkOrderCode())) {
+                respVO.getFailureCodes().put(key, "鐢熶骇宸ュ崟缂栫爜涓嶈兘涓虹┖");
+                return;
+            }
+            if (StrUtil.isBlank(importItem.getWorkstationCode())) {
+                respVO.getFailureCodes().put(key, "宸ヤ綅缂栫爜涓嶈兘涓虹┖");
+                return;
+            }
+            MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(importItem.getWorkOrderCode());
+            if (workOrder == null) {
+                respVO.getFailureCodes().put(key, "鐢熶骇宸ュ崟涓嶅瓨鍦細" + importItem.getWorkOrderCode());
+                return;
+            }
+            MesMdWorkstationDO workstation = workstationMapper.selectByCode(importItem.getWorkstationCode());
+            if (workstation == null) {
+                respVO.getFailureCodes().put(key, "宸ヤ綅涓嶅瓨鍦細" + importItem.getWorkstationCode());
+                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;
+            }
+            BigDecimal scrapSum = ObjUtil.defaultIfNull(importItem.getLaborScrapQuantity(), BigDecimal.ZERO)
+                    .add(ObjUtil.defaultIfNull(importItem.getMaterialScrapQuantity(), BigDecimal.ZERO))
+                    .add(ObjUtil.defaultIfNull(importItem.getOtherScrapQuantity(), BigDecimal.ZERO));
+            if (scrapSum.compareTo(importItem.getUnqualifiedQuantity()) > 0) {
+                respVO.getFailureCodes().put(key, "宸ュ簾銆佹枡搴熴�佸叾浠栧簾鍝佹暟閲忎箣鍜屼笉鑳借秴杩囦笉鍚堟牸鍝佹暟閲�");
+                return;
+            }
+            try {
+                MesQcIpqcSaveReqVO createReqVO = BeanUtils.toBean(importItem, MesQcIpqcSaveReqVO.class);
+                createReqVO.setCode(generateImportCode("IPQC", index));
+                createReqVO.setName(StrUtil.blankToDefault(importItem.getName(), "杩囩▼妫�楠屽崟"));
+                createReqVO.setWorkOrderId(workOrder.getId());
+                createReqVO.setWorkstationId(workstation.getId());
+                createReqVO.setType(ObjUtil.defaultIfNull(importItem.getType(), 1));
+                createReqVO.setLaborScrapQuantity(ObjUtil.defaultIfNull(importItem.getLaborScrapQuantity(), BigDecimal.ZERO));
+                createReqVO.setMaterialScrapQuantity(ObjUtil.defaultIfNull(importItem.getMaterialScrapQuantity(), BigDecimal.ZERO));
+                createReqVO.setOtherScrapQuantity(ObjUtil.defaultIfNull(importItem.getOtherScrapQuantity(), BigDecimal.ZERO));
+                Long id = createIpqc(createReqVO);
+                MesQcIpqcDO created = ipqcMapper.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