From eaf2992f9f885a03b2bf3afcd9d990b2169ba271 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 26 十月 2023 18:12:20 +0800
Subject: [PATCH] feat: 调拨单出库

---
 consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java |   39 ++++++++++++++-------------------------
 1 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index b92480e..f70e2bb 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
@@ -6,12 +6,8 @@
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.NumberGenerator;
 import com.walker.jdbc.service.BaseServiceImpl;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.util.IdGenerator;
-
-import java.util.List;
 
 /**
  * 缂栫爜缁熶竴鐢熸垚鏈嶅姟
@@ -29,7 +25,7 @@
         System.out.println(prefix);
     }
 
-    private String createCodeByPrefix(String prefix,int length){
+    public String createCodeByPrefix(String prefix,int length){
         String CODE_PREFIX = prefix;
         String sql = "SELECT * from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX";
 
@@ -58,7 +54,7 @@
      *
      * @return 浠撳簱缂栫爜瑙勫垯涓猴細WH+鍥涗綅鏁板瓧杩炲彿锛�0001锛�
      */
-    public String createWarehouseCode() {
+    public synchronized String createWarehouseCode() {
       /*
         1.SELECT CODE_INDEX from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX
           CODE_PREFIX鏄�"WH"
@@ -66,20 +62,17 @@
           insert BASE_CODE_INDEXING CODE_INDEX=1 CODE_PREFIX鏄�="WH"  where CODE_PREFIX=:CODE_PREFIX;
          2.濡傛灉鑳藉鑾峰彇鍒帮紝鍒欏皢CODE_INDEX=CODE_INDEX+1鍚庢洿鏂板埌鏁版嵁搴擄紝琛ュ叏鍓嶉潰鐨�"0"杩斿洖 "0001"
          */
-        synchronized (this){
-            String CODE_PREFIX = CodeGeneratorEnum.Warehouse.getValue();
-            return createCodeByPrefix(CODE_PREFIX,4);
-        }
+        String CODE_PREFIX = CodeGeneratorEnum.Warehouse.getValue();
+        return createCodeByPrefix(CODE_PREFIX,4);
     }
 
     /**
      * 鐢熸垚鐗╁搧缂栫爜
      *
      * @param classify A,B,C
-     * @param type     1=闆嗛噰锛�2=鑷噰
      * @return 鍏�8浣嶏紝 涓�浣嶇墿鍝佸垎绫伙紙A/B/C锛�+涓�浣嶇被鍨嬶紙1涓洪泦閲囷紝2涓鸿嚜閲囷級+6浣嶈繛缁暟瀛楀彿
      */
-    public String createGoodsTemplateCode(String classify, int type) {
+    public synchronized String createGoodsTemplateCode(String classify) {
         /*
         1.SELECT CODE_INDEX from BASE_CODE_INDEXING where CODE_PREFIX=:CODE_PREFIX
           CODE_PREFIX鏄� prefix
@@ -87,10 +80,8 @@
           insert BASE_CODE_INDEXING CODE_INDEX=1 CODE_PREFIX鏄�=:prefix  where CODE_PREFIX=:CODE_PREFIX;
          2.濡傛灉鑳藉鑾峰彇鍒帮紝鍒欏皢CODE_INDEX=CODE_INDEX+1鍚庢洿鏂板埌鏁版嵁搴擄紝琛ュ叏鍓嶉潰鐨�"0"杩斿洖 "000001"
          */
-        synchronized (this){
-            String prefix = classify + Integer.valueOf(type).toString();
-            return createCodeByPrefix(prefix,6);
-        }
+        String prefix = classify;
+        return createCodeByPrefix(prefix,6);
     }
 
     /**
@@ -99,16 +90,14 @@
      * @param codeGeneratorEnum CodeGeneratorEnum
      * @return 1.涓や綅鍓嶇紑锛堝锛欳G浠h〃閲囪喘鍗曪級+鍏綅骞存湀鏃ワ紙230226锛�23骞�2鏈�26鏃ワ級+鍥涗綅鏁板瓧杩炲彿锛�0002锛�
      */
-    public String createBusinessFormCode(CodeGeneratorEnum codeGeneratorEnum) {
+    public synchronized String createBusinessFormCode(CodeGeneratorEnum codeGeneratorEnum) {
 
-        synchronized (this){
-            String prefix = codeGeneratorEnum.getValue();
-            int[] days = DateUtils.getCurrentYearMonthDay();
-            prefix +=  StringUtils.removeStart(Integer.valueOf(days[0]).toString(),"20");
-            prefix += days[1] < 9 ? "0" + Integer.valueOf(days[1]).toString() : days[1];
-            prefix += days[2] < 9 ? "0" + Integer.valueOf(days[2]).toString() : days[2];
-            return createCodeByPrefix(prefix,4);
-        }
+        String prefix = codeGeneratorEnum.getValue();
+        int[] days = DateUtils.getCurrentYearMonthDay();
+        prefix +=  StringUtils.removeStart(Integer.valueOf(days[0]).toString(),"20");
+        prefix += days[1] < 9 ? "0" + Integer.valueOf(days[1]).toString() : days[1];
+        prefix += days[2] < 9 ? "0" + Integer.valueOf(days[2]).toString() : days[2];
+        return createCodeByPrefix(prefix,4);
     }
 
 

--
Gitblit v1.9.1