From 3fd8d1f2e73a843acd330e8e8b84f5800f858407 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:21 +0800
Subject: [PATCH] feat(seal): 印章详情视图与编辑删除接口

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java |  463 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 445 insertions(+), 18 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 1b9f291..e6b69ea 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
@@ -1,22 +1,49 @@
 package cn.iocoder.yudao.module.mes.service.qc.ncr;
 
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrDisposeReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrDisposeRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.line.MesWmMiscReceiptLineSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcNcrMapper;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderSourceTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderTypeEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesNcrDispositionEnum;
 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.wm.MesWmMiscReceiptTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 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.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.miscreceipt.MesWmMiscReceiptLineService;
+import cn.iocoder.yudao.module.mes.service.wm.miscreceipt.MesWmMiscReceiptService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
 import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -24,6 +51,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Map;
@@ -57,12 +85,29 @@
      */
     private static final Set<Integer> DISPOSITION_ALLOWED_TYPES = Set.of(
             MesNcrDispositionEnum.SCRAP.getType(),
+            MesNcrDispositionEnum.RETURN.getType(),
+            MesNcrDispositionEnum.REPRODUCTION.getType(),
             MesNcrDispositionEnum.REWORK.getType(),
             MesNcrDispositionEnum.CONCESSION.getType(),
             MesNcrDispositionEnum.REPAIR.getType());
 
     @Resource
     private MesQcNcrMapper ncrMapper;
+
+    @Resource
+    private MesQcNcrReinspectionValidator reinspectionValidator;
+
+    @Resource
+    private MesQcNcrStockClosureGuard stockClosureGuard;
+
+    @Resource private MesQcNcrScrapService scrapService;
+    @Resource private MesQcNcrReturnSalesLink returnSalesLink;
+    @Resource private MesQcPurchaseReturnService purchaseReturnService;
+    @Resource private MesQcPurchaseConcessionService purchaseConcessionService;
+    @Resource private MesQcNcrOqcSourceClaim oqcSourceClaim;
+    @Resource private MesQcNcrOqcConcessionService oqcConcessionService;
+    @Resource private MesQcNcrOqcReproductionService oqcReproductionService;
+    @Resource private MesQcNcrOqcReworkService oqcReworkService;
 
     @Resource
     private MdmItemApi mdmItemApi;
@@ -82,6 +127,42 @@
     @Resource
     @Lazy
     private MesQcRqcService rqcService;
+
+    @Resource
+    @Lazy
+    private MesWmMiscReceiptService miscReceiptService;
+    @Resource
+    @Lazy
+    private MesWmMiscReceiptLineService miscReceiptLineService;
+    @Resource
+    @Lazy
+    private MesWmWarehouseService warehouseService;
+    @Resource
+    @Lazy
+    private MesWmWarehouseLocationService warehouseLocationService;
+    @Resource
+    @Lazy
+    private MesWmWarehouseAreaService warehouseAreaService;
+    @Resource
+    @Lazy
+    private MesWmBatchService batchService;
+    @Resource
+    @Lazy
+    private MesProWorkOrderService workOrderService;
+    @Resource
+    @Lazy
+    private MesMdmItemService mdmItemService;
+    @Resource
+    @Lazy
+    private MesMdItemService mesItemService;
+    @Resource
+    @Lazy
+    private MesMdAutoCodeRecordService autoCodeRecordService;
+
+    /**
+     * 鏉傞」鍏ュ簱鍗曟潵婧愬崟鎹被鍨嬶細涓嶅悎鏍煎搧澶勭悊鍗�
+     */
+    private static final String MISC_RECEIPT_SOURCE_TYPE_NCR = "QC_NCR";
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -106,6 +187,11 @@
     public void updateNcr(MesQcNcrSaveReqVO updateReqVO) {
         // 1. 鏍¢獙瀛樺湪 + 鍙厑璁稿緟璇勫鐘舵�佺紪杈�
         MesQcNcrDO ncr = validateNcrStatusPendingReview(updateReqVO.getId());
+        if (ncr.getQcId() != null && (!Objects.equals(ncr.getItemId(), updateReqVO.getItemId())
+                || ncr.getUnqualifiedQuantity() == null || updateReqVO.getUnqualifiedQuantity() == null
+                || ncr.getUnqualifiedQuantity().compareTo(updateReqVO.getUnqualifiedQuantity()) != 0)) {
+            throw new ServiceException(400, "鏉ユ簮璐ㄦ鍗曠敓鎴愮殑涓嶅悎鏍肩墿鏂欏拰鏁伴噺涓嶈兘淇敼");
+        }
         validateNcrCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
         validateItemExists(updateReqVO.getItemId());
 
@@ -121,7 +207,10 @@
     @Transactional(rollbackFor = Exception.class)
     public void deleteNcr(Long id) {
         // 鏍¢獙瀛樺湪 + 鍙厑璁稿垹闄ゅ緟璇勫鐘舵��
-        validateNcrStatusPendingReview(id);
+        MesQcNcrDO ncr = validateNcrStatusPendingReview(id);
+        if (ncr.getQcId() != null) {
+            throw new ServiceException(400, "鏉ユ簮璐ㄦ鍗曠敓鎴愮殑涓嶅悎鏍煎鐞嗗崟涓嶈兘鍒犻櫎");
+        }
         ncrMapper.deleteById(id);
     }
 
@@ -130,8 +219,9 @@
     public void reviewNcr(Long id, Integer disposition, Long responsibleDeptId,
                            Integer defectLevel, String reviewOpinion) {
         // 1. 鏍¢獙瀛樺湪 + 寰呰瘎瀹$姸鎬�
-        validateNcrStatusPendingReview(id);
+        MesQcNcrDO ncr = validateNcrStatusPendingReview(id);
         validateDisposition(disposition);
+        validateDispositionForSource(ncr, disposition);
 
         // 2. 鏇存柊璇勫淇℃伅
         MesQcNcrDO updateObj = new MesQcNcrDO()
@@ -150,24 +240,307 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void disposeNcr(Long id, Integer disposition, Long handlerUserId, String handleResult) {
+    public MesQcNcrDisposeRespVO disposeNcr(MesQcNcrDisposeReqVO disposeReqVO) {
         // 1. 鏍¢獙瀛樺湪 + 宸茶瘎瀹★紙瀹℃壒閫氳繃锛夌姸鎬�
-        MesQcNcrDO ncr = validateNcrExists(id);
+        MesQcNcrDO ncr = validateNcrExistsForUpdate(disposeReqVO.getId());
         if (!MesNcrStatusEnum.REVIEWED.getStatus().equals(ncr.getStatus())) {
             throw exception(QC_NCR_DISPOSE_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
         }
         // 2. 澶勭疆鏂瑰紡蹇呭~锛屼笖蹇呴』鏄悎娉曟灇涓惧��
-        validateDisposition(disposition);
+        validateDisposition(disposeReqVO.getDisposition());
+        validateDispositionForSource(ncr, disposeReqVO.getDisposition());
+        // 3. 涓嶅悎鏍兼暟閲忓繀椤诲ぇ浜� 0锛屽惁鍒欐棤娉曠敓鎴愬叆搴撳崟 / 鐢熶骇璁㈠崟
+        if (ncr.getUnqualifiedQuantity() == null
+                || ncr.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+            throw exception(QC_NCR_DISPOSE_QUANTITY_INVALID, ncr.getUnqualifiedQuantity());
+        }
 
-        // 3. 鏇存柊澶勭疆淇℃伅锛堝缃柟寮忎互鏈澶勭疆閫夋嫨涓哄噯骞惰惤搴擄級
-        // TODO: WM 妯″潡闆嗘垚 鈥� 澶勭疆涓洪��璐ф椂瑙﹀彂渚涘簲鍟嗛��璐э紝澶勭疆涓烘姤搴熸椂瑙﹀彂鏉傞」鍑哄簱
+        // 4. 鎸夊缃柟寮忚仈鍔ㄧ敓鎴愪笟鍔″崟鎹�
+        MesQcNcrDisposeRespVO respVO;
+        MesQcNcrScrapService.IpqcSource processSource = null;
+        MesQcNcrOqcSourceClaim.OqcClaimedSource oqcSource = null;
+        if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.OQC.getType())) {
+            oqcSource = oqcSourceClaim.claim(ncr);
+        }
+        if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.IPQC.getType())) {
+            processSource = scrapService.validateIpqcSource(ncr);
+            scrapService.claimIpqcSource(ncr, processSource);
+            if (StrUtil.isNotBlank(processSource.batchCode()) && StrUtil.isNotBlank(disposeReqVO.getBatchCode())
+                    && !Objects.equals(processSource.batchCode(), StrUtil.trim(disposeReqVO.getBatchCode()))) {
+                throw new ServiceException(400, "澶勭疆鎵规蹇呴』涓庤繃绋嬫楠屽師鎵规涓�鑷�");
+            }
+            if (StrUtil.isNotBlank(processSource.batchCode())) disposeReqVO.setBatchCode(processSource.batchCode());
+        }
+        if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.RQC.getType())) {
+            String originalBatch = returnSalesLink.claim(ncr);
+            if (StrUtil.isNotBlank(originalBatch) && StrUtil.isNotBlank(disposeReqVO.getBatchCode())
+                    && !Objects.equals(originalBatch, StrUtil.trim(disposeReqVO.getBatchCode()))) {
+                throw new ServiceException(400, "澶勭疆鎵规蹇呴』涓庡鎴烽��璐у師鎵规涓�鑷�");
+            }
+            if (StrUtil.isNotBlank(originalBatch)) disposeReqVO.setBatchCode(originalBatch);
+        }
+        if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.RETURN.getType())) {
+            var doc = purchaseReturnService.createForNcr(ncr);
+            respVO = new MesQcNcrDisposeRespVO();
+            respVO.setDisposition(disposeReqVO.getDisposition());
+            respVO.setDocType("PURCHASE_RETURN");
+            respVO.setDocId(doc.getId());
+            respVO.setDocCode(doc.getCode());
+            respVO.setDocName("閲囪喘閫�璐у崟");
+            respVO.setMessage("閲囪喘閫�璐у崟宸茬敓鎴愶紝璇风敱浠撳簱纭閫�璐�");
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.REPRODUCTION.getType())) {
+            respVO = processSource != null
+                    ? oqcReproductionService.reproduceIpqc(ncr, disposeReqVO.getDisposition(), processSource)
+                    : oqcReproductionService.reproduce(ncr, disposeReqVO.getDisposition());
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())
+                && Objects.equals(ncr.getQcType(), MesQcTypeEnum.IQC.getType())) {
+            respVO = purchaseConcessionService.dispose(ncr, disposeReqVO);
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())
+                && Objects.equals(ncr.getQcType(), MesQcTypeEnum.OQC.getType())) {
+            oqcConcessionService.release(ncr, disposeReqVO);
+            respVO = new MesQcNcrDisposeRespVO();
+            respVO.setDisposition(disposeReqVO.getDisposition());
+            respVO.setDocType("PRODUCT_SALES");
+            MesQcOqcDO sourceOqc = oqcService.getOqc(ncr.getQcId());
+            respVO.setDocId(sourceOqc.getSourceDocId());
+            respVO.setDocCode(sourceOqc.getSourceDocCode());
+            respVO.setDocName("閿�鍞嚭搴撳崟");
+            respVO.setMessage("鍑鸿揣璁╂宸插畬鎴愬師閿�鍞嚭搴撳崟鎷h揣鍙婂嚭搴�");
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.SCRAP.getType())
+                && (Objects.equals(ncr.getQcType(), MesQcTypeEnum.IPQC.getType())
+                || Objects.equals(ncr.getQcType(), MesQcTypeEnum.RQC.getType()))) {
+            respVO = scrapService.receive(ncr, disposeReqVO);
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())
+                && (Objects.equals(ncr.getQcType(), MesQcTypeEnum.IPQC.getType())
+                || Objects.equals(ncr.getQcType(), MesQcTypeEnum.RQC.getType()))) {
+            respVO = createMiscReceiptForDispose(ncr, disposeReqVO);
+        } else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())
+                || Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.SCRAP.getType())) {
+            stockClosureGuard.validateBeforeDispose(disposeReqVO.getDisposition());
+            throw new ServiceException(400, "璇ユ潵婧愭殏涓嶆敮鎸佹澶勭疆鏂瑰紡");
+        } else if (oqcSource != null && (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.REWORK.getType())
+                || Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.REPAIR.getType()))) {
+            // 鍑鸿揣杩斿伐/杩斾慨锛氭墸鍑忓師鎴愬搧搴撳瓨 鈫� 鍙栨秷鍘熼攢鍞嚭搴撳崟 鈫� 鍏嬮殕杩斿伐宸ュ崟
+            respVO = oqcReworkService.dispose(ncr, oqcSource, disposeReqVO);
+        } else {
+            // 杩斿伐 / 杩斾慨锛氱敓鎴愯嚜琛岀敓浜х被鍨嬬殑鐢熶骇璁㈠崟
+            respVO = createReworkWorkOrderForDispose(ncr, disposeReqVO);
+        }
+
+        // 5. 鏇存柊澶勭疆淇℃伅锛堝缃柟寮忎互鏈澶勭疆閫夋嫨涓哄噯骞惰惤搴擄級
         ncrMapper.updateById(new MesQcNcrDO()
-                .setId(id)
-                .setDisposition(disposition)
-                .setHandlerUserId(handlerUserId)
+                .setId(ncr.getId())
+                .setDisposition(disposeReqVO.getDisposition())
+                .setHandlerUserId(disposeReqVO.getHandlerUserId())
                 .setHandleDate(LocalDateTime.now())
-                .setHandleResult(handleResult)
+                .setHandleResult(disposeReqVO.getHandleResult())
                 .setStatus(MesNcrStatusEnum.DISPOSED.getStatus()));
+        return respVO;
+    }
+
+    /**
+     * 璁╂鏀捐 / 鎶ュ簾锛氱敓鎴愭潅椤瑰叆搴撳崟锛岃嚜鍔ㄦ彁浜ゅ苟瀹屾垚鍏ュ簱
+     */
+    private MesQcNcrDisposeRespVO createMiscReceiptForDispose(MesQcNcrDO ncr, MesQcNcrDisposeReqVO reqVO) {
+        boolean scrap = Objects.equals(MesNcrDispositionEnum.SCRAP.getType(), reqVO.getDisposition());
+        String dispositionName = scrap ? MesNcrDispositionEnum.SCRAP.getName() : MesNcrDispositionEnum.CONCESSION.getName();
+        MesWmMiscReceiptTypeEnum receiptType = scrap
+                ? MesWmMiscReceiptTypeEnum.SCRAP : MesWmMiscReceiptTypeEnum.CONCESSION;
+
+        // 4.1 鏍¢獙鍏ュ簱浠撳簱 / 搴撳尯 / 搴撲綅
+        MesMdmItemDO item = mdmItemService.validateItemExists(ncr.getItemId());
+        if (reqVO.getWarehouseId() == null || reqVO.getLocationId() == null || reqVO.getAreaId() == null) {
+            throw new ServiceException(QC_NCR_DISPOSE_STORAGE_REQUIRED.getCode(),
+                    String.format("澶勭疆鏂瑰紡[%s]闇�瑕佸叆搴撳埌鎸囧畾搴撲綅锛氬綋鍓嶄粨搴揫%s]銆佸簱鍖篬%s]銆佸簱浣峓%s]鏈�夊叏锛�"
+                                    + "璇峰洖鍒板缃脊绐楄ˉ閫夌己澶遍」鍚庨噸鏂版彁浜�",
+                            dispositionName, resolveWarehouseName(reqVO.getWarehouseId()),
+                            resolveLocationName(reqVO.getLocationId()), resolveAreaName(reqVO.getAreaId())));
+        }
+        try {
+            warehouseAreaService.validateWarehouseAreaExists(
+                    reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
+        } catch (ServiceException ex) {
+            throw new ServiceException(QC_NCR_DISPOSE_STORAGE_DISABLED.getCode(),
+                    String.format("澶勭疆鏂瑰紡[%s]鎵�閫夊叆搴撳簱浣嶆牎楠屽け璐ワ細浠撳簱[%s]銆佸簱鍖篬%s]銆佸簱浣峓%s]銆傚師鍥狅細%s锛�"
+                                    + "璇峰洖鍒板缃脊绐楅噸鏂伴�夋嫨浠撳簱/搴撳尯/搴撲綅",
+                            dispositionName, resolveWarehouseName(reqVO.getWarehouseId()),
+                            resolveLocationName(reqVO.getLocationId()), resolveAreaName(reqVO.getAreaId()),
+                            ex.getMessage()));
+        }
+
+        // 4.2 鎵规绠$悊鐨勭墿鏂欙細鎵规鍙峰繀濉紝涓嶅瓨鍦ㄦ椂鑷姩鍒涘缓鎵规
+        String batchCode = StrUtil.trimToNull(reqVO.getBatchCode());
+        if (Boolean.TRUE.equals(item.getIsBatchManaged())) {
+            if (batchCode == null) {
+                throw new ServiceException(QC_NCR_DISPOSE_BATCH_REQUIRED.getCode(),
+                        String.format("鐗╂枡[%s]鍚敤浜嗘壒娆$鐞嗭紝澶勭疆鏂瑰紡[%s]鍏ュ簱鏃跺繀椤诲~鍐欐壒娆″彿锛�"
+                                + "璇峰湪澶勭疆寮圭獥鐨刐鎵规鍙穄涓~鍐欏悗閲嶈瘯", buildItemLabel(item), dispositionName));
+            }
+            MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO();
+            batchReqVO.setItemId(ncr.getItemId());
+            batchReqVO.setBatchCode(batchCode);
+            batchReqVO.setReceiptDate(LocalDateTime.now());
+            try {
+                batchService.getOrGenerateBatchCode(batchReqVO);
+            } catch (ServiceException ex) {
+                throw new ServiceException(ex.getCode(),
+                        String.format("涓虹墿鏂橻%s]鍑嗗鎵规[%s]澶辫触锛�%s锛涜琛ュ厖鎵规淇℃伅鍚庨噸鏂板缃�",
+                                buildItemLabel(item), batchCode, ex.getMessage()));
+            }
+        }
+
+        // 4.3 鍒涘缓鏉傞」鍏ュ簱鍗�
+        String receiptCode = autoCodeRecordService.generateAutoCode(
+                MesMdAutoCodeRuleCodeEnum.WM_MISC_RECEIPT_CODE.getCode());
+        String receiptName = String.format("%s鍏ュ簱鍗�-%s", dispositionName, ncr.getCode());
+        MesWmMiscReceiptSaveReqVO receiptReqVO = new MesWmMiscReceiptSaveReqVO();
+        receiptReqVO.setCode(receiptCode);
+        receiptReqVO.setName(receiptName);
+        receiptReqVO.setType(receiptType.getType());
+        receiptReqVO.setSourceDocType(MISC_RECEIPT_SOURCE_TYPE_NCR);
+        receiptReqVO.setSourceDocId(ncr.getId());
+        receiptReqVO.setSourceDocCode(ncr.getCode());
+        receiptReqVO.setReceiptDate(LocalDateTime.now());
+        receiptReqVO.setRemark(String.format("鐢变笉鍚堟牸鍝佸鐞嗗崟[%s]澶勭疆涓篬%s]鑷姩鐢熸垚骞跺畬鎴愬叆搴�",
+                ncr.getCode(), dispositionName));
+        Long receiptId = miscReceiptService.createMiscReceipt(receiptReqVO);
+
+        // 4.4 鍒涘缓鍏ュ簱琛岋紙鍚岀墿鏂� / 涓嶅悎鏍兼暟閲� / 鐩爣搴撲綅 / 鎵规鍙凤級
+        MesWmMiscReceiptLineSaveReqVO lineReqVO = new MesWmMiscReceiptLineSaveReqVO();
+        lineReqVO.setReceiptId(receiptId);
+        lineReqVO.setItemId(ncr.getItemId());
+        lineReqVO.setQuantity(ncr.getUnqualifiedQuantity());
+        lineReqVO.setBatchCode(batchCode);
+        lineReqVO.setWarehouseId(reqVO.getWarehouseId());
+        lineReqVO.setLocationId(reqVO.getLocationId());
+        lineReqVO.setAreaId(reqVO.getAreaId());
+        lineReqVO.setRemark(String.format("鏉ユ簮涓嶅悎鏍煎搧澶勭悊鍗昜%s]", ncr.getCode()));
+        miscReceiptLineService.createMiscReceiptLine(lineReqVO);
+
+        // 4.5 鑷姩鎻愪氦骞跺畬鎴愬叆搴擄紙澧炲姞搴撳瓨 + 璁板綍娴佹按锛�
+        miscReceiptService.submitMiscReceipt(receiptId);
+        miscReceiptService.finishMiscReceipt(receiptId);
+
+        MesQcNcrDisposeRespVO respVO = new MesQcNcrDisposeRespVO();
+        respVO.setDisposition(reqVO.getDisposition());
+        respVO.setDocType("MISC_RECEIPT");
+        respVO.setDocId(receiptId);
+        respVO.setDocCode(receiptCode);
+        respVO.setDocName(receiptName);
+        respVO.setMessage(String.format("宸茬敓鎴�%s骞跺畬鎴愬叆搴擄紝鍏ュ簱鍗曞彿[%s]", receiptName, receiptCode));
+        return respVO;
+    }
+
+    /**
+     * 杩斿伐 / 杩斾慨锛氱敓鎴愯嚜琛岀敓浜х被鍨嬬殑鐢熶骇璁㈠崟锛堣崏绋挎�侊紝BOM/鏉$爜鑷姩鐢熸垚锛屽伐鑹鸿矾绾夸汉宸ヨˉ鍏咃級
+     */
+    private MesQcNcrDisposeRespVO createReworkWorkOrderForDispose(MesQcNcrDO ncr, MesQcNcrDisposeReqVO reqVO) {
+        boolean rework = Objects.equals(MesNcrDispositionEnum.REWORK.getType(), reqVO.getDisposition());
+        String dispositionName = rework ? MesNcrDispositionEnum.REWORK.getName() : MesNcrDispositionEnum.REPAIR.getName();
+
+        // 鐢熶骇璁㈠崟鐨勪骇鍝佹槸 MES 浜у搧涓绘暟鎹紙mes_md_item锛夛紝NCR 瀛樼殑鏄� MDM 鐗╂枡锛坢dm_item锛夛紝闇�鍏堟槧灏�
+        MesMdItemDO product = mesItemService.getItemByMdmItemId(ncr.getItemId());
+        if (product == null) {
+            // 鍏煎鍘嗗彶鏁版嵁锛歁ES 浜у搧涓� MDM 鐗╂枡涓婚敭涓�鑷存椂鐩存帴鎸変富閿彇
+            product = mesItemService.getItem(ncr.getItemId());
+        }
+        if (product == null) {
+            MesMdmItemDO mdmItem = mdmItemService.getItem(ncr.getItemId());
+            throw new ServiceException(QC_NCR_DISPOSE_PRODUCT_NOT_EXISTS.getCode(),
+                    String.format("鐗╂枡[%s]鍦� MES 浜у搧涓绘暟鎹腑涓嶅瓨鍦紙MDM 鐗╂枡 ID=%s锛夛紝鏃犳硶鐢熸垚杩斿伐/杩斾慨鐢熶骇璁㈠崟锛�"
+                                    + "璇峰厛鍦╗鐗╂枡浜у搧]涓淮鎶よ浜у搧鍚庡啀澶勭疆",
+                            mdmItem != null ? buildItemLabel(mdmItem) : "鏈煡鐗╂枡", ncr.getItemId()));
+        }
+
+        String workOrderCode = autoCodeRecordService.generateAutoCode(
+                MesMdAutoCodeRuleCodeEnum.PRO_WORK_ORDER_CODE.getCode());
+        String workOrderName = String.format("%s鍗�-%s", dispositionName, ncr.getCode());
+        MesProWorkOrderSaveReqVO workOrderReqVO = new MesProWorkOrderSaveReqVO();
+        workOrderReqVO.setCode(workOrderCode);
+        workOrderReqVO.setName(workOrderName);
+        workOrderReqVO.setType(MesProWorkOrderTypeEnum.SELF.getType());
+        workOrderReqVO.setOrderSourceType(MesProWorkOrderSourceTypeEnum.STORE.getType());
+        workOrderReqVO.setOrderSourceCode(ncr.getCode());
+        workOrderReqVO.setProductId(product.getId());
+        workOrderReqVO.setQuantity(ncr.getUnqualifiedQuantity());
+        workOrderReqVO.setRequestDate(LocalDateTime.now());
+        workOrderReqVO.setRemark(String.format("鐢变笉鍚堟牸鍝佸鐞嗗崟[%s]澶勭疆涓篬%s]鑷姩鐢熸垚锛岃琛ュ厖宸ヨ壓璺嚎鍚庝笅杈�",
+                ncr.getCode(), dispositionName));
+        // 鍑鸿揣妫�楠屾潵婧愮殑 NCR锛氬甫涓婂鎴凤紝婊¤冻浜у搧鎵规閰嶇疆锛坈lientFlag锛夊瀹㈡埛蹇呭~鐨勮姹�
+        Long clientId = resolveSourceClientId(ncr);
+        if (clientId != null) {
+            workOrderReqVO.setClientId(clientId);
+        }
+        Long workOrderId = workOrderService.createWorkOrder(workOrderReqVO);
+
+        MesQcNcrDisposeRespVO respVO = new MesQcNcrDisposeRespVO();
+        respVO.setDisposition(reqVO.getDisposition());
+        respVO.setDocType("WORK_ORDER");
+        respVO.setDocId(workOrderId);
+        respVO.setDocCode(workOrderCode);
+        respVO.setDocName(workOrderName);
+        respVO.setMessage(String.format("宸茬敓鎴�%s[%s]锛岃鍒扮敓浜ц鍗曚腑琛ュ厖宸ヨ壓璺嚎鍚庝笅杈�", workOrderName, workOrderCode));
+        return respVO;
+    }
+
+    /**
+     * 鍙栨潵婧愭楠屽崟涓婄殑瀹㈡埛锛氫粎鍑鸿揣妫�楠岋紙OQC锛夊甫鏈夊鎴蜂俊鎭�
+     */
+    private Long resolveSourceClientId(MesQcNcrDO ncr) {
+        if (!Objects.equals(MesQcTypeEnum.OQC.getType(), ncr.getQcType()) || ncr.getQcId() == null) {
+            return null;
+        }
+        MesQcOqcDO oqc = oqcService.getOqc(ncr.getQcId());
+        return oqc != null ? oqc.getClientId() : null;
+    }
+
+    /**
+     * 鐗╂枡灞曠ず锛氱紪鐮� + 鍚嶇О
+     */
+    private String buildItemLabel(MesMdmItemDO item) {
+        if (item == null) {
+            return "鏈煡鐗╂枡";
+        }
+        String code = StrUtil.blankToDefault(item.getCode(), "");
+        String name = StrUtil.blankToDefault(item.getName(), "");
+        String label = (code + " " + name).trim();
+        return label.isEmpty() ? "ID=" + item.getId() : label;
+    }
+
+    /**
+     * 浠撳簱鍚嶇О锛岃В鏋愬け璐ュ洖閫�涓哄彲璇� ID
+     */
+    private String resolveWarehouseName(Long warehouseId) {
+        if (warehouseId == null) {
+            return "鏈�夋嫨";
+        }
+        MesWmWarehouseDO warehouse = warehouseService.getWarehouse(warehouseId);
+        return warehouse != null && StrUtil.isNotBlank(warehouse.getName())
+                ? warehouse.getName() : "ID=" + warehouseId;
+    }
+
+    /**
+     * 搴撳尯鍚嶇О锛岃В鏋愬け璐ュ洖閫�涓哄彲璇� ID
+     */
+    private String resolveLocationName(Long locationId) {
+        if (locationId == null) {
+            return "鏈�夋嫨";
+        }
+        MesWmWarehouseLocationDO location = warehouseLocationService.getWarehouseLocation(locationId);
+        return location != null && StrUtil.isNotBlank(location.getName())
+                ? location.getName() : "ID=" + locationId;
+    }
+
+    /**
+     * 搴撲綅鍚嶇О锛岃В鏋愬け璐ュ洖閫�涓哄彲璇� ID
+     */
+    private String resolveAreaName(Long areaId) {
+        if (areaId == null) {
+            return "鏈�夋嫨";
+        }
+        MesWmWarehouseAreaDO area = warehouseAreaService.getWarehouseArea(areaId);
+        return area != null && StrUtil.isNotBlank(area.getName())
+                ? area.getName() : "ID=" + areaId;
     }
 
     @Override
@@ -177,7 +550,7 @@
         // 璇ユ柟娉曚細鎶婃墍鏈夊紓甯哥粺涓�鍖呮垚 RuntimeException锛屽洜姝よ繖閲屼笉鑳界洿鎺� catch ServiceException锛�
         // 蹇呴』娌� cause 閾惧垽鏂槸鍚︿负銆屾祦绋嬪畾涔変笉瀛樺湪銆嶃��
         // 1. 鏍¢獙瀛樺湪 + 寰呰瘎瀹★紙鑽夌/瀹℃壒椹冲洖鍚庯級鐘舵��
-        MesQcNcrDO ncr = validateNcrExists(id);
+        MesQcNcrDO ncr = validateNcrExistsForUpdate(id);
         if (!MesNcrStatusEnum.PENDING_REVIEW.getStatus().equals(ncr.getStatus())) {
             throw exception(QC_NCR_SUBMIT_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
         }
@@ -234,10 +607,12 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateNcrAuditStatus(Long id, Integer bpmResult) {
+    public void updateNcrAuditStatus(Long id, String processInstanceId, Integer bpmResult) {
         // 1. 鏍¢獙瀛樺湪 + 瀹℃壒涓紙閬垮厤骞跺彂鎴栭噸澶嶅洖璋冭鐩栧凡澶勭疆/宸插叧闂姸鎬侊級
-        MesQcNcrDO ncr = validateNcrExists(id);
-        if (!MesNcrStatusEnum.APPROVING.getStatus().equals(ncr.getStatus())) {
+        MesQcNcrDO ncr = validateNcrExistsForUpdate(id);
+        if (!MesNcrStatusEnum.APPROVING.getStatus().equals(ncr.getStatus())
+                || StrUtil.isBlank(processInstanceId)
+                || !Objects.equals(processInstanceId, ncr.getProcessInstanceId())) {
             return;
         }
 
@@ -260,11 +635,38 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void closeNcr(Long id, String closeOpinion) {
+    public void closeNcr(Long id, String closeOpinion, Long reinspectionIpqcId) {
         // 1. 鏍¢獙瀛樺湪 + 宸插缃姸鎬�
-        MesQcNcrDO ncr = validateNcrExists(id);
+        MesQcNcrDO ncr = validateNcrExistsForUpdate(id);
         if (!MesNcrStatusEnum.DISPOSED.getStatus().equals(ncr.getStatus())) {
             throw exception(QC_NCR_CLOSE_STATUS_INVALID, ncr.getCode(), resolveStatusName(ncr.getStatus()));
+        }
+
+        if (Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.RETURN.getType())
+                && Objects.equals(ncr.getQcType(), MesQcTypeEnum.IQC.getType())) {
+            purchaseReturnService.validateConfirmed(ncr.getId());
+        } else if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.OQC.getType())
+                && Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())) {
+            oqcConcessionService.validateBeforeClose(ncr);
+        } else if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.IQC.getType())
+                && Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.CONCESSION.getType())) {
+            // 閲囪喘璁╂鐨勫叆搴撳拰 ERP 鍥炲啓涓庡缃湪鍚屼竴浜嬪姟瀹屾垚銆�
+        } else if (Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.REPRODUCTION.getType())) {
+            throw new ServiceException(400, "閲嶆柊鐢熶骇鍚庨渶瀹屾垚澶嶆骞跺鐞嗗師鍑哄簱鍗曪紝鏆備笉鑳藉叧闂�");
+        } else if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.OQC.getType())
+                && (Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.REWORK.getType())
+                || Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.REPAIR.getType()))) {
+            oqcReworkService.validateBeforeClose(ncr);
+        } else if (!Objects.equals(ncr.getQcType(), MesQcTypeEnum.IPQC.getType())
+                && !Objects.equals(ncr.getQcType(), MesQcTypeEnum.RQC.getType())) {
+            stockClosureGuard.validateBeforeClose(ncr);
+        }
+
+        if (Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.REWORK.getType())
+                || Objects.equals(ncr.getDisposition(), MesNcrDispositionEnum.REPAIR.getType())) {
+            reinspectionValidator.validate(ncr, reinspectionIpqcId);
+        } else {
+            reinspectionIpqcId = null;
         }
 
         // 2. 鏇存柊鍏抽棴淇℃伅
@@ -273,6 +675,7 @@
                 .setCloseUserId(getLoginUserId())
                 .setCloseDate(LocalDateTime.now())
                 .setCloseOpinion(closeOpinion)
+                .setReinspectionIpqcId(reinspectionIpqcId)
                 .setStatus(MesNcrStatusEnum.CLOSED.getStatus()));
     }
 
@@ -287,11 +690,19 @@
         return ncr;
     }
 
+    private MesQcNcrDO validateNcrExistsForUpdate(Long id) {
+        MesQcNcrDO ncr = ncrMapper.selectByIdForUpdate(id);
+        if (ncr == null) {
+            throw exception(QC_NCR_NOT_EXISTS, id);
+        }
+        return ncr;
+    }
+
     /**
      * 鏍¢獙 NCR 瀛樺湪涓斾负寰呰瘎瀹$姸鎬�
      */
     private MesQcNcrDO validateNcrStatusPendingReview(Long id) {
-        MesQcNcrDO ncr = validateNcrExists(id);
+        MesQcNcrDO ncr = validateNcrExistsForUpdate(id);
         if (!MesNcrStatusEnum.PENDING_REVIEW.getStatus().equals(ncr.getStatus())) {
             throw exception(QC_NCR_STATUS_NOT_PENDING, ncr.getCode(), resolveStatusName(ncr.getStatus()));
         }
@@ -310,6 +721,22 @@
         }
     }
 
+    private void validateDispositionForSource(MesQcNcrDO ncr, Integer disposition) {
+        if (Objects.equals(ncr.getQcType(), MesQcTypeEnum.IQC.getType())) {
+            if (!Objects.equals(disposition, MesNcrDispositionEnum.RETURN.getType())
+                    && !Objects.equals(disposition, MesNcrDispositionEnum.CONCESSION.getType())) {
+                throw new ServiceException(400, "閲囪喘妫�楠屼笉鍚堟牸浠呮敮鎸侀��璐ф垨璁╂鏀捐");
+            }
+        } else if (Objects.equals(disposition, MesNcrDispositionEnum.RETURN.getType())) {
+            throw new ServiceException(400, "鍙湁閲囪喘妫�楠屼笉鍚堟牸鏀寔閲囪喘閫�璐�");
+        }
+        if (Objects.equals(disposition, MesNcrDispositionEnum.REPRODUCTION.getType())
+                && !Objects.equals(ncr.getQcType(), MesQcTypeEnum.OQC.getType())
+                && !Objects.equals(ncr.getQcType(), MesQcTypeEnum.IPQC.getType())) {
+            throw new ServiceException(400, "閲嶆柊鐢熶骇浠呮敮鎸佽繃绋嬫垨鍑鸿揣妫�楠屼笉鍚堟牸");
+        }
+    }
+
     /**
      * 鐘舵�佸�艰浆鍚嶇О锛岃В鏋愬け璐ュ洖閫�涓� ID 瀛楃涓�
      */

--
Gitblit v1.9.3