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 |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 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 18985aa..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
@@ -7,6 +7,7 @@
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
 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.dal.dataobject.definition.BpmCategoryDO;
@@ -34,8 +35,10 @@
 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;
 import jakarta.annotation.Resource;
 import org.flowable.engine.repository.ProcessDefinition;
 import lombok.extern.slf4j.Slf4j;
@@ -59,6 +62,7 @@
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.erp.enums.LogRecordConstants.*;
 
 /**
  * ERP 閿�鍞鍗� Service 瀹炵幇绫�
@@ -106,6 +110,8 @@
     private MdmItemApi mdmItemApi;
     @Resource
     private MesProMpsApi mpsApi;
+    @Resource
+    private MesWmSalesNoticeApi salesNoticeApi;
 
     @Resource
     private StorageAttachmentApi storageAttachmentApi;
@@ -190,6 +196,8 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @LogRecord(type = ERP_SALE_ORDER_TYPE, subType = ERP_SALE_ORDER_IMPORT_SUB_TYPE, bizNo = "0",
+            success = ERP_SALE_ORDER_IMPORT_SUCCESS)
     public ErpSaleOrderImportRespVO importSaleOrderList(List<ErpSaleOrderImportExcelVO> importList) {
         ErpSaleOrderImportRespVO respVO = ErpSaleOrderImportRespVO.builder()
                 .createList(new ArrayList<>())
@@ -197,6 +205,8 @@
                 .failureList(new LinkedHashMap<>())
                 .build();
         if (CollUtil.isEmpty(importList)) {
+            // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+            OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
             return respVO;
         }
 
@@ -235,6 +245,8 @@
                 respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
             }
         }
+        // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+        OperateLogUtils.putImportSummary(respVO.getCreateList(), respVO.getUpdateList(), respVO.getFailureList());
         return respVO;
     }
 
@@ -392,6 +404,16 @@
         }
 
         // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
+        // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+        if (processInstanceApi.isGlobalAutoApprove()) {
+            saleOrderMapper.updateById(new ErpSaleOrderDO()
+                    .setId(id)
+                    .setStatus(ErpAuditStatus.APPROVING.getStatus())
+                    .setProcessInstanceId(""));
+            updateSaleOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+            return;
+        }
+
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO()
                         .setProcessDefinitionKey(processDefinitionKey)
@@ -575,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());
@@ -585,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(),
@@ -724,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