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 | 46 ++++++++--------------------------------------
1 files changed, 8 insertions(+), 38 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 92d38a8..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;
@@ -114,8 +112,6 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
- @Resource
- private BpmProcessInstanceApi processInstanceApi;
@Resource
private BpmCategoryService bpmCategoryService;
@Resource
@@ -418,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