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

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

@@ -269,4 +269,192 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * MesQueueOrder实体对应的status值  队列主表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_STATUS{
+
+        NORMAL(10,"正常"),
+        ONLINE(20,"已上线"),
+        OFFLINE(30,"已下线"),
+        CLOSE(40,"已关闭"),;
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_STATUS(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;
+        }
+    }
+
+    /**
+     * MesQueueOrderDetail实体对应的status值  队列详情状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_DETAIL_STATUS{
+
+        NORMAL(10,"正常"),
+        CLOSE(20,"关闭");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_DETAIL_STATUS(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;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的snStatus值  条码表条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_STATUS{
+
+        CREATE(10,"创建"),
+        PROCESS(20,"加工"),
+        OFFLINE(30,"上线"),
+        INSTOCKED(40,"入库"),
+        SHIPING(50,"发运"),
+        CLOSE(90,"关闭"),;
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_STATUS(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;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的printStatus值  条码表条码打印状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_PRINT_STATUS{
+
+        CREATE(10,"创建"),
+        ONLINE(20,"上线打印"),
+        OFFLINE(30,"下线打印");
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_PRINT_STATUS(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;
+        }
+    }
+
+    /**
+     * MesProduceSn实体对应的qcStatus值  条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_QC_STATUS{
+
+        QUALIFIED(10,"合格"),
+        DEFECTED(20,"不合格"),
+        SCRAPED(30,"报废");
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_QC_STATUS(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-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -46,4 +46,8 @@ public class BfIntercept extends BaseBean {
     @Column(name="INTERCEPT_DESCRIPTION")
     @ApiParam(value ="拦截器描述")
     private String interceptDescription;
+
+    @Column(name="INTERCEPT_STATUS")
+    @ApiParam(value ="拦截器状态")
+    private Integer interceptStatus;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -179,6 +179,7 @@ public final class FormHqlPack {
 
         DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
         ddlPackBean.setOrderByStr(bfIntercept.orderBy());
 

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

@@ -0,0 +1,46 @@
+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;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-04-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT")
+@Api("班次信息")
+public class MesShift extends BaseBean {
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @Column(name="WORK_TIMES")
+    @ApiParam("作业时长")
+    private String workTimes;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.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.MesShift;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-13:53
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRepository extends BaseRepository<MesShift, Long> {
+}