【新增枚举，pojo】

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-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> {
+}