From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java |   62 ++++++++++++++-----------------
 1 files changed, 28 insertions(+), 34 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 ae6f218..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;
 
 
 /**
@@ -20,53 +21,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.ErpPurchaseRequestDO}
      */
     public static final String PURCHASE_REQUEST_NO_PREFIX = "CGSQ";
+
     /**
-     * 閲囪喘鍏ュ簱 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO}
+     * 閲囪喘鏉ョエ {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO}
      */
-    public static final String PURCHASE_IN_NO_PREFIX = "CGRK";
-    /**
-     * 閲囪喘閫�璐� {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO}
-     */
-    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}
@@ -82,7 +54,7 @@
 
     /**
      * 鐢熸垚搴忓彿锛屼娇鐢ㄥ綋鍓嶆棩鏈燂紝鏍煎紡涓� {PREFIX} + yyyyMMdd + 6 浣嶈嚜澧�
-     * 渚嬪璇达細QTRK 202109 000001 锛堟病鏈変腑闂寸┖鏍硷級
+     * 渚嬪璇达細CGDD 202109 000001 锛堟病鏈変腑闂寸┖鏍硷級
      *
      * @param prefix 鍓嶇紑
      * @return 搴忓彿
@@ -97,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;
+
 }

--
Gitblit v1.9.3