From a57dceb3e6bc02e28a86f4de66f593706452c2b4 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 14:53:09 +0800
Subject: [PATCH] refactor: 需求10/23 改为基于 ERP 实现,修正此前 ERP 可用性误判

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index 09a39fb..0ed408e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -35,6 +35,7 @@
 import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
 import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsCreateReqDTO;
 import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
+import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
 import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import com.mzt.logapi.starter.annotation.LogRecord;
@@ -109,6 +110,8 @@
     private MdmItemApi mdmItemApi;
     @Resource
     private MesProMpsApi mpsApi;
+    @Resource
+    private MesWmSalesNoticeApi salesNoticeApi;
 
     @Resource
     private StorageAttachmentApi storageAttachmentApi;
@@ -594,7 +597,8 @@
     @Transactional(rollbackFor = Exception.class)
     public void cancelSaleOrder(Long id) {
         // 1.1 鏍¢獙瀛樺湪
-        ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+        ErpSaleOrderDO saleOrder = saleOrderMapper.selectByIdForUpdate(id);
+        if (saleOrder == null) throw exception(SALE_ORDER_NOT_EXISTS);
         // 1.2 鏍¢獙鐘舵�侊細鍙湁宸插鏍哥殑璁㈠崟鎵嶈兘浣滃簾
         if (!ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
             throw exception(SALE_ORDER_CANCEL_FAIL_NOT_APPROVE, saleOrder.getNo());
@@ -604,6 +608,20 @@
         if (outCount.compareTo(BigDecimal.ZERO) > 0) {
             throw exception(SALE_ORDER_CANCEL_FAIL_EXISTS_OUT);
         }
+
+        // 閿�鍞鍗曞鏍稿悗鍙兘宸茬敓鎴� MPS銆傛湭鍙栨秷鐨勮鍒掍笉鑳介殢鐫�璁㈠崟浣滃簾缁х画鎵ц銆�
+        List<ErpSaleOrderItemDO> orderItems = saleOrderItemMapper.selectListByOrderId(id);
+        if (CollUtil.isNotEmpty(orderItems)) {
+            List<Long> itemIds = convertList(orderItems, ErpSaleOrderItemDO::getId);
+            List<MesProMpsRespDTO> plans = mpsApi.getMpsListBySaleOrderItemIds(itemIds);
+            if (plans == null) throw exception(SALE_ORDER_CANCEL_FAIL_MPS_UNKNOWN);
+            if (plans.stream().anyMatch(plan -> plan == null || ObjectUtil.notEqual(plan.getStatus(), MPS_STATUS_CANCELED))) {
+                throw exception(SALE_ORDER_CANCEL_FAIL_ACTIVE_MPS);
+            }
+        }
+        Map<Long, Boolean> noticeStatus = salesNoticeApi.checkSalesNoticeBySaleOrderIds(List.of(id));
+        if (noticeStatus == null || noticeStatus.get(id) == null) throw exception(SALE_ORDER_CANCEL_FAIL_NOTICE_UNKNOWN);
+        if (Boolean.TRUE.equals(noticeStatus.get(id))) throw exception(SALE_ORDER_CANCEL_FAIL_NOTICE_EXISTS);
 
         // 2. 鏇存柊鐘舵�佷负宸蹭綔搴�
         int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
@@ -743,8 +761,7 @@
 
     @Override
     public PageResult<ErpSaleOrderDO> getSaleOrderPage(ErpSaleOrderPageReqVO pageReqVO) {
-        List<Long> permittedCustomerIds = customerApi.getPermittedCustomerIds();
-        return saleOrderMapper.selectPage(pageReqVO, permittedCustomerIds);
+        return saleOrderMapper.selectPage(pageReqVO);
     }
 
     // ==================== 璁㈠崟椤� ====================

--
Gitblit v1.9.3