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/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java |  305 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 290 insertions(+), 15 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
index 32ea507..a8b6e3c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -9,20 +10,34 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum;
 import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
 import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
 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;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -36,15 +51,35 @@
 public class MesWmArrivalNoticeServiceImpl implements MesWmArrivalNoticeService {
 
     @Resource
+    private cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcArrivalDispositionService arrivalDispositionService;
+
+    @Resource
     private MesWmArrivalNoticeMapper arrivalNoticeMapper;
 
     @Resource
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
+
     @Resource
-    private cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService vendorService;
+    private MesWmReturnVendorMapper returnVendorMapper;
+    @Resource
+    private MesWmReturnVendorLineMapper returnVendorLineMapper;
+
+    @Resource
+    private SrmSupplierApi srmSupplierApi;
 
     @Resource
     private ErpPurchaseOrderApi purchaseOrderApi;
+
+    @Resource
+    private MesMdmItemService mdmItemService;
+
+    @Resource
+    @Lazy
+    private MesQcIqcService iqcService;
+
+    @Resource
+    @Lazy
+    private MesWmItemReceiptService itemReceiptService;
 
     @Override
     public Long createArrivalNotice(MesWmArrivalNoticeSaveReqVO createReqVO) {
@@ -53,6 +88,7 @@
 
         // 鎻掑叆
         MesWmArrivalNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmArrivalNoticeDO.class);
+        fillContractNoFromPurchaseOrder(notice);
         notice.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
         arrivalNoticeMapper.insert(notice);
         return notice.getId();
@@ -67,22 +103,34 @@
 
         // 鏇存柊
         MesWmArrivalNoticeDO updateObj = BeanUtils.toBean(updateReqVO, MesWmArrivalNoticeDO.class);
+        fillContractNoFromPurchaseOrder(updateObj);
         arrivalNoticeMapper.updateById(updateObj);
+    }
+
+    /**
+     * 閲囪喘鍚堝悓鍙锋湭鏄惧紡浼犲叆鏃讹紝浠庡叧鑱旂殑閲囪喘璁㈠崟甯﹀叆锛堟崲璐у埌璐у繀椤昏兘杩芥函鍒板師閲囪喘鍚堝悓锛�
+     */
+    private void fillContractNoFromPurchaseOrder(MesWmArrivalNoticeDO notice) {
+        if (notice.getPurchaseOrderId() == null || cn.hutool.core.util.StrUtil.isNotBlank(notice.getContractNo())) {
+            return;
+        }
+        ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(notice.getPurchaseOrderId()).getCheckedData();
+        if (purchaseOrder != null) {
+            notice.setContractNo(purchaseOrder.getContractNo());
+        }
     }
 
     private void validateArrivalNoticeSaveData(MesWmArrivalNoticeSaveReqVO reqVO) {
         // 鏍¢獙缂栫爜鍞竴
         validateCodeUnique(reqVO.getId(), reqVO.getCode());
-        // 鏍¢獙渚涘簲鍟嗗瓨鍦ㄤ笖鍚敤
-        vendorService.validateVendorExistsAndEnable(reqVO.getVendorId());
-        // 鏍¢獙閲囪喘璁㈠崟瀛樺湪锛屽苟鑷姩濉厖閲囪喘璁㈠崟鍙�
+        // 鏍¢獙渚涘簲鍟嗗瓨鍦紙ERP 閲囪喘渚涘簲鍟嗭級
+        srmSupplierApi.getSupplier(reqVO.getVendorId());
+        // 鏍¢獙閲囪喘璁㈠崟瀛樺湪
         if (reqVO.getPurchaseOrderId() != null) {
             ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(reqVO.getPurchaseOrderId()).getCheckedData();
             if (purchaseOrder == null) {
                 throw exception(WM_PURCHASE_ORDER_NOT_EXISTS);
             }
-            // 鑷姩濉厖閲囪喘璁㈠崟鍙�
-            reqVO.setPurchaseOrderCode(purchaseOrder.getNo());
         }
     }
 
@@ -112,7 +160,7 @@
     @Transactional(rollbackFor = Exception.class)
     public void submitArrivalNotice(Long id) {
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
-        validateArrivalNoticeExistsAndDraft(id);
+        MesWmArrivalNoticeDO notice = validateArrivalNoticeExistsAndDraft(id);
         // 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
         List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
         if (CollUtil.isEmpty(lines)) {
@@ -120,22 +168,77 @@
         }
 
         // 2. 妫�鏌ユ墍鏈夎鐨� iqcCheckFlag锛氬鏋滄湁闇�瑕佹楠岀殑琛岋紝杩涘叆寰呰川妫�鐘舵��
+        // 娉ㄦ剰锛氭潵鏂欐楠屽崟涓嶅湪鎻愪氦鏃剁敓鎴愶紝鐢卞簱绠$偣鍑汇�屾墽琛岃川妫�銆嶆椂閫氳繃 createIqcForArrivalNotice 鐢熸垚
         boolean needCheck = CollectionUtils.anyMatch(lines,
                 line -> Boolean.TRUE.equals(line.getIqcCheckFlag()));
         if (needCheck) {
-            // 闇�瑕佹楠岋紝杩涘叆寰呰川妫�
             arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                     .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
             return;
         }
-        // 涓嶉渶瑕佹楠岋紝鐩存帴杩涘叆寰呭叆搴�
+        // 涓嶉渶瑕佹楠岋紝鐩存帴杩涘叆寰呭叆搴擄紝骞惰嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟浜ょ粰搴撶纭鍏ュ簱
         arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                 .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
+        autoGenerateItemReceipt(notice);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
+    public Integer createIqcForArrivalNotice(Long id) {
+        // 1. 鏍¢獙鍒拌揣閫氱煡鍗曞瓨鍦ㄤ笖涓哄緟璐ㄦ鐘舵��
+        MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
+        if (ObjUtil.notEqual(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus(), notice.getStatus())) {
+            String statusName = Arrays.stream(MesWmArrivalNoticeStatusEnum.values())
+                    .filter(item -> ObjUtil.equal(item.getStatus(), notice.getStatus()))
+                    .map(MesWmArrivalNoticeStatusEnum::getName).findFirst()
+                    .orElse(String.valueOf(notice.getStatus()));
+            throw new ServiceException(WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC.getCode(),
+                    "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]褰撳墠鐘舵�佷负[" + statusName + "]锛屽彧鏈夈�屽緟璐ㄦ銆嶇姸鎬佹墠鑳芥墽琛岃川妫�銆�"
+                            + "璇峰埛鏂板垪琛ㄧ‘璁ゅ崟鎹姸鎬侊紱鑻ヨ鍗曟嵁宸叉墽琛岃繃璐ㄦ锛岃鐩存帴鍒般�愯川閲忕鐞� - IQC妫�楠屻�戝綍鍏ユ娴嬬粨鏋溿��");
+        }
+        // 2. 鏍¢獙闇�妫�琛�
+        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
+        List<MesWmArrivalNoticeLineDO> needCheckLines = lines.stream()
+                .filter(line -> Boolean.TRUE.equals(line.getIqcCheckFlag()))
+                .toList();
+        if (needCheckLines.isEmpty()) {
+            throw new ServiceException(WM_ARRIVAL_NOTICE_NO_IQC_LINE.getCode(),
+                    "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨勬槑缁嗚鍧囦负銆屼笉闇�妫�楠屻�嶏紝鏃犻渶鐢熸垚鏉ユ枡妫�楠屽崟銆�"
+                            + "璇风洿鎺ュ埌璇ュ崟鎹墽琛屽叆搴擄紱鑻ユ湰搴旀楠岋紝璇锋牳瀵归噰璐鍗曡鐨勬楠屾爣璇嗭紙璇ユ爣璇嗙敱閲囪喘璁㈠崟甯﹀叆锛屽埌璐ч�氱煡鍗曚笂涓嶅彲淇敼锛夈��");
+        }
+        List<MesWmArrivalNoticeLineDO> pendingLines = needCheckLines.stream()
+                .filter(line -> line.getIqcId() == null)
+                .toList();
+        if (pendingLines.isEmpty()) {
+            throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_ALREADY_CREATED.getCode(),
+                    "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨� " + needCheckLines.size()
+                            + " 鏉¢渶妫�琛屽潎宸茬敓鎴愭潵鏂欐楠屽崟锛屾棤闇�閲嶅鐢熸垚銆傝鐩存帴鍒般�愯川閲忕鐞� - IQC妫�楠屻�戝綍鍏ユ娴嬬粨鏋滐紱"
+                            + "濡傞渶閲嶆柊鐢熸垚锛岃鍏堝垹闄ゅ師妫�楠屽崟銆�");
+        }
+        // 3. 閫愯鐢熸垚鏉ユ枡妫�楠屽崟
+        int createdCount = 0;
+        for (MesWmArrivalNoticeLineDO line : pendingLines) {
+            Long iqcId;
+            try {
+                iqcId = iqcService.createIqcFromArrivalNotice(id, line, notice.getCode(), notice.getVendorId());
+            } catch (Exception ex) {
+                log.error("[createIqcForArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鍒涘缓 IQC 澶辫触]", id, line.getId(), ex);
+                throw new ServiceException(WM_ARRIVAL_NOTICE_IQC_CREATE_FAILED.getCode(),
+                        "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]鐨勬槑缁嗚锛堢墿鏂橧D=" + line.getItemId()
+                                + "锛夌敓鎴愭潵鏂欐楠屽崟澶辫触锛�" + ex.getMessage()
+                                + "銆傝绋嶅悗閲嶈瘯锛涜嫢鎸佺画澶辫触锛岃鍒般�愯川閲忕鐞� - IQC妫�楠屻�戞墜宸ユ柊寤烘楠屽崟銆�");
+            }
+            arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
+            createdCount++;
+            log.info("[createIqcForArrivalNotice][鍒拌揣閫氱煡鍗�({}) 琛�({}) 鐢熸垚 IQC 妫�楠屽崟({})]",
+                    id, line.getId(), iqcId);
+        }
+        return createdCount;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity) {
         // 1.1 鏍¢獙鍒拌揣閫氱煡鍗曞瓨鍦�
         MesWmArrivalNoticeDO notice = validateArrivalNoticeExists(id);
         // 1.2 鏍¢獙鐘舵�佷负寰呰川妫�
@@ -143,20 +246,52 @@
             throw exception(WM_ARRIVAL_NOTICE_STATUS_NOT_PENDING_QC);
         }
 
-        // 2. 鏇存柊鍒拌揣閫氱煡鍗曡锛氱粦瀹� iqcId + 鍚堟牸鏁伴噺
-        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, qualifiedQuantity);
+        // 2. 鏇存柊鍒拌揣閫氱煡鍗曡锛氱粦瀹� iqcId + 璐ㄦ缁撴灉 + 鍚堟牸鏁伴噺
+        arrivalNoticeLineService.updateArrivalNoticeLineWhenIqcFinish(lineId, iqcId, checkResult, qualifiedQuantity);
 
-        // 3.1 鍒ゆ柇鏄惁鎵�鏈夐渶妫�琛岄兘宸插畬鎴�
+        // 鍚屾椂璁ゅ彲浠撳簱宸茬‘璁ょ殑鏉ユ枡閫�璐э紱淇濈暀鍘熷涓嶅悎鏍肩粨璁恒��
+        arrivalDispositionService.refresh(id);
+        // 3.1 鍒ゆ柇鏄惁鎵�鏈夐渶妫�琛岄兘宸插畬鎴愯川妫�
         List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(id);
         boolean hasUnchecked = CollectionUtils.anyMatch(lines,
-                line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcId() == null);
+                line -> Boolean.TRUE.equals(line.getIqcCheckFlag()) && line.getIqcCheckResult() == null);
         if (hasUnchecked) {
             log.info("[updateArrivalNoticeWhenIqcFinish][鍒拌揣閫氱煡鍗�({}) 杩樻湁鏈畬鎴愭楠岀殑琛岋紝鏆備笉鏇存柊鐘舵�乚", id);
             return;
         }
-        // 3.2 鎵�鏈夎妫�楠屽畬鎴愶紝鏇存柊涓昏〃鐘舵�� PENDING_QC 鈫� PENDING_RECEIPT
+
+        // 3.2 鍒ゆ柇鏄惁鎵�鏈夐渶妫�琛岄兘鍙互鍏ュ簱锛堝悎鏍兼垨鐗归噰锛�
+        boolean hasNonInbound = CollectionUtils.anyMatch(lines,
+                line -> Boolean.TRUE.equals(line.getIqcCheckFlag())
+                        && !MesQcCheckResultEnum.canInbound(line.getIqcCheckResult()));
+        if (hasNonInbound) {
+            log.info("[updateArrivalNoticeWhenIqcFinish][鍒拌揣閫氱煡鍗�({}) 瀛樺湪涓嶅彲鍏ュ簱鐨勮锛堥��璐�/鎶ュ簾锛夛紝鐘舵�佷繚鎸佸緟璐ㄦ]", id);
+            return;
+        }
+
+        // 3.3 鎵�鏈夎妫�楠屽畬鎴愪笖鍙叆搴擄紝鏇存柊涓昏〃鐘舵�� PENDING_QC 鈫� PENDING_RECEIPT
         arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
                 .setId(id).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus()));
+        // 3.4 璐ㄦ鍚堟牸鍚庣洿鎺ョ敓鎴愰噰璐叆搴撳崟锛堝緟鍏ュ簱锛夛紝搴撶鍙渶鏍稿鏁伴噺骞剁‘璁ゅ叆搴�
+        autoGenerateItemReceipt(notice);
+    }
+
+    /**
+     * 鍒拌揣閫氱煡鍗曡繘鍏ャ�屽緟鍏ュ簱銆嶅悗鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曘��
+     * 搴撶鏃犻渶鍐嶅洖鍒板埌璐ч�氱煡鐐广�屾墽琛屽叆搴撱�嶏紝鐩存帴鍒般�愰噰璐叆搴撱�戞牳瀵规暟閲忓苟纭鍏ュ簱鍗冲彲銆�
+     */
+    private void autoGenerateItemReceipt(MesWmArrivalNoticeDO notice) {
+        try {
+            Long receiptId = itemReceiptService.generateItemReceiptFromArrivalNotice(notice.getId());
+            log.info("[autoGenerateItemReceipt][鍒拌揣閫氱煡鍗�({}) 宸茶嚜鍔ㄧ敓鎴愰噰璐叆搴撳崟({})]",
+                    notice.getId(), receiptId);
+        } catch (ServiceException ex) {
+            log.error("[autoGenerateItemReceipt][鍒拌揣閫氱煡鍗�({}) 鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曞け璐",
+                    notice.getId(), ex);
+            throw new ServiceException(ex.getCode(),
+                    "鍒拌揣閫氱煡鍗昜" + notice.getCode() + "]杞叆寰呭叆搴撳悗鑷姩鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ細" + ex.getMessage()
+                            + "銆傛湰娆℃搷浣滄湭鐢熸晥锛岃绋嶅悗閲嶈瘯锛涜嫢鎸佺画澶辫触璇疯仈绯荤鐞嗗憳銆�");
+        }
     }
 
     @Override
@@ -256,4 +391,144 @@
         return arrivalNoticeMapper.selectCountByVendorId(vendorId);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId) {
+        // 1. 鏍¢獙鏄惁宸茬敓鎴愯繃鍒拌揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
+        MesWmArrivalNoticeDO existNotice = arrivalNoticeMapper.selectByPurchaseOrderId(purchaseOrderId);
+        if (existNotice != null) {
+            throw exception(WM_ARRIVAL_NOTICE_ALREADY_EXISTS);
+        }
+
+        // 2. 鑾峰彇閲囪喘璁㈠崟
+        ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(purchaseOrderId).getCheckedData();
+        if (purchaseOrder == null) {
+            throw exception(WM_PURCHASE_ORDER_NOT_EXISTS);
+        }
+
+        // 3. 鑾峰彇閲囪喘璁㈠崟鏄庣粏
+        List<ErpPurchaseOrderItemRespDTO> items = purchaseOrderApi.getPurchaseOrderItemList(purchaseOrderId).getCheckedData();
+        if (CollUtil.isEmpty(items)) {
+            throw exception(WM_PURCHASE_ORDER_NO_ITEM);
+        }
+
+        // 4. 鐢熸垚鍒拌揣閫氱煡鍗曠紪鐮�
+        String code = generateArrivalNoticeCode();
+
+        // 5. 鍒涘缓鍒拌揣閫氱煡鍗曚富琛紝鐩存帴璁句负寰呭叆搴撶姸鎬�
+        MesWmArrivalNoticeDO notice = new MesWmArrivalNoticeDO();
+        notice.setCode(code);
+        notice.setName(purchaseOrder.getNo() + "鍒拌揣閫氱煡");
+        notice.setPurchaseOrderId(purchaseOrderId);
+        notice.setPurchaseOrderCode(purchaseOrder.getNo());
+        notice.setContractNo(purchaseOrder.getContractNo());
+        notice.setVendorId(purchaseOrder.getSupplierId());
+        notice.setArrivalDate(java.time.LocalDateTime.now()); // 鍒拌揣鏃堕棿涓哄綋鍓嶆椂闂�
+        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus());
+        arrivalNoticeMapper.insert(notice);
+
+        // 6. 閬嶅巻鏄庣粏鍒涘缓鍒拌揣閫氱煡鍗曡
+        boolean hasNeedQc = false;
+        for (ErpPurchaseOrderItemRespDTO item : items) {
+            MesWmArrivalNoticeLineDO line = new MesWmArrivalNoticeLineDO();
+            line.setNoticeId(notice.getId());
+            line.setPurchaseOrderItemId(item.getId());
+            line.setItemId(item.getProductId()); // 浠庨噰璐鍗曟槑缁嗗甫鍏ョ墿鏂欑紪鍙�
+            BigDecimal arrivalQuantity = item.getCount() != null ? item.getCount().subtract(item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO) : BigDecimal.ZERO;
+            line.setArrivalQuantity(arrivalQuantity);
+            // 浠庨噰璐鍗曟槑缁嗗甫鍏ヨ川妫�鏍囪瘑
+            boolean needQc = Boolean.TRUE.equals(item.getQcCheckFlag());
+            line.setIqcCheckFlag(needQc);
+            // 濡傛灉涓嶉渶瑕佽川妫�锛屽悎鏍兼暟閲忕瓑浜庡埌璐ф暟閲�
+            if (!needQc) {
+                line.setQualifiedQuantity(arrivalQuantity);
+            } else {
+                hasNeedQc = true;
+            }
+            arrivalNoticeLineService.createArrivalNoticeLineFromPurchaseOrderItem(line);
+        }
+
+        // 7. 濡傛灉鏈夐渶瑕佽川妫�鐨勮锛屾洿鏂扮姸鎬佷负寰呰川妫�
+        // 娉ㄦ剰锛氭潵鏂欐楠屽崟涓嶅湪鐢熸垚鏃跺垱寤猴紝鐢卞簱绠$偣鍑汇�屾墽琛岃川妫�銆嶆椂閫氳繃 createIqcForArrivalNotice 鐢熸垚
+        if (hasNeedQc) {
+            arrivalNoticeMapper.updateById(new MesWmArrivalNoticeDO()
+                    .setId(notice.getId()).setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus()));
+        }
+
+        return notice.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createReplacementArrivalNotice(Long returnVendorId) {
+        // 1. 鏍¢獙閫�璐у崟
+        MesWmReturnVendorDO returnVendor = returnVendorMapper.selectById(returnVendorId);
+        if (returnVendor == null) {
+            throw exception(WM_RETURN_VENDOR_NOT_EXISTS);
+        }
+        if (returnVendor.getPurchaseOrderId() == null) {
+            throw exception(WM_RETURN_VENDOR_PURCHASE_ORDER_REQUIRED);
+        }
+        List<MesWmReturnVendorLineDO> returnLines = returnVendorLineMapper.selectListByReturnId(returnVendorId);
+        if (CollUtil.isEmpty(returnLines)) {
+            throw exception(WM_RETURN_VENDOR_NO_LINE);
+        }
+
+        // 2. 鑾峰彇閲囪喘璁㈠崟鏄庣粏锛岀敤浜庢寜鐗╂枡鍖归厤閲囪喘璁㈠崟鏄庣粏缂栧彿锛堜繚璇佸叆搴撳悗鑳藉洖鍐欏叆搴�/閫�璐ф暟閲忥級
+        Map<Long, Long> purchaseOrderItemIdMap = new HashMap<>();
+        List<ErpPurchaseOrderItemRespDTO> orderItems = purchaseOrderApi
+                .getPurchaseOrderItemList(returnVendor.getPurchaseOrderId()).getCheckedData();
+        if (CollUtil.isNotEmpty(orderItems)) {
+            orderItems.stream()
+                    .filter(item -> item.getProductId() != null)
+                    .forEach(item -> purchaseOrderItemIdMap.putIfAbsent(item.getProductId(), item.getId()));
+        }
+
+        // 3. 鍒涘缓鍒拌揣閫氱煡鍗曚富琛紝鐘舵�佺洿鎺ョ疆涓哄緟璐ㄦ
+        MesWmArrivalNoticeDO notice = new MesWmArrivalNoticeDO();
+        notice.setCode(generateArrivalNoticeCode());
+        notice.setName(returnVendor.getCode() + "鎹㈣揣鍒拌揣");
+        notice.setPurchaseOrderId(returnVendor.getPurchaseOrderId());
+        notice.setPurchaseOrderCode(returnVendor.getPurchaseOrderCode());
+        // 鎹㈣揣閲嶆柊鍏宠仈鍘熼噰璐悎鍚屽彿锛氫紭鍏堝彇閫�璐у崟蹇収锛岄��璐у崟鏈揩鐓ф椂鍥炲~閲囪喘璁㈠崟鍚堝悓鍙�
+        notice.setContractNo(returnVendor.getContractNo());
+        fillContractNoFromPurchaseOrder(notice);
+        notice.setVendorId(returnVendor.getVendorId());
+        notice.setArrivalDate(java.time.LocalDateTime.now());
+        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus());
+        notice.setRemark("渚涘簲鍟嗛��璐у崟[" + returnVendor.getCode() + "]鎹㈣揣閲嶆柊鍏ュ簱锛屽悎鍚屽彿["
+                + returnVendor.getContractNo() + "]");
+        arrivalNoticeMapper.insert(notice);
+
+        // 4. 閬嶅巻閫�璐ц鍒涘缓鍒拌揣閫氱煡鍗曡锛屽叏閮ㄦ爣璁伴渶瑕佽川妫�
+        for (MesWmReturnVendorLineDO returnLine : returnLines) {
+            MesWmArrivalNoticeLineDO line = new MesWmArrivalNoticeLineDO();
+            line.setNoticeId(notice.getId());
+            line.setPurchaseOrderItemId(purchaseOrderItemIdMap.get(returnLine.getItemId()));
+            line.setItemId(returnLine.getItemId());
+            line.setArrivalQuantity(returnLine.getQuantity());
+            line.setIqcCheckFlag(true);
+            arrivalNoticeLineService.createArrivalNoticeLineFromPurchaseOrderItem(line);
+        }
+
+        // 5. 閫愯鑷姩鍒涘缓 IQC 妫�楠屽崟
+        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(notice.getId());
+        for (MesWmArrivalNoticeLineDO line : lines) {
+            Long iqcId = iqcService.createIqcFromArrivalNotice(
+                    notice.getId(), line, notice.getCode(), notice.getVendorId());
+            arrivalNoticeLineService.updateArrivalNoticeLineIqcId(line.getId(), iqcId);
+            log.info("[createReplacementArrivalNotice][鎹㈣揣鍒拌揣閫氱煡鍗�({}) 琛�({}) 鑷姩鍒涘缓 IQC 妫�楠屽崟({})]",
+                    notice.getId(), line.getId(), iqcId);
+        }
+        return notice.getId();
+    }
+
+    /**
+     * 鐢熸垚鍒拌揣閫氱煡鍗曠紪鐮�
+     */
+    private String generateArrivalNoticeCode() {
+        // TODO: 浣跨敤缂栫爜瑙勫垯鏈嶅姟鐢熸垚缂栫爜
+        return "AN" + System.currentTimeMillis();
+    }
+
 }

--
Gitblit v1.9.3