From d6c9307412ed55f3509d20cdb13c6a6602f2d89b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:06:07 +0800
Subject: [PATCH] feat(erp): 销售订单提交即生效,不再走 BPM 审批

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java |   65 +++++++++-----------------------
 1 files changed, 19 insertions(+), 46 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 ee084d0..7d075fb 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
@@ -8,8 +8,6 @@
 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;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
@@ -115,8 +113,6 @@
     private StorageAttachmentApi storageAttachmentApi;
 
     @Resource
-    private BpmProcessInstanceApi processInstanceApi;
-    @Resource
     private BpmCategoryService bpmCategoryService;
     @Resource
     private BpmProcessDefinitionService bpmProcessDefinitionService;
@@ -139,10 +135,8 @@
             adminUserApi.validateUser(createReqVO.getSaleUserId());
         }
         // 1.5 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
-        String no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
-        if (saleOrderMapper.selectByNo(no) != null) {
-            throw exception(SALE_ORDER_NO_EXISTS);
-        }
+        String no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX,
+                candidate -> saleOrderMapper.selectByNo(candidate) != null);
 
         // 2.1 鎻掑叆璁㈠崟锛堝垱寤哄悗涓烘湭鎻愪氦鐘舵�侊紝闇�鎵嬪姩鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏級
         ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
@@ -306,10 +300,15 @@
         }
 
         // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
-        String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
-                : noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX);
-        if (saleOrderMapper.selectByNo(no) != null) {
-            throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
+        String no;
+        if (StrUtil.isNotBlank(head.getNo())) {
+            no = head.getNo().trim();
+            if (saleOrderMapper.selectByNo(no) != null) {
+                throw new IllegalArgumentException("閿�鍞崟缂栧彿宸插瓨鍦細" + no);
+            }
+        } else {
+            no = noRedisDAO.generate(ErpNoRedisDAO.SALE_ORDER_NO_PREFIX,
+                    candidate -> saleOrderMapper.selectByNo(candidate) != null);
         }
 
         // 4. 缁勮涓昏〃锛氬鍏ュ悗鍥哄畾涓衡�滄湭鎻愪氦(0)鈥濈姸鎬�
@@ -415,44 +414,18 @@
             throw exception(SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY, saleOrder.getNo());
         }
 
-        // 4. 鍚堝悓杞潵鐨勯攢鍞鍗曪紙contractId 闈炵┖锛夋棤闇�鍐嶈蛋瀹℃壒锛�
-        //    鍚堝悓鍦� CRM 宸插鎵归�氳繃锛岃鍗曞唴瀹圭敱鍚堝悓甯﹀叆锛屾彁浜ゅ嵆鐢熸晥銆�
+        // 4. 閿�鍞鍗曚笉璧板鎵规祦绋嬶細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ョ敓鏁堬紙涓嶅啀鍒涘缓 BPM 娴佺▼瀹炰緥锛�
         //    鐢熸晥鍚庯細闇�瑕佺敓浜х殑鏄庣粏鑷姩鍒涘缓 MPS 娴佽浆鐢熶骇妯″潡锛涙棤闇�鐢熶骇鐨勬槑缁嗗彲鐩存帴鍦ㄤ粨鍌ㄧ敓鎴愬彂璐ч�氱煡鍗曘��
-        //    鍘嗗彶鍚堝悓鐢熸垚鐨勮鍗曟槑缁嗗彲鑳芥湭缁存姢鈥滄槸鍚﹂渶瑕佺敓浜р�濓紝鎸夌郴缁熼粯璁わ紙闇�瑕佺敓浜э級琛ラ綈鍚庡啀鐢熸晥銆�
-        if (saleOrder.getContractId() != null) {
-            items.stream()
-                    .filter(item -> item.getNeedProduction() == null)
-                    .forEach(item -> saleOrderItemMapper.updateById(
-                            new ErpSaleOrderItemDO().setId(item.getId()).setNeedProduction(1)));
-            saleOrderMapper.updateById(new ErpSaleOrderDO()
-                    .setId(id)
-                    .setStatus(ErpAuditStatus.APPROVING.getStatus())
-                    .setProcessInstanceId(""));
-            updateSaleOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
-            return;
-        }
-
-        // 5. 鍒涘缓 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)
-                        .setBusinessKey(String.valueOf(id)));
-
-        // 6. 鏇存柊閿�鍞鍗曠姸鎬佷负瀹℃壒涓紝璁板綍娴佺▼瀹炰緥缂栧彿
+        //    鍘嗗彶璁㈠崟/鎺ュ彛璋冪敤鍙兘鏈淮鎶も�滄槸鍚﹂渶瑕佺敓浜р�濓紝鎸夌郴缁熼粯璁わ紙闇�瑕佺敓浜э級琛ラ綈鍚庡啀鐢熸晥銆�
+        items.stream()
+                .filter(item -> item.getNeedProduction() == null)
+                .forEach(item -> saleOrderItemMapper.updateById(
+                        new ErpSaleOrderItemDO().setId(item.getId()).setNeedProduction(1)));
         saleOrderMapper.updateById(new ErpSaleOrderDO()
                 .setId(id)
                 .setStatus(ErpAuditStatus.APPROVING.getStatus())
-                .setProcessInstanceId(processInstanceId));
+                .setProcessInstanceId(""));
+        updateSaleOrderAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
     }
 
     @Override

--
Gitblit v1.9.3