Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface IAndonManagetQueueRepository extends BaseRepository<AndonManageQueue,Long> {
+public interface IAndonManageQueueRepository extends BaseRepository<AndonManageQueue,Long> {
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface IAndonManagetRecordRepository extends BaseRepository<AndonManageRecord,Long> {
+public interface IAndonManageRecordRepository extends BaseRepository<AndonManageRecord,Long> {
 }

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

@@ -82,16 +82,18 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_FLAG{
 
-        CALL(1,"呼叫"),
+        CALL(1,"10","呼叫"),
-        SIGN(2,"签到"),
+        SIGN(2,"20","签到"),
-        RESOLVE(3, "解决"),
+        RESOLVE(3,"30","解决"),
-        CANCEL(4, "撤销");
+        CANCEL(4,"40", "撤销");
 
         private int value;
+        private String code;
         private String description;
 
-        ALARM_FLAG(int value, String description) {
+        ALARM_FLAG(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -99,6 +101,8 @@ public class AndonEnumUtil {
             return value;
         }
 
+        public String getCode(){ return code; }
+
         public String getDescription() {
             return description;
         }
@@ -143,4 +147,43 @@ public class AndonEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 优先级别
+     * 1 - 一级，2 - 二级，3 - 三级，4 - 四级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_PRIORITY{
+
+        FIRST(1,"一级"),
+        SECOND(2,"二级"),
+        THIRD(3,"三级"),
+        FOURTH(4,"四级");
+
+        private int value;
+        private String description;
+
+        ALARM_PRIORITY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -571,4 +571,42 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 组织模型树形菜单level
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_ORG_LEVEL{
+
+        LEVEL_ONE(1,"一级目录"),
+        LEVEL_TWO(1,"二级目录"),
+        LEVEL_THREE(1,"三级目录"),
+        LEVEL_FOUR(1,"四级目录");
+
+        private int value;
+        private String description;
+
+        PROD_ORG_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java

@@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")