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

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

@@ -1747,4 +1747,54 @@ public class PtlPcnEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        FIVE_MINS(300, "5分钟"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(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;
+        }
+
+        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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -88,6 +88,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
 
+    @Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -0,0 +1,38 @@
+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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/5 11:54
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_PRODUCE_TYPE")
+@Api("产品生产类型")
+public class MesPartProduceType extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 9191695513960958568L;
+
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品生产类型")
+    private String pptCode;
+
+    @Column(name = "PPT_NAME")
+    @ApiParam("产品生产类型名称")
+    private String pptName;
+}

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

@@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
+
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品生产类型")
+    private String pptCode;
 }

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

@@ -72,6 +72,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
+    @Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartProduceTypeRepository extends BaseRepository<MesPartProduceType, Long> {
+}