From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java |   98 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 95 insertions(+), 3 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 ea57d40..50479f2 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
@@ -9,10 +9,14 @@
 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.erp.api.purchase.ErpSupplierApi;
+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;
@@ -28,7 +32,9 @@
 import java.math.BigDecimal;
 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.*;
@@ -48,7 +54,12 @@
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
 
     @Resource
-    private ErpSupplierApi supplierApi;
+    private MesWmReturnVendorMapper returnVendorMapper;
+    @Resource
+    private MesWmReturnVendorLineMapper returnVendorLineMapper;
+
+    @Resource
+    private SrmSupplierApi srmSupplierApi;
 
     @Resource
     private ErpPurchaseOrderApi purchaseOrderApi;
@@ -67,6 +78,7 @@
 
         // 鎻掑叆
         MesWmArrivalNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmArrivalNoticeDO.class);
+        fillContractNoFromPurchaseOrder(notice);
         notice.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
         arrivalNoticeMapper.insert(notice);
         return notice.getId();
@@ -81,14 +93,28 @@
 
         // 鏇存柊
         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());
         // 鏍¢獙渚涘簲鍟嗗瓨鍦紙ERP 閲囪喘渚涘簲鍟嗭級
-        supplierApi.validateSupplier(reqVO.getVendorId());
+        srmSupplierApi.getSupplier(reqVO.getVendorId());
         // 鏍¢獙閲囪喘璁㈠崟瀛樺湪
         if (reqVO.getPurchaseOrderId() != null) {
             ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(reqVO.getPurchaseOrderId()).getCheckedData();
@@ -325,6 +351,7 @@
         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());
@@ -371,6 +398,71 @@
         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();
+    }
+
     /**
      * 鐢熸垚鍒拌揣閫氱煡鍗曠紪鐮�
      */

--
Gitblit v1.9.3