From c4a9a4ac1e9fb9777952ba8b1a7e37b08a5033f8 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Fri, 15 Mar 2019 14:01:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3id=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
index 865e00d..6a7d958 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
@@ -35,9 +35,9 @@ public class SnowflakeIdMaker {
 
     private long twepoch = 1288834974657L;
 
-    private long workerIdBits = 10L;
+    private long workerIdBits = 5L;
     private long datacenterIdBits = 5L;
-    private long maxWorkerId = -1L ^ (-1L << workerIdBits); //1023
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30
     private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);  //30
     private long sequenceBits = 12L;
 

From 114816d4830849d77aa890aa84761a81f9ab4723 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 15 Mar 2019 17:50:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index ca1763a..a5b6f20 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -958,40 +958,6 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 库存条码表条码质量状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SN_QUALITY_STATUS {
-        NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
-
-        private int value;
-        private String description;
-
-        SN_QUALITY_STATUS(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * 业务表：库存条码状态
      * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */