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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -208,9 +208,13 @@ public class AndonManageQueue extends BaseBean {
     private String haltDesc;
 
     @Transient
-    @ApiParam(value = "停机具体原因")
+    @ApiParam(value = "异常时长", example = "0")
     private Long execptionTime;
 
+    @Transient
+    @ApiParam(value = "响应时长", example = "0")
+    private Long signTime;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2331,4 +2331,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 是否条码管控（用于物料）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_SN_CONTROL {
+        SN_CONTROL(1, "条码管控"), NOT_SN_CONTROL(2, "非条码管控");
+
+        private int value;
+        private String description;
+
+        IS_SN_CONTROL(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;
+        }
+    }
 }