Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
 

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=在途
      */