From 1d9cfc91e7255b9e139b20ff230cb19246f19193 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 14:32:11 +0800
Subject: [PATCH] refactor(erp): 重构ERP单据单号生成逻辑以支持冲突重试
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java | 23 +++++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 19 +++++----
yudao-module-srm/src/main/resources/sql/srm_init.sql | 1
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 19 +++++----
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 12 ++----
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 25 ++++++------
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java | 6 +--
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java | 6 +--
8 files changed, 67 insertions(+), 44 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
index bdce48c..f7ca069 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
@@ -9,6 +9,7 @@
import java.time.Duration;
import java.time.LocalDateTime;
+import java.util.function.Predicate;
/**
@@ -68,4 +69,26 @@
return noPrefix + String.format("%06d", no);
}
+ /**
+ * 鐢熸垚搴忓彿锛屽苟璺宠繃宸插瓨鍦ㄧ殑鍗曞彿銆�
+ *
+ * Redis 涓殑鑷璁℃暟涓�鏃︿涪澶憋紙濡� Redis 閲嶅惎鏈寔涔呭寲銆佹墜宸ユ竻搴擄級锛岃鏁颁細浠� 1 閲嶆柊寮�濮嬶紝
+ * 鑰屽綋澶╂暟鎹簱涓彲鑳藉凡鏈夊悓鏃ユ湡鍚庣紑鐨勫崟鍙凤紝姝ゆ椂閫愪釜閫掑閲嶈瘯鐩村埌鍙栧埌鏈崰鐢ㄧ殑搴忓彿銆�
+ *
+ * @param prefix 鍓嶇紑
+ * @param isNoExists 鍗曞彿鏄惁宸插瓨鍦�
+ * @return 鏈崰鐢ㄧ殑搴忓彿
+ */
+ public String generate(String prefix, Predicate<String> isNoExists) {
+ for (int i = 0; i < MAX_GENERATE_ATTEMPTS; i++) {
+ String no = generate(prefix);
+ if (!isNoExists.test(no)) {
+ return no;
+ }
+ }
+ throw new IllegalStateException("鐢熸垚鍗曞彿澶辫触锛氳繛缁� " + MAX_GENERATE_ATTEMPTS + " 娆″皾璇曞潎宸茶鍗犵敤锛岃绋嶅悗閲嶈瘯");
+ }
+
+ private static final int MAX_GENERATE_ATTEMPTS = 10000;
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 995c361..2721bf2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -105,10 +105,8 @@
getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO)
.subtract(createReqVO.getDiscountPrice()), null);
// 1.7 鐢熸垚浠樻鍗曞彿锛屽苟鏍¢獙鍞竴鎬�
- String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_PAYMENT_NO_PREFIX);
- if (financePaymentMapper.selectByNo(no) != null) {
- throw exception(FINANCE_PAYMENT_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_PAYMENT_NO_PREFIX,
+ candidate -> financePaymentMapper.selectByNo(candidate) != null);
// 2.1 鎻掑叆浠樻鍗�
ErpFinancePaymentDO payment = BeanUtils.toBean(createReqVO, ErpFinancePaymentDO.class, in -> in
@@ -433,10 +431,8 @@
}
// 2.1 鐢熸垚浠樻鍗曞彿
- String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_PAYMENT_NO_PREFIX);
- if (financePaymentMapper.selectByNo(no) != null) {
- throw exception(FINANCE_PAYMENT_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_PAYMENT_NO_PREFIX,
+ candidate -> financePaymentMapper.selectByNo(candidate) != null);
// 2.2 閲戦鎸夎礋鏁板叆璐�
BigDecimal negativeAmount = reqDTO.getRefundAmount().negate();
ErpFinancePaymentDO payment = new ErpFinancePaymentDO()
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
index f8b80e0..0b41686 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
@@ -73,10 +73,8 @@
adminUserApi.validateUser(createReqVO.getFinanceUserId());
}
// 1.5 鐢熸垚鏀舵鍗曞彿锛屽苟鏍¢獙鍞竴鎬�
- String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_RECEIPT_NO_PREFIX);
- if (financeReceiptMapper.selectByNo(no) != null) {
- throw exception(FINANCE_RECEIPT_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_RECEIPT_NO_PREFIX,
+ candidate -> financeReceiptMapper.selectByNo(candidate) != null);
// 2.1 鎻掑叆鏀舵鍗�
ErpFinanceReceiptDO receipt = BeanUtils.toBean(createReqVO, ErpFinanceReceiptDO.class, in -> in
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
index f8761cd..76910fc 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
@@ -87,10 +87,8 @@
// 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
validatePurchaseInvoicePriceExceedsLimit(createReqVO);
// 1.3 鐢熸垚鏉ョエ缂栧彿
- String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_INVOICE_NO_PREFIX);
- if (invoiceMapper.selectByNo(no) != null) {
- throw exception(PURCHASE_INVOICE_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_INVOICE_NO_PREFIX,
+ candidate -> invoiceMapper.selectByNo(candidate) != null);
// 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈夋晥鐘舵�侊紝鏃犻渶瀹℃牳锛�
ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class).setNo(no);
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index b14e32a..594dc18 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -136,10 +136,8 @@
accountService.validateAccount(createReqVO.getAccountId());
}
// 1.4 鐢熸垚璁㈠崟鍙凤紝骞舵牎楠屽敮涓�鎬�
- String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
- if (purchaseOrderMapper.selectByNo(no) != null) {
- throw exception(PURCHASE_ORDER_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX,
+ candidate -> purchaseOrderMapper.selectByNo(candidate) != null);
// 2.1 鎻掑叆璁㈠崟锛坰ubmit=false 鏃朵繚瀛樹负鑽夌锛岀瓑寰呬笟鍔$‘璁ゅ悗鎵嬪姩鎻愪氦瀹℃壒锛�
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
@@ -307,10 +305,15 @@
}
// 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
- String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
- : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
- if (purchaseOrderMapper.selectByNo(no) != null) {
- throw new IllegalArgumentException("閲囪喘鍗曠紪鍙峰凡瀛樺湪锛�" + no);
+ String no;
+ if (StrUtil.isNotBlank(head.getNo())) {
+ no = head.getNo().trim();
+ if (purchaseOrderMapper.selectByNo(no) != null) {
+ throw new IllegalArgumentException("閲囪喘鍗曠紪鍙峰凡瀛樺湪锛�" + no);
+ }
+ } else {
+ no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX,
+ candidate -> purchaseOrderMapper.selectByNo(candidate) != null);
}
// 4. 缁勮涓昏〃锛氬嬀閫夆�滄槸鍚﹀鏍糕�� => 宸插鏍�(20)锛屽惁鍒欐湭瀹℃牳(10)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 82b0986..4c2366e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -114,10 +114,8 @@
supplierService.validateSupplier(createReqVO.getSupplierId());
}
// 3. 鐢熸垚鐢宠鍗曞彿
- String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
- if (purchaseRequestMapper.selectByNo(no) != null) {
- throw exception(PURCHASE_REQUEST_NO_EXISTS);
- }
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
+ candidate -> purchaseRequestMapper.selectByNo(candidate) != null);
// 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
Long userId = Long.parseLong(getCurrentUserId());
@@ -276,10 +274,15 @@
}
// 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚 CGSQ...
- String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
- : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
- if (purchaseRequestMapper.selectByNo(no) != null) {
- throw new IllegalArgumentException("閲囪喘鐢宠鍗曞彿宸插瓨鍦細" + no);
+ String no;
+ if (StrUtil.isNotBlank(head.getNo())) {
+ no = head.getNo().trim();
+ if (purchaseRequestMapper.selectByNo(no) != null) {
+ throw new IllegalArgumentException("閲囪喘鐢宠鍗曞彿宸插瓨鍦細" + no);
+ }
+ } else {
+ no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX,
+ candidate -> purchaseRequestMapper.selectByNo(candidate) != null);
}
// 4. 鐢宠浜� / 鐢宠閮ㄩ棬锛氬彇褰撳墠鐧诲綍鐢ㄦ埛鍙婂叾閮ㄩ棬
@@ -596,10 +599,8 @@
}
// 2. 鐢熸垚閲囪喘璁㈠崟鍙�
- String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
- if (purchaseOrderMapper.selectByNo(orderNo) != null) {
- throw exception(PURCHASE_ORDER_NO_EXISTS);
- }
+ String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX,
+ candidate -> purchaseOrderMapper.selectByNo(candidate) != null);
// 3. 鍒涘缓閲囪喘璁㈠崟
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
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..92d38a8 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
@@ -139,10 +139,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 +304,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)鈥濈姸鎬�
diff --git a/yudao-module-srm/src/main/resources/sql/srm_init.sql b/yudao-module-srm/src/main/resources/sql/srm_init.sql
index bc5d7e0..14868f9 100644
--- a/yudao-module-srm/src/main/resources/sql/srm_init.sql
+++ b/yudao-module-srm/src/main/resources/sql/srm_init.sql
@@ -108,6 +108,7 @@
deadline DATE DEFAULT NULL COMMENT '鎶ヤ环鎴鏃ユ湡',
purchaser_user_id BIGINT DEFAULT NULL COMMENT '閲囪喘鍛樼敤鎴稩D',
remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
+ process_instance_id VARCHAR(64) DEFAULT NULL COMMENT 'BPM娴佺▼瀹炰緥缂栧彿',
creator VARCHAR(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
updater VARCHAR(64) DEFAULT '' COMMENT '鏇存柊鑰�',
--
Gitblit v1.9.3