From 0ddbb4ec727ffce844ef672107e3410d84b1f11a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 30 九月 2026 09:42:08 +0800
Subject: [PATCH] feat: 业务编码改为随机16位数字并保证全系统唯一
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java | 70 +++++++++++------------------------
1 files changed, 22 insertions(+), 48 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 b6777d2..965f8be 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
@@ -1,14 +1,9 @@
package cn.iocoder.yudao.module.erp.dal.redis.no;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.iocoder.yudao.module.erp.dal.redis.RedisKeyConstants;
+import cn.iocoder.yudao.framework.common.util.number.BizNoUtils;
import jakarta.annotation.Resource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Repository;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
/**
@@ -20,49 +15,24 @@
public class ErpNoRedisDAO {
/**
- * 鍏跺畠鍏ュ簱 {@link cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO}
- */
- public static final String STOCK_IN_NO_PREFIX = "QTRK";
- /**
- * 鍏跺畠鍑哄簱 {@link cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutDO}
- */
- public static final String STOCK_OUT_NO_PREFIX = "QCKD";
-
- /**
- * 搴撳瓨璋冩嫧 {@link cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveDO}
- */
- public static final String STOCK_MOVE_NO_PREFIX = "QCDB";
-
- /**
- * 搴撳瓨鐩樼偣 {@link cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO}
- */
- public static final String STOCK_CHECK_NO_PREFIX = "QCPD";
-
- /**
* 閿�鍞鍗� {@link cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO}
*/
public static final String SALE_ORDER_NO_PREFIX = "XSDD";
- /**
- * 閿�鍞嚭搴� {@link cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOutDO}
- */
- public static final String SALE_OUT_NO_PREFIX = "XSCK";
- /**
- * 閿�鍞��璐� {@link cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleReturnDO}
- */
- public static final String SALE_RETURN_NO_PREFIX = "XSTH";
/**
* 閲囪喘璁㈠崟 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO}
*/
public static final String PURCHASE_ORDER_NO_PREFIX = "CGDD";
+
/**
- * 閲囪喘鍏ュ簱 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO}
+ * 閲囪喘鐢宠 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO}
*/
- public static final String PURCHASE_IN_NO_PREFIX = "CGRK";
+ public static final String PURCHASE_REQUEST_NO_PREFIX = "CGSQ";
+
/**
- * 閲囪喘閫�璐� {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO}
+ * 閲囪喘鏉ョエ {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO}
*/
- public static final String PURCHASE_RETURN_NO_PREFIX = "CGTH";
+ public static final String PURCHASE_INVOICE_NO_PREFIX = "FPD";
/**
* 浠樻鍗� {@link cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO}
@@ -77,20 +47,24 @@
private StringRedisTemplate stringRedisTemplate;
/**
- * 鐢熸垚搴忓彿锛屼娇鐢ㄥ綋鍓嶆棩鏈燂紝鏍煎紡涓� {PREFIX} + yyyyMMdd + 6 浣嶈嚜澧�
- * 渚嬪璇达細QTRK 202109 000001 锛堟病鏈変腑闂寸┖鏍硷級
+ * 鐢熸垚 16 浣嶇函鏁板瓧涓氬姟缂栫爜锛堝叏绯荤粺鍞竴锛夈��
*
- * @param prefix 鍓嶇紑
- * @return 搴忓彿
+ * <p>涓哄吋瀹规棦鏈夎皟鐢ㄦ柟锛屼繚鐣� {@code prefix} 鍏ュ弬锛屼絾涓嶅啀鍙備笌缂栫爜鎷兼帴銆�
+ *
+ * @param prefix 鍗曟嵁绫诲瀷鍓嶇紑锛堝凡涓嶅啀鍙備笌缂栫爜鎷兼帴锛�
+ * @return 16 浣嶇函鏁板瓧缂栫爜
*/
public String generate(String prefix) {
- // 閫掑搴忓彿
- String noPrefix = prefix + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATE_PATTERN);
- String key = RedisKeyConstants.NO + noPrefix;
- Long no = stringRedisTemplate.opsForValue().increment(key);
- // 璁剧疆杩囨湡鏃堕棿
- stringRedisTemplate.expire(key, Duration.ofDays(1L));
- return noPrefix + String.format("%06d", no);
+ // 鍏ㄧ郴缁熷叡鐢ㄥ悓涓�鑷搴忓垪锛屼繚璇佺紪鐮併��16 浣嶇函鏁板瓧銆嶄笖鍏ㄧ郴缁熷敮涓�
+ // 闅忔満鐢熸垚 16 浣嶇函鏁板瓧缂栫爜锛屽苟鐢� Redis 闆嗗悎鏌ラ噸锛屼繚璇佸叏绯荤粺鍞竴锛堜笉浣跨敤鑷/椤哄簭锛�
+ for (int i = 0; i < BizNoUtils.MAX_RETRY; i++) {
+ String code = BizNoUtils.randomCode();
+ Long added = stringRedisTemplate.opsForSet().add(BizNoUtils.USED_SET_KEY, code);
+ if (added != null && added > 0) {
+ return code;
+ }
+ }
+ throw new IllegalStateException("鐢熸垚鍞竴涓氬姟缂栫爜澶辫触锛岃閲嶈瘯");
}
}
--
Gitblit v1.9.3