Merge branch 'dev' into test

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

@@ -83,6 +83,72 @@ public class MesEnumUtil {
     }
 
     /**
+     *  排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
      * JIS发运是否按主队列顺序扫描
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4110,6 +4176,7 @@ public class MesEnumUtil {
     public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空");
+
         private int value;
         private String description;
 
@@ -4251,7 +4318,6 @@ public class MesEnumUtil {
 
         MM(10, "MM"),
         MS(20, "MS");
-
         private int value;
         private String description;
 
@@ -4281,17 +4347,18 @@ public class MesEnumUtil {
 
 
     /**
-     * 工位监听组件类型
+     * mes生产队列是否锁定
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_CELL_MONITOR_TYPE {
-        MONITOR(10, "监听组件"),
-        SHOW(20, "展示组件");
+    public enum QUEUE_ORDER_IS_LOCK {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
 
         private int value;
         private String description;
 
-        WORK_CELL_MONITOR_TYPE(int value, String description) {
+        QUEUE_ORDER_IS_LOCK(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4303,20 +4370,31 @@ public class MesEnumUtil {
         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;
+        }
     }
 
     /**
-     * 工位监听组件触发类型
+     * 查询散件BOM关键物料号工步对应的物料分类的值
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_MODULE_TRIGGER_TYPE {
-        BY_SN(10, "根据条码加载工步"),
-        BY_PART(20, "根据零件号加载工步");
+    public enum PART_TYPE_THREE_STATION_BOM {
+
+        MM(10, "MM"),
+        NLX(20, "NLX");
 
         private int value;
         private String description;
 
-        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
+        PART_TYPE_THREE_STATION_BOM(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4328,17 +4406,31 @@ public class MesEnumUtil {
         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;
+        }
     }
 
+
+    /**
+     * 工位监听组件类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WORK_MODULE_PARAM_TYPE {
-        NUMBER(10, "数值"),
-        STRING(20, "字符串");
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
 
         private int value;
         private String description;
 
-        WORK_MODULE_PARAM_TYPE(int value, String description) {
+        WORK_CELL_MONITOR_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4353,22 +4445,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * 排序校验模式
+     * 工位监听组件触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum CHECK_PROD_SEQ_FLAG {
-        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
-        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
-        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
-        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+    public enum WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
 
         private int value;
-        private String code;
         private String description;
 
-        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+        WORK_MODULE_TRIGGER_TYPE(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -4379,43 +4467,27 @@ public class MesEnumUtil {
         public String getDescription() {
             return description;
         }
-
-        public String getCode() {
-            return code;
     }
 
-        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;
-        }
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
 
-        public static String codeOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].code;
-                }
-            }
-            return tmp;
-        }
+        private int value;
+        private String description;
 
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
         }
-            return tmp;
+
+        public int getValue() {
+            return value;
         }
 
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
+        public String getDescription() {
+            return description;
         }
     }
 }

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

@@ -2878,4 +2878,77 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 缓存类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CACHA_TYPE {
+        DATA_REVIEW(10, "数据复核");
+
+        private int value;
+        private String description;
+
+        CACHA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 缓存队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CACHA_QUEUE_STATUS {
+        CREATE(10, "创建");
+
+        private int value;
+        private String description;
+
+        CACHA_QUEUE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
+    /**
+     * 配方类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_FORMULA_TYPE {
+        DEVICE_SEMAPHORE(10, "设备信号");
+
+        private int value;
+        private String description;
+
+        PART_FORMULA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -1457,16 +1457,6 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
 
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -1514,16 +1504,6 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
 
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -1569,16 +1549,6 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
 
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -1625,11 +1595,47 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
 
-        public static int descOf(String desc) {
-            int tmp = 1;
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 主任务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MAIN_TASK_TYPE {
+        CREATE(10, "JIT_TASK", "JIT任务"),
+        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
+        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MAIN_TASK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].description.equals(desc)) {
-                    tmp = values()[i].value;
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
                 }
             }
             return tmp;
@@ -1678,15 +1684,5 @@ public class PtlPcnEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 }

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 15:09
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CACHA_QUEUE")
+@Api("MES缓存队列")
+public class MesCachaQueue extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 8272649623030195332L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "CACHA_TYPE")
+    @ApiParam("缓存类型")
+    private String cachaType;
+
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 15:50
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_FORMULA")
+@Api("MES_物料配方")
+public class MesPartFormula extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3120650997069271308L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
+    @Column(name = "FORMULA_TYPE")
+    @ApiParam("配方类型")
+    private Integer formulaType;
+
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_缓存队列
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 14:52
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CACHA_QUEUE")
+@Api("MES缓存队列")
+public class MesCachaQueue extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6875307024103023380L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "CACHA_TYPE")
+    @ApiParam("缓存类型")
+    private String cachaType;
+
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 15:45
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_FORMULA")
+@Api("MES_物料配方")
+public class MesPartFormula extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4905294092563287950L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
+    @Column(name = "FORMULA_TYPE")
+    @ApiParam("配方类型")
+    private Integer formulaType;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCachaQueue;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 15:05
+ */
+@Repository
+public interface MesCachaQueueRepository extends BaseRepository<MesCachaQueue,Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartFormula;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/16 0016 - 15:59
+ */
+@Repository
+public interface MesPartFormulaRepository extends BaseRepository<MesPartFormula,Long> {
+}