From 06ac6cc6f4693a8abc585e69139131fe19274fd1 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 14:30:26 +0800
Subject: [PATCH] feat(erp): 销售订单审批接入协同办公(BPM)
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 35 ++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java | 4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 159 +++++++++++++++++++---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java | 9 +
sql/sale_order_bpm_approval.sql | 82 +++++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java | 24 +++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ErpSaleOrderStatusListener.java | 54 +++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 9 +
9 files changed, 348 insertions(+), 31 deletions(-)
diff --git a/sql/sale_order_bpm_approval.sql b/sql/sale_order_bpm_approval.sql
new file mode 100644
index 0000000..e28b040
--- /dev/null
+++ b/sql/sale_order_bpm_approval.sql
@@ -0,0 +1,82 @@
+-- ============================================================
+-- 閿�鍞鍗曞鎵规帴鍏ュ崗鍚屽姙鍏�(BPM) - 鏁版嵁搴撳彉鏇磋剼鏈�
+-- 璇存槑:
+-- 1. 鍙噸澶嶆墽琛�(骞傜瓑),閲嶅鎵ц涓嶄細鎶ラ敊/閲嶅鎻掑叆
+-- 2. 椤圭洰涓嶄娇鐢ㄥ绉熸埛,鑴氭湰涓嶅寘鍚� tenant_id
+-- 3. BPM 娴佺▼瀹氫箟(sale_order_approve)
+-- 闇�瑕佸湪銆屽崗鍚屽姙鍏� -> 娴佺▼绠＄悊銆嶄腑鍒涘缓骞跺彂甯�,鏃犳硶鐢� SQL 瀹屾垚,瑙佹枃鏈鏄�
+-- ============================================================
+
+-- ------------------------------------------------------------
+-- 1. erp_sale_order 琛� BPM 瀛楁(骞傜瓑:缂哄垪鎵嶅姞)
+-- ------------------------------------------------------------
+SET @s1 = IF((SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='erp_sale_order' AND column_name='process_instance_id')=0,
+ 'ALTER TABLE erp_sale_order ADD COLUMN process_instance_id VARCHAR(64) NULL COMMENT ''BPM 娴佺▼瀹炰緥缂栧彿'' AFTER remark', 'SELECT 1');
+PREPARE s1 FROM @s1; EXECUTE s1; DEALLOCATE PREPARE s1;
+
+-- ------------------------------------------------------------
+-- 2. 鏂板 BPM 娴佺▼鍒嗙被:閿�鍞鍗曞鎵�
+-- ------------------------------------------------------------
+INSERT INTO bpm_category (id, name, code, description, status, sort, creator, create_time, updater, update_time, deleted)
+SELECT (SELECT COALESCE(MAX(id), 0) + 1 FROM bpm_category), '閿�鍞鍗曞鎵�', 'sale_order_approve',
+ '閿�鍞鍗曞鎵规祦绋嬪垎绫�', 0, 30, '1', NOW(), '1', NOW(), 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM bpm_category WHERE code = 'sale_order_approve' AND deleted = 0);
+
+-- ------------------------------------------------------------
+-- 3. 淇/鏂板 erp_audit_status 瀛楀吀(涓� ErpAuditStatus 鏋氫妇淇濇寔涓�鑷�)
+-- ------------------------------------------------------------
+-- 3.1 鍊� 0 = 鏈彁浜�(閿�鍞鍗曞垱寤哄悗鍒濆鐘舵��;涓嶅瓨鍦ㄥ垯鏂板,瀛樺湪鍒欎慨姝ｆ爣绛�)
+INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted)
+SELECT (SELECT COALESCE(MAX(id), 0) + 1 FROM system_dict_data), 0, '鏈彁浜�', '0', 'erp_audit_status', 0, 'info', '',
+ '閿�鍞鍗曠瓑鏈彁浜ゅ鎵�', '1', NOW(), '1', NOW(), 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM system_dict_data WHERE dict_type = 'erp_audit_status' AND value = '0' AND deleted = 0);
+
+-- 3.2 鑻ュ凡瀛樺湪浣嗘爣绛句笉鏄�屾湭鎻愪氦銆�,寮哄埗淇涓恒�屾湭鎻愪氦銆�
+UPDATE system_dict_data
+SET label = '鏈彁浜�', remark = '閿�鍞鍗曠瓑鏈彁浜ゅ鎵�', updater = '1', update_time = NOW()
+WHERE dict_type = 'erp_audit_status' AND value = '0' AND deleted = 0;
+
+-- ------------------------------------------------------------
+-- 4. bpm_business_attach 琛�:娴佺▼瀹氫箟 -> 涓氬姟璇︽儏缁勪欢鏄犲皠
+-- 浣滅敤:鍗忓悓鍔炲叕瀹℃壒璇︽儏椤靛姞杞藉搴斾笟鍔＄粍浠跺睍绀轰笟鍔″唴瀹�
+-- 鑻ラ攢鍞鍗曡鎯呯粍浠惰矾寰勪笉鏄� /erp/sale/order/detail/index.vue,璇蜂慨鏀� component_path
+-- ------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `bpm_business_attach` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `process_definition_key` varchar(64) NOT NULL DEFAULT '' COMMENT '娴佺▼瀹氫箟鐨凨ey',
+ `business_type` varchar(64) NOT NULL DEFAULT '' COMMENT '涓氬姟绫诲瀷',
+ `component_path` varchar(255) NOT NULL DEFAULT '' COMMENT '涓氬姟璇︽儏缁勪欢璺緞',
+ `status` tinyint NOT NULL DEFAULT '0' COMMENT '鐘舵��',
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='BPM涓氬姟闄勪欢閰嶇疆';
+
+-- 4.1 閿�鍞鍗曞鎵� -> 閿�鍞鍗曡鎯呯粍浠�(鍗忓悓鍔炲叕瀹℃壒椤垫樉绀鸿鍗曞唴瀹�)
+INSERT INTO bpm_business_attach (id, process_definition_key, business_type, component_path, status, remark, creator, create_time, updater, update_time, deleted)
+SELECT (SELECT COALESCE(MAX(id), 0) + 1 FROM bpm_business_attach), 'sale_order_approve', 'erp_sale_order',
+ '/erp/sale/order/detail/index.vue', 0, '閿�鍞鍗曞鎵逛笟鍔¤鎯呯粍浠�', '1', NOW(), '1', NOW(), 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM bpm_business_attach WHERE process_definition_key = 'sale_order_approve' AND deleted = 0);
+
+-- ------------------------------------------------------------
+-- 5. 鍘嗗彶鏁版嵁杩佺Щ:瀛橀噺銆屾湭瀹℃牳(10)銆嶉攢鍞鍗曡皟鏁翠负銆屾湭鎻愪氦(0)銆�
+-- 鏂伴�昏緫涓垱寤哄悗鍗充负鏈彁浜�,10 涓嶅啀鐢ㄤ簬閿�鍞鍗�
+-- ------------------------------------------------------------
+UPDATE erp_sale_order SET status = 0, updater = '1', update_time = NOW()
+WHERE status = 10 AND deleted = 0;
+
+-- ============================================================
+-- 娉ㄦ剰:浠ヤ笅娴佺▼瀹氫箟闇�瑕佸湪銆屽崗鍚屽姙鍏� -> 娴佺▼绠＄悊銆嶄腑鍒涘缓骞跺彂甯�,鏃犳硶鐢� SQL 瀹屾垚
+-- 1. 娴佺▼ key: sale_order_approve
+-- 鍚嶇О: 閿�鍞鍗曞鎵�
+-- 鍒嗙被: sale_order_approve(瀵瑰簲鏈剼鏈 2 姝�)
+-- 瀹℃壒浜�: 鎸夐渶閰嶇疆
+-- 琛ㄥ崟: 鏅�氳〃鍗�(琛ㄥ崟1);閰嶅悎 bpm_business_attach 灞曠ず閿�鍞鍗曡鎯�
+-- ============================================================
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index 3cacd73..5bf0421 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -45,6 +45,7 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -91,13 +92,21 @@
return success(true);
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊閿�鍞鍗曠殑鐘舵��")
+ @PostMapping("/submit")
+ @Operation(summary = "鎻愪氦閿�鍞鍗曞鎵癸紙鍗忓悓鍔炲叕锛�")
@PreAuthorize("@ss.hasPermission('erp:sale-order:update-status')")
- public CommonResult<Boolean> updateSaleOrderStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- saleOrderService.updateSaleOrderStatus(id, status);
+ public CommonResult<Boolean> submitSaleOrder(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ Long userId = getLoginUserId();
+ saleOrderService.submitSaleOrder(id, processDefinitionKey, userId);
return success(true);
+ }
+
+ @GetMapping("/approve-process-list")
+ @Operation(summary = "鑾峰彇閿�鍞鍗曞鎵规祦绋嬪垪琛�")
+ @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
+ public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
+ return success(saleOrderService.getSaleOrderApproveProcessDefinitionList());
}
@PutMapping("/cancel")
@@ -161,6 +170,7 @@
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
// 3. 杞崲璁㈠崟椤�
List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
+ fillItemPrice(item);
item.setStockCount(mesWmStockApi.getStockQuantity(item.getProductId()));
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
@@ -260,6 +270,7 @@
return BeanUtils.toBean(pageResult, ErpSaleOrderRespVO.class, saleOrder -> {
saleOrder.setItems(BeanUtils.toBean(saleOrderItemMap.get(saleOrder.getId()), ErpSaleOrderRespVO.Item.class,
item -> {
+ fillItemPrice(item);
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
@@ -281,4 +292,18 @@
});
}
+ /**
+ * 濉厖璁㈠崟椤圭殑閲戦瀛楁
+ *
+ * DO 涓� totalPrice 涓轰骇鍝侀噾棰濓紙涓嶅惈绋庯級锛孯espVO 闇�瑕佽ˉ鍏細
+ * - totalProductPrice锛氫骇鍝侀噾棰�
+ * - totalPrice锛氬惈绋庨噾棰濓紙浜у搧閲戦 + 绋庨锛�
+ */
+ private void fillItemPrice(ErpSaleOrderRespVO.Item item) {
+ BigDecimal productAmount = item.getTotalPrice() != null ? item.getTotalPrice() : BigDecimal.ZERO;
+ BigDecimal tax = item.getTaxPrice() != null ? item.getTaxPrice() : BigDecimal.ZERO;
+ item.setTotalProductPrice(productAmount);
+ item.setTotalPrice(productAmount.add(tax));
+ }
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
index dd38717..979b6ec 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
@@ -77,6 +77,9 @@
@ExcelProperty("澶囨敞")
private String remark;
+ @Schema(description = "BPM 娴佺▼瀹炰緥缂栧彿", example = "b00eb97d-2d1c-4cf1-9b4b-2a5bcdc9a3a7")
+ private String processInstanceId;
+
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
@@ -148,6 +151,12 @@
@Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
private BigDecimal taxPrice;
+ @Schema(description = "浜у搧閲戦锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍚◣閲戦锛屽崟浣嶏細鍏�", example = "113.00")
+ private BigDecimal totalPrice;
+
@Schema(description = "澶囨敞", example = "闅忎究")
private String remark;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index dea60a2..e2998c3 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -110,6 +110,15 @@
*/
private String remark;
+ // ========== 鍗忓悓鍔炲叕(BPM)瀹℃壒 ==========
+
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ *
+ * 鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏悗鐢熸垚鐨勬祦绋嬪疄渚嬬紪鍙凤紝鐢ㄤ簬鍏宠仈瀹℃壒璁板綍
+ */
+ private String processInstanceId;
+
// ========== 閿�鍞嚭搴� ==========
/**
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java
index db7bbee..4a8dfdc 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java
@@ -17,7 +17,8 @@
@Getter
public enum ErpAuditStatus implements ArrayValuable<Integer> {
- PROCESS(10, "鏈鏍�"), // 鏈鏍�/鑽夌
+ DRAFT(0, "鏈彁浜�"), // 鏈彁浜�/鑽夌锛屽垱寤哄悗鍒濆鐘舵�侊紝鎻愪氦鍚庤繘鍏ュ鎵�
+ PROCESS(10, "鏈鏍�"), // 鏈鏍�/鑽夌锛堝巻鍙茬姸鎬侊紝鏂版暟鎹笉鍐嶄娇鐢級
APPROVING(15, "瀹℃壒涓�"), // 瀹℃壒涓�
APPROVE(20, "宸插鏍�"), // 瀹℃牳閫氳繃
CANCEL(30, "宸蹭綔搴�"), // 宸蹭綔搴�/宸叉挙閿�
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index 958f6fc..96a6482 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -95,6 +95,10 @@
ErrorCode SALE_ORDER_CANCEL_FAIL = new ErrorCode(1_020_201_014, "浣滃簾澶辫触锛岃鍒锋柊椤甸潰鍚庨噸璇�");
ErrorCode SALE_ORDER_ENABLE_FAIL_NOT_CANCEL = new ErrorCode(1_020_201_015, "鍚敤澶辫触锛岄攢鍞鍗�({})鏈綔搴燂紝鍙湁宸蹭綔搴熺殑璁㈠崟鎵嶈兘閲嶆柊鍚敤");
ErrorCode SALE_ORDER_ENABLE_FAIL = new ErrorCode(1_020_201_016, "鍚敤澶辫触锛岃鍒锋柊椤甸潰鍚庨噸璇�");
+ ErrorCode SALE_ORDER_SUBMIT_FAIL_STATUS = new ErrorCode(1_020_201_017, "鎻愪氦瀹℃壒澶辫触锛岄攢鍞鍗�({})鍙湁鏈彁浜ゆ垨宸查┏鍥炵姸鎬佹墠鑳芥彁浜�");
+ ErrorCode SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY = new ErrorCode(1_020_201_018, "鎻愪氦瀹℃壒澶辫触锛岄攢鍞鍗�({})娌℃湁璁㈠崟鏄庣粏锛屾棤娉曟彁浜�");
+ ErrorCode SALE_ORDER_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_020_201_019, "閿�鍞鍗曞鏍稿垎绫讳笉瀛樺湪锛岃鍏堝湪BPM妯″潡鍒涘缓閿�鍞鍗曞鏍告祦绋嬪垎绫�");
+ ErrorCode SALE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_020_201_020, "閿�鍞鍗曞鏍稿垎绫讳笅娌℃湁鍙敤鐨勬祦绋嬫ā鍨嬶紝璇峰厛鍒涘缓骞跺彂甯冩祦绋�");
// ========== ERP 閿�鍞嚭搴擄紙1-030-202-000锛� ==========
ErrorCode SALE_OUT_NOT_EXISTS = new ErrorCode(1_020_202_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
index 50800d0..cd8e54a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
@@ -35,12 +35,30 @@
void updateSaleOrder(@Valid ErpSaleOrderSaveReqVO updateReqVO);
/**
- * 鏇存柊閿�鍞鍗曠殑鐘舵��
+ * 鎻愪氦閿�鍞鍗曞鎵癸紙鍗忓悓鍔炲叕 BPM锛�
+ *
+ * 鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曞彲鎻愪氦锛屾彁浜ゅ悗杩涘叆鍗忓悓鍔炲叕瀹℃壒娴佺▼
*
* @param id 缂栧彿
- * @param status 鐘舵��
+ * @param processDefinitionKey 娴佺▼瀹氫箟鐨勬爣璇�
+ * @param userId 鎻愪氦浜虹紪鍙�
*/
- void updateSaleOrderStatus(Long id, Integer status);
+ void submitSaleOrder(Long id, String processDefinitionKey, Long userId);
+
+ /**
+ * 鏇存柊閿�鍞鍗曠殑瀹℃壒鐘舵�侊紙鍗忓悓鍔炲叕瀹℃壒缁撴灉鍥炶皟锛�
+ *
+ * @param id 缂栧彿
+ * @param bpmResult BPM 瀹℃壒缁撴灉锛堥�氳繃/椹冲洖/鍙栨秷锛�
+ */
+ void updateSaleOrderAuditStatus(Long id, Integer bpmResult);
+
+ /**
+ * 鑾峰緱閿�鍞鍗曞鎵规祦绋嬪畾涔夊垪琛�
+ *
+ * @return 娴佺▼瀹氫箟鍒楄〃锛坕d/key/name锛�
+ */
+ List<Map<String, Object>> getSaleOrderApproveProcessDefinitionList();
/**
* 浣滃簾閿�鍞鍗�
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 eca2c1e..9a49e7c 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
@@ -5,6 +5,13 @@
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.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;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
@@ -25,6 +32,7 @@
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
+import org.flowable.engine.repository.ProcessDefinition;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +41,10 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,6 +66,15 @@
* MPS 鐘舵�侊細宸插彇娑堬紙瀵瑰簲 MES 妯″潡 MesProMpsStatusEnum.CANCELED 鐨勫�� 3锛�
*/
private static final Integer MPS_STATUS_CANCELED = 3;
+
+ /**
+ * BPM 閿�鍞鍗曞鎵瑰垎绫荤紪鐮�
+ */
+ private static final String SALE_ORDER_APPROVE_CATEGORY_CODE = "sale_order_approve";
+ /**
+ * BPM 閿�鍞鍗曞鎵规祦绋嬪畾涔� Key锛堟彁浜ゅ悗杩涘叆鍗忓悓鍔炲叕瀹℃壒锛�
+ */
+ private static final String SALE_ORDER_APPROVE_PROCESS_DEFINITION_KEY = "sale_order_approve";
@Resource
private ErpSaleOrderMapper saleOrderMapper;
@@ -83,6 +102,13 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createSaleOrder(ErpSaleOrderSaveReqVO createReqVO) {
@@ -104,9 +130,9 @@
throw exception(SALE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟
+ // 2.1 鎻掑叆璁㈠崟锛堝垱寤哄悗涓烘湭鎻愪氦鐘舵�侊紝闇�鎵嬪姩鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏級
ErpSaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, ErpSaleOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus())
.setDepositPrice(ObjectUtil.defaultIfNull(createReqVO.getDepositPrice(), BigDecimal.ZERO))
.setOutCount(BigDecimal.ZERO).setOutStatus(ErpSaleOrderOutStatusEnum.NOT_OUT.getStatus()));
calculateTotalPrice(saleOrder, saleOrderItems);
@@ -125,10 +151,12 @@
public void updateSaleOrder(ErpSaleOrderSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪
ErpSaleOrderDO saleOrder = validateSaleOrderExists(updateReqVO.getId());
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ // 1.2 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳戒慨鏀�
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_UPDATE_FAIL_APPROVE, saleOrder.getNo());
}
- // 1.2 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
+ // 1.3 鏍￠獙瀹㈡埛锛堜娇鐢� CRM 瀹㈡埛 API锛�
customerApi.validateCustomer(updateReqVO.getCustomerId());
// 1.3 鏍￠獙缁撶畻璐︽埛
if (updateReqVO.getAccountId() != null) {
@@ -167,31 +195,117 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateSaleOrderStatus(Long id, Integer status) {
- boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
- // 1.1 鏍￠獙瀛樺湪
+ public void submitSaleOrder(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍￠獙瀛樺湪
ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
- // 1.2 鏍￠獙鐘舵��
- if (saleOrder.getStatus().equals(status)) {
- throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
+ // 2. 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳芥彁浜�
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
+ throw exception(SALE_ORDER_SUBMIT_FAIL_STATUS, saleOrder.getNo());
}
- // 1.3 瀛樺湪閿�鍞嚭搴撳崟锛屾棤娉曞弽瀹℃牳
- BigDecimal outCount = saleOrder.getOutCount() != null ? saleOrder.getOutCount() : BigDecimal.ZERO;
- if (!approve && outCount.compareTo(BigDecimal.ZERO) > 0) {
- throw exception(SALE_ORDER_PROCESS_FAIL_EXISTS_OUT);
+ // 3. 鏍￠獙璁㈠崟椤逛笉鑳戒负绌�
+ List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderId(id);
+ if (CollUtil.isEmpty(items)) {
+ throw exception(SALE_ORDER_SUBMIT_FAIL_ITEM_EMPTY, saleOrder.getNo());
}
- // 2. 鏇存柊鐘舵��
- int updateCount = saleOrderMapper.updateByIdAndStatus(id, saleOrder.getStatus(),
- new ErpSaleOrderDO().setStatus(status));
- if (updateCount == 0) {
- throw exception(approve ? SALE_ORDER_APPROVE_FAIL : SALE_ORDER_PROCESS_FAIL);
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛�
+ String processInstanceId = processInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 5. 鏇存柊閿�鍞鍗曠姸鎬佷负瀹℃壒涓紝璁板綍娴佺▼瀹炰緥缂栧彿
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(id)
+ .setStatus(ErpAuditStatus.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSaleOrderAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpSaleOrderDO saleOrder = validateSaleOrderExists(id);
+ if (!ErpAuditStatus.APPROVING.getStatus().equals(saleOrder.getStatus())) {
+ log.warn("[updateSaleOrderAuditStatus] 閿�鍞鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝璺宠繃", id);
+ return;
+ }
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
+ if (newStatus != null) {
+ saleOrderMapper.updateById(new ErpSaleOrderDO()
+ .setId(id).setStatus(newStatus));
}
// 3. 瀹℃牳閫氳繃鏃讹紝涓洪渶瑕佺敓浜х殑鏄庣粏鍒涘缓 MPS
- if (approve) {
+ if (ErpAuditStatus.APPROVE.getStatus().equals(newStatus)) {
createMpsForSaleOrder(id, saleOrder);
}
+ }
+
+ @Override
+ public List<Map<String, Object>> getSaleOrderApproveProcessDefinitionList() {
+ // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ validateSaleOrderApproveCategoryAndProcessDefinition();
+
+ // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_ORDER_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+
+ // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+
+ // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ result.add(item);
+ }
+ return result;
+ }
+
+ /**
+ * 鏍￠獙閿�鍞鍗曞鎵瑰垎绫绘槸鍚﹀瓨鍦�
+ */
+ private void validateSaleOrderApproveCategoryAndProcessDefinition() {
+ // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
+ List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
+ Collections.singletonList(SALE_ORDER_APPROVE_CATEGORY_CODE));
+ if (CollUtil.isEmpty(categories)) {
+ throw exception(SALE_ORDER_BPM_CATEGORY_NOT_EXISTS);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
+ */
+ private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.CANCEL.getStatus();
+ }
+ return null;
}
/**
@@ -381,13 +495,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteSaleOrder(List<Long> ids) {
- // 1. 鏍￠獙涓嶅浜庡凡瀹℃壒
+ // 1. 鏍￠獙鐘舵�侊細鍙湁鏈彁浜ゆ垨宸查┏鍥炵殑閿�鍞鍗曟墠鑳藉垹闄�
List<ErpSaleOrderDO> saleOrders = saleOrderMapper.selectByIds(ids);
if (CollUtil.isEmpty(saleOrders)) {
return;
}
saleOrders.forEach(saleOrder -> {
- if (ErpAuditStatus.APPROVE.getStatus().equals(saleOrder.getStatus())) {
+ if (!ErpAuditStatus.DRAFT.getStatus().equals(saleOrder.getStatus())
+ && !ErpAuditStatus.REJECT.getStatus().equals(saleOrder.getStatus())) {
throw exception(SALE_ORDER_DELETE_FAIL_APPROVE, saleOrder.getNo());
}
});
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ErpSaleOrderStatusListener.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ErpSaleOrderStatusListener.java
new file mode 100644
index 0000000..6174d5a
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ErpSaleOrderStatusListener.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.erp.service.sale.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 閿�鍞鍗曞鎵圭姸鎬佺洃鍚櫒
+ *
+ * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊閿�鍞鍗曠殑瀹℃壒鐘舵�侊紙鍗忓悓鍔炲叕瀹℃壒鍚庡洖鍐欙級
+ *
+ * @author 瓒呯骇绠＄悊鍛�
+ */
+@Component
+@Slf4j
+public class ErpSaleOrderStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ /**
+ * 閿�鍞鍗曞鎵规祦绋嬪畾涔� Key
+ */
+ private static final String PROCESS_DEFINITION_KEY = "sale_order_approve";
+
+ @Resource
+ private ErpSaleOrderService saleOrderService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return PROCESS_DEFINITION_KEY;
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ Long orderId;
+ try {
+ orderId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勯攢鍞鍗曠紪鍙�", event.getBusinessKey());
+ return;
+ }
+
+ log.info("[onEvent] 鏀跺埌BPM瀹℃壒浜嬩欢锛宱rderId={}, status={}", orderId, event.getStatus());
+
+ try {
+ saleOrderService.updateSaleOrderAuditStatus(orderId, event.getStatus());
+ log.info("[onEvent] 閿�鍞鍗�({}) 瀹℃壒鐘舵�佹洿鏂板畬鎴�", orderId);
+ } catch (Exception e) {
+ log.error("[onEvent] 鏇存柊閿�鍞鍗曞鎵圭姸鎬佸け璐ワ紝orderId={}", orderId, e);
+ }
+ }
+
+}
--
Gitblit v1.9.3