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/service/purchase/ErpPurchaseRequestServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
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 2768c47..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. 鐢宠浜� / 鐢宠閮ㄩ棬锛氬彇褰撳墠鐧诲綍鐢ㄦ埛鍙婂叾閮ㄩ棬
@@ -567,11 +570,16 @@
if (purchaseRequest.getOrderId() != null) {
throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
}
- // 3. 鏍￠獙渚涘簲鍟�
- supplierService.validateSupplier(supplierId);
+ // 3. 渚涘簲鍟嗕互閲囪喘鐢宠鍗曚负鍑嗭細鐢宠鎻愪氦鏃跺凡缁忛�夎繃渚涘簲鍟嗭紝鐢熸垚璁㈠崟涓嶅啀瑕佹眰閲嶆柊閫夋嫨
+ // 鍏煎鏃ц皟鐢ㄦ柟浠嶆樉寮忎紶 supplierId 鐨勬儏鍐碉紝浼犱簡鍒欎互浼犲叆鍊间负鍑�
+ Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
+ if (targetSupplierId == null) {
+ throw exception(PURCHASE_REQUEST_SUPPLIER_REQUIRED);
+ }
+ supplierService.validateSupplier(targetSupplierId);
// 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
- purchaseRequest.setSupplierId(supplierId);
+ purchaseRequest.setSupplierId(targetSupplierId);
return doGeneratePurchaseOrder(purchaseRequest);
}
@@ -591,15 +599,15 @@
}
// 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();
purchaseOrder.setNo(orderNo);
- purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ // 鐢熸垚鍚庝负鑽夌锛氶噰璐敵璇蜂笌閲囪喘鍙拌处瀛楁涓嶅畬鍏ㄤ竴鑷达紙浠樻鏃ユ湡銆侀噰璐被鍨嬨�佷粯娆炬柟寮忕瓑锛夛紝
+ // 闇�瑕佷笟鍔″湪閲囪喘鍙拌处閲岃ˉ鍏呭畬鏁村悗鍐嶆彁浜ゅ鎵�
+ purchaseOrder.setStatus(ErpAuditStatus.DRAFT.getStatus());
purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
@@ -628,7 +636,8 @@
orderItem.setTaxPrice(item.getTaxPrice());
orderItem.setRemark(item.getRemark());
orderItem.setInCount(BigDecimal.ZERO);
- orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
+ // 鏄惁璐ㄦ涓庨噰璐敵璇蜂繚鎸佷竴鑷达細鏄庣粏鏈槑纭爣璁版椂榛樿涓恒�屾槸銆嶏紙鍘嗗彶鐢宠鍗曞彲鑳戒负 null锛�
+ orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : true);
return orderItem;
});
purchaseOrderItemMapper.insertBatch(orderItems);
@@ -636,6 +645,7 @@
// 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
+ .setSupplierId(purchaseRequest.getSupplierId())
.setOrderId(purchaseOrder.getId())
.setOrderNo(orderNo));
--
Gitblit v1.9.3