From 2fcf73e5783a7a06dd4d4e6f412b9f759a7230c1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:22:06 +0800
Subject: [PATCH] 调整出入库配置

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index f36b989..60cd2f6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -22,6 +22,7 @@
     private static final AtomicLong sequence = new AtomicLong(0);
     private static String lastTimestamp = "";
 
+
     //鍏ㄥ眬鐢ㄦ埛瀹炴椂鍧愬湪閮ㄩ棬
     public static Map<String, String> contextUserDept = new HashMap<>();
 
@@ -30,13 +31,33 @@
      */
     public static Map<String, String> contextSnCompanyIdMap = new HashMap<>();
 
+
     /**
      * 鐢熸垚椤哄簭ID锛氬勾鏈堟棩鏃跺垎绉掓绉�(17浣�) + 搴忓垪鍙�(4浣�) = 21浣�
+     */
+    public static String generateId() {
+        String pattern = "yyyyMMddHHmmssSSS";
+        return generateId(null, pattern);
+    }
+
+    /**
+     * 鐢熸垚鍗曟嵁缂栫爜锛� (鏍煎紡: yyyyMMddHHmmss + 4浣嶉殢鏈烘暟)
+     * @param prefix
+     * @return
+     */
+    public static String generateOrderId(String prefix) {
+        String pattern = "yyyyMMddHHmmss";
+        return generateId(prefix, pattern);
+    }
+
+    /**
+     *
      *
      * @return
      */
-    public static String generateId() {
-        String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+    private static String generateId(String prefix, String pattern) {
+        if (null == pattern) pattern = "yyyyMMddHHmmss";
+        String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern(pattern));
         long seq;
         synchronized (ContextUtil.class) {
             if (currentTimestamp.equals(lastTimestamp)) {
@@ -44,12 +65,14 @@
             } else {
                 sequence.set(0);
                 seq = 0;
-
                 lastTimestamp = currentTimestamp;
             }
         }
-        return String.format("%s%04d", currentTimestamp, seq);
+
+        if (null == prefix) return String.format("%s%02d", currentTimestamp, seq);
+        return prefix + "_" + String.format("%s%02d", currentTimestamp, seq);
     }
+
 
     public static String UUID() {
         return UUID.randomUUID().toString().replaceAll("-", "");
@@ -63,7 +86,7 @@
     public static String getCompanyId() {
 
         SysUser user = ShiroUtils.getSysUser();
-        if(null != user) return user.getCompanyId();
+        if (null != user) return user.getCompanyId();
         return FrameworkConfig.getCompanyId();
     }
 
@@ -113,16 +136,16 @@
         Integer index5 = 100001;
         Integer index = 0;
         String orderId = "001";
-        if(StringUtils.isNotEmpty(oldOrderId)){
+        if (StringUtils.isNotEmpty(oldOrderId)) {
             index = Integer.valueOf(oldOrderId);
         }
-        if(3 == num){
+        if (3 == num) {
             orderId = ((index3 + index) + "").substring(1);
         }
-        if(4 == num){
+        if (4 == num) {
             orderId = ((index4 + index) + "").substring(1);
         }
-        if(5 == num){
+        if (5 == num) {
             orderId = ((index5 + index) + "").substring(1);
         }
         return orderId;
@@ -147,4 +170,32 @@
     public static String getCompanyIdBySn(String sn) {
         return contextSnCompanyIdMap.get(sn);
     }
+
+    public static String getTimeId() {
+        return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
+    }
+
+    public static String getTimeId(int start, int end) {
+        return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(start, end);
+    }
+
+
+    /**
+     * 濡傛灉鐢ㄦ埛鏄簱鍖虹敤鎴凤紝鍒ゆ柇鏄惁鏁版嵁鍏徃绾у埆
+     *
+     * @param userDeptId 褰撳墠鐢ㄦ埛閮ㄩ棬ID
+     * @return 濡傛灉閮ㄩ棬ID澶т簬闀垮害7璇存槑鏄簱鍖猴紝鍚﹀垯灏辨槸鍏徃绾у埆
+     */
+    public static boolean isDepotUser(String userDeptId) {
+        if(StringUtils.isBlank(userDeptId)) return false;
+        return userDeptId.length() > 7;
+    }
+
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10; i++){
+            String id = generateId();
+            System.out.println(id);
+        }
+    }
 }

--
Gitblit v1.9.3