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

modules/i3plus-pojo-andon/pom.xml

@@ -19,5 +19,37 @@
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

modules/i3plus-pojo-aps/pom.xml

@@ -23,5 +23,37 @@
             <artifactId>hibernate-validator</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

modules/i3plus-pojo-base/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
 
-
     <dependencies>
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -41,7 +40,38 @@
         </dependency>
 
     </dependencies>
-
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 
 </project>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java

@@ -25,6 +25,8 @@ public @interface DynamicField {
     int sort() default 0;
     // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
     int isWider() default 2;
+    // 是否可选作查询条件:默认1-可选，2-不可选
+    int isQuery() default 1;
     // 是否勾选:默认1-勾选，2-非勾选
     int isSelect() default 1;
     // 是否必选:默认1-必选，2-非必选
@@ -41,4 +43,6 @@ public @interface DynamicField {
     String searchColumnName() default "";
     // 回显列名
     String explicitColumnName() default "";
+    // 下拉框规则
+    WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)

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

@@ -1,9 +1,6 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
 
 /**
  * @Description : 模块表单枚举类
@@ -825,6 +822,170 @@ public class BlockFormEnumUtil {
 
 
     /**
+     * 元素软删状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_DELETE_WEAK_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_DELETE_WEAK_STATUS(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 valueOfCode(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 codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 ELEMENT_DELETE_WEAK_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 元素软删状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_VALID_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_VALID_STATUS(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 valueOfCode(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 codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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 ELEMENT_VALID_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
      * 属性字段排序规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1925,4 +2086,51 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 元素约束类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_CONSTRAINT_TYPE {
+        UNIQUE(10,  "唯一约束");
+        // 后续扩展联合主键
+//        PRIMARY_KEY(20,  "主键约束")
+
+        private int value;
+        private String description;
+
+        private ELEMENT_CONSTRAINT_TYPE (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 ELEMENT_CONSTRAINT_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
 }

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

@@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil {
         CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
 
         /* FTP */
-        CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器");
+        CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"),
+        SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器");
 
         private int value;
         private String description;

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

@@ -17,7 +17,9 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
-        WORK_ORDER_LANDED(10, "生产工单下达");
+        WORK_ORDER_LANDED(10, "生产工单下达"),
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"),
+        MES_WORK_ORDER(30, "生产工单导入");
 
         private int value;
         private String description;
@@ -82,6 +84,138 @@ 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);
+        }
+    }
+
+    /**
+     *  排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOOLING_ACTION_RECORD_TYPE {
+        REPLACE(10, "REPLACE", "更换"),
+        WAREHOUSE(20, "WAREHOUSE", "入库"),
+        Use(30, "Use", "领用");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TOOLING_ACTION_RECORD_TYPE(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)
@@ -1106,7 +1240,9 @@ public class MesEnumUtil {
     public enum MES_PRODUCE_SN_TYPE {
 
         NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
+        FIRST_INSPECTION(20, "首检件"),
+        HALF_PRODUCT(30, "半成品"),
+        KP(40, "关键件");
 
         private int value;
         private String description;
@@ -1595,11 +1731,11 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
-        MES_PLC(390,"PLC地址清单"),
-        MES_PROCESS(400,"工序信息"),
-        MES_KPSN_RULE(410,"关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列");
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_PLC(390, "PLC地址清单"),
+        MES_PROCESS(400, "工序信息"),
+        MES_KPSN_RULE(410, "关键件条码校验规则"),
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
 
         private int value;
         private String description;
@@ -2915,7 +3051,10 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单"),
+        REPAIR(70,"返修插单");
 
         private int value;
         private String description;
@@ -3497,7 +3636,8 @@ public class MesEnumUtil {
 
         QUALIFIED(10, "number", "数字"),
         DEFECTED(20, "text", "字符串"),
-        SCRAPED(30, "select", "可选值");
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
 
         private int value;
         private String code;
@@ -4068,7 +4208,7 @@ public class MesEnumUtil {
      * 客户JIT生产队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+    public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
         CANCEL(30, "取消");
@@ -4076,7 +4216,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
+        QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4104,14 +4244,340 @@ public class MesEnumUtil {
      * 客户JIT生产队列特殊标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空");
 
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+        QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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;
+        }
+    }
+
+    /**
+     * JIS发运队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        SHIPMENT(30, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_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;
+        }
+    }
+
+    /**
+     * 生产队列 队列类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_QUEUE_TYPE {
+        PRODUCT_QUEUE(10, "生产队列"),
+        PRELOAD_QUEUE(20, "预装队列");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_QUEUE_TYPE(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;
+        }
+    }
+
+    /**
+     * JIS发运队列明细 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_DETAIL_STATUS {
+        CREATE(10, "创建"),
+        SHIPMENT(20, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_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;
+        }
+    }
+
+    /**
+     * 关键件条码校验工步对应的物料分类的值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TYPE_THREE {
+
+        MM(10, "MM"),
+        MS(20, "MS");
+        private int value;
+        private String description;
+
+        PART_TYPE_THREE(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;
+        }
+    }
+
+
+    /**
+     * mes生产队列是否锁定
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_IS_LOCK {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_IS_LOCK(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;
+        }
+    }
+
+    /**
+     * 查询散件BOM关键物料号工步对应的物料分类的值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TYPE_THREE_STATION_BOM {
+
+        MM(10, "MM"),
+        NLX(20, "NLX");
+
+        private int value;
+        private String description;
+
+        PART_TYPE_THREE_STATION_BOM(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;
+        }
+    }
+
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件"),
+        BUTTON(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_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 WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_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 WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 工位BOM表中的匹配类型
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_BOM_MATCH_RULE {
+
+        BARCODE_RULE_MATCHING(10, "条码规则匹配"),
+        PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
+        BAR_CODE_MATCHING(30, "箱条码匹配");
+
+        private int value;
+        private String description;
+
+        STATION_BOM_MATCH_RULE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4134,4 +4600,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -13,6 +13,41 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 监听任务明细-采集数据方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_TASK_DETAIL_COLLECT_TYPE {
+        SELF_ADDITION(10, "自增列"),
+        FEED_FIELD(20, "反馈字段");
+
+        private int value;
+        private String description;
+
+        MONITOR_TASK_DETAIL_COLLECT_TYPE(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;
+        }
+    }
+
+    /**
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -202,10 +237,10 @@ public class MesPcnEnumUtil {
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
-        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
 
         private int value;
         private String code;
@@ -418,7 +453,9 @@ public class MesPcnEnumUtil {
     public enum MES_PRODUCE_SN_TYPE {
 
         NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
+        FIRST_INSPECTION(20, "首检件"),
+        HALF_PRODUCT(30, "半成品"),
+        KP(40, "关键件");
 
         private int value;
         private String description;
@@ -1961,6 +1998,31 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 工站分组队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_POINT_GROUP_STATUS {
+        CREATE(10, "创建"),
+        COMPLETE(20, "完成");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_POINT_GROUP_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * MesPartCategory实体对应的categoryType值  条码表条码质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2215,43 +2277,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 条码类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PCN_SN_TYPE {
-
-        NORMAL(10, "正常件"),
-        FIRST_INSPECTION(20, "首检件");
-
-        private int value;
-        private String description;
-
-        PCN_SN_TYPE(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;
-        }
-    }
-
-
-    /**
      * MesPlanOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2482,7 +2507,8 @@ public class MesPcnEnumUtil {
         FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
         BUTTON("button", "按钮"),
-        TABLES("tables", "多个表格");
+        TABLES("tables", "多个表格"),
+        FORM("form", "文本按钮");
 
         private String value;
         private String description;
@@ -2660,8 +2686,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC");
-//        DB(20, "DB");
+        PLC(10, "PLC"),
+        DB(20, "DB");
 
         private int value;
         private String description;
@@ -2806,4 +2832,486 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工位监听组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_MONITOR_TYPE {
+        MONITOR(10, "监听组件"),
+        SHOW(20, "展示组件");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_MONITOR_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 WORK_MODULE_TRIGGER_TYPE {
+        BY_SN(10, "根据条码加载工步"),
+        BY_PART(20, "根据零件号加载工步");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TRIGGER_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 WORK_MODULE_PARAM_TYPE {
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_PARAM_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_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, "创建"),
+        COMPLETE(20, "完成");
+
+        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;
+        }
+    }
+
+    /**
+     * 工位BOM表中的匹配类型
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_BOM_MATCH_RULE {
+
+        BARCODE_RULE_MATCHING(10, "条码规则匹配"),
+        PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
+        BAR_CODE_MATCHING(30, "箱条码匹配");
+
+        private int value;
+        private String description;
+
+        STATION_BOM_MATCH_RULE(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;
+        }
+    }
+
+    /**
+     * 作业模式
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATION_MODE {
+        SINGLE_SCAN(10, "单个扫描"),
+        NO_SCAN_DEDUCTION(20, "不扫描后端扣减");
+
+        private int value;
+        private String description;
+
+        OPERATION_MODE(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;
+        }
+    }
+
+    /**
+     * 是否完成整箱
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINISH_FLAG {
+
+        FALSE(0, "未完成"),
+        TRUE(1, "完成");
+
+        private int value;
+        private String description;
+
+        FINISH_FLAG(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;
+        }
+    }
+
+    /**
+     * 换膜信号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HM_FLAG {
+
+        NOT_FILM_EXCHANGE(0, "不需换模"),
+        FILM_EXCHANGE(1, "需换模");
+
+        private int value;
+        private String description;
+
+        HM_FLAG(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;
+        }
+    }
+
+    /**
+         * mes_设备工装类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQUIPMENT_TOOLING_TOOLING_TYPE {
+
+        WORK_CLOTHES(10, "工装"),
+        CHECKING_TOOL(20, "检具"),
+        MOULD(30, "模具");
+
+        private int value;
+        private String description;
+
+        EQUIPMENT_TOOLING_TOOLING_TYPE(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;
+        }
+    }
+
+    /**
+     * mes_工装操作记录表的操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_TYPE {
+
+        REPLACE(10, "更换"),
+        WAREHOUSING(20, "入库"),
+        RECEIVE(30, "领用");
+
+        private int value;
+        private String description;
+
+        ACTION_TYPE(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;
+        }
+    }
+
+    /**
+     * 表格颜色
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TABLE_COLOR {
+
+        GREEN("green", "绿色"),
+        YELLOW("Yellow", "黄色");
+
+        private String code;
+        private String description;
+
+        TABLE_COLOR(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 客户发运JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHIPPING_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        CANCEL(20, "已发运");
+
+        private int value;
+        private String description;
+
+        SHIPPING_ACTUAL_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;
+        }
+    }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_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;
+        }
+
+        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java

@@ -476,7 +476,7 @@ public class PtlEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_PATTERN {
 
-        UPDATE(1, "修改"),
+        UPDATE(1, "新增或修改"),
         INSERT(2, "新增");
 
         private int value;

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

@@ -292,11 +292,12 @@ public class PtlPcnEnumUtil {
     public enum SIGNAL_CHILD_CMD {
         CHILD_CMD_06H("06", 6, "正常"),
         CHILD_CMD_07H("07", 7, "缺货"),
-        CHILD_CMD_09H("09", 9, "标签自检"),
-        CHILD_CMD_0AH("0A", 10, "亮灯错误"),
+        CHILD_CMD_09H("09", 9, "连接的现场设备的返回状态"),
+        CHILD_CMD_FFH("FF", 255, "无效消息"),
+        CHILD_CMD_0AH("0A", 10, "现场设备超时"),
         CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"),
         CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"),
-        CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"),
+        CHILD_CMD_0DH("0D", 13, "返回按钮锁定消息,卡键,按键卡住"),
         CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"),
         CHILD_CMD_64H("64", 100, "熄灭情况下返回"),
         CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"),
@@ -351,12 +352,12 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_LIGHT_COLOR_CMD {
-        TAG_LIGHT_COLOR_RED("00", 0, "红"),
-        TAG_LIGHT_COLOR_GREEN("01", 1, "绿"),
-        TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"),
-        TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"),
-        TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"),
-        TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿");
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
 
         private String code;
         private Integer value;
@@ -441,18 +442,18 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FINISH_TAG_LIGHT_MUSIC_CMD {
-        FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"),
-        FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"),
-        FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"),
-        FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"),
-        FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"),
-        FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"),
-        FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"),
-        FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"),
-        FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"),
-        FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"),
-        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"),
-        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss");
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
 
         private String code;
         private Integer value;
@@ -746,8 +747,7 @@ public class PtlPcnEnumUtil {
         DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
         REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
         SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
-        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"),
-        GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
+        INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
 //        UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
 //        LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
 //        LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
@@ -927,6 +927,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * PTL_区段亮灯任务明细状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_DETAIL_STATUS {
         CREATE(10, "CREATE", "创建"),
@@ -956,67 +959,11 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * PTL_区段亮灯任务明细状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TASK_DETAIL_STATUS {
-        CREATE(10, "CREATE", "新建"),
-        RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成");
-
-        private int value;
-        private String code;
-        private String description;
-
-        TASK_DETAIL_STATUS(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].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            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);
-        }
-    }
-
-    /**
-     * PTL_区段、区域亮灯任务状态
+     * PTL_区段亮灯任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_STATUS {
         CREATE(10, "CREATE", "新建"),
-        RECEIPT(20, "RECEIPT", "执行中"),
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
 
         private int value;
@@ -1360,7 +1307,7 @@ public class PtlPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_PATTERN {
 
-        UPDATE(1, "修改"),
+        UPDATE(1, "新增或修改"),
         INSERT(2, "新增");
 
         private int value;
@@ -1511,35 +1458,26 @@ 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);
         }
     }
+
+
     /**
-     * 区域任务状态(ASN,PO,MOVE,QC)
+     * 区段任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MASTER_ORDER_STATUS {
-        CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "IN_PROGRESS", "处理中"),
-        RECEIPT_FINISH(30, "COMPLETED", "已完成"),
-        CANCELLED(40, "CANCELLED", "已取消");
+    public enum AREA_SECTION_TASK_TYPE {
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
         private String description;
 
-        MASTER_ORDER_STATUS(int value, String code, String description) {
+        AREA_SECTION_TASK_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1567,34 +1505,24 @@ 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);
         }
     }
+
     /**
-     * 区域任务类型(ASN,PO,MOVE,QC)
+     * 区域任务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum AREA_SECTION_TASK_TYPE {
-        CREATE(10, "CREATE", "JIT任务"),
-        RECEIPT(20, "IN_PROGRESS", "单据任务"),
-        RECEIPT_FINISH(30, "COMPLETED", "单点任务");
+    public enum AREA_TASK_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        RECEIPT_FINISH(30, "COMPLETED", "完成");
 
         private int value;
         private String code;
         private String description;
 
-        AREA_SECTION_TASK_TYPE(int value, String code, String description) {
+        AREA_TASK_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1622,34 +1550,25 @@ 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);
         }
     }
+
     /**
-     * 区域任务状态(ASN,PO,MOVE,QC)
+     * 区域任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum AREA_TASK_STATUS {
-        CREATE(10, "CREATE", "创建"),
-        RECEIPT(20, "IN_PROGRESS", "处理中"),
-        RECEIPT_FINISH(30, "COMPLETED", "已完成");
+    public enum AREA_TASK_TYPE {
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
         private String description;
 
-        AREA_TASK_STATUS(int value, String code, String description) {
+        AREA_TASK_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1677,35 +1596,25 @@ 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);
         }
     }
 
     /**
-     * 区域任务类型(ASN,PO,MOVE,QC)
+     * 主任务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum AREA_TASK_TYPE {
-        CREATE(10, "JIT_TASK", "JIT任务"),
-        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
-        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+    public enum MAIN_TASK_TYPE {
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
         private String description;
 
-        AREA_TASK_TYPE(int value, String code, String description) {
+        MAIN_TASK_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1733,16 +1642,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);
         }
@@ -1786,15 +1685,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-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -378,4 +379,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
 
     double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
+
+    List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime);
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1548,4 +1548,23 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
         return num;
     }
+
+    @Override
+    public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("PTL-PCN数据清除查询");
+        StringBuffer queryString = new StringBuffer();
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " ");
+
+        if (packBean != null) {
+            queryString.append(packBean.getWhereAppend());
+        }
+
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -20,4 +20,36 @@
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 </project>

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -112,6 +112,18 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
+    @ApiParam(value ="是否为唯一约束字段")
+    private transient Integer isUniqueProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;
@@ -127,4 +142,8 @@ public class BfElement extends BaseBean {
     @Transient
     @ApiParam(value = "元素虚拟属性信息")
     private List<BfElementPropertyVirtual> propertyVirtualList;
+
+    @Transient
+    @ApiParam(value = "元素约束信息")
+    private List<BfElementConstraint> constraintList;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 元素约束
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-03-12 13:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BF_ELEMENT_CONSTRAINT")
+@Api(value = "元素约束", description = "元素约束")
+public class BfElementConstraint  extends BaseBean {
+
+    @Column(name = "ELEMENT_ID")
+    @ApiParam(value = "对象元素ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @Column(name = "CONSTRAINT_NAME")
+    @ApiParam(value = "约束名称")
+    private String constraintName;
+
+    @Column(name = "CONSTRAINT_TYPE")
+    @ApiParam(value = "约束类型")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ELEMENT_CONSTRAINT_TYPE.class)
+    private Integer constraintType;
+
+    @Column(name = "CONSTRAIN_PROPERTY_NAME_RDD")
+    @ApiParam(value = "约束属性名称")
+    private String constrainPropertyNameRdd;
+
+    @Lob
+    @Column(name = "CONSTRAIN_PROPERTY_IDS")
+    @ApiParam(value = "约束属性ids")
+    private String constrainPropertyIds;
+
+//    @Transient
+//    @ApiParam(value = "元素约束属性信息")
+//    private List<BfElementConstraintProperty> constraintPropertyList;
+
+}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java

@@ -0,0 +1,56 @@
+//package cn.estsh.i3plus.pojo.form.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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 : 元素约束属性
+// * @Reference :
+// * @Author : yunhao
+// * @CreateDate : 2020-03-12 13:36
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY")
+//@Api(value = "元素约束属性", description = "元素约束属性")
+//public class BfElementConstraintProperty extends BaseBean {
+//
+//    @Column(name = "CONSTRAINT_ID")
+//    @ApiParam(value = "约束ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long constraintId;
+//
+//    @Column(name = "ELEMENT_PROPERTY_ID")
+//    @ApiParam(value = "元素属性ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long elementPropertyId;
+//
+//    @Column(name = "DATA_OBJECT_PROPERTY_ID")
+//    @ApiParam(value = "数据对象属性ID", example = "-1")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long dataObjectPropertyId;
+//
+//    @Column(name="PROPERTY_NAME")
+//    @ApiParam(value ="元素属性名称")
+//    private String propertyName;
+//
+//    @Column(name="PROPERTY_CODE_RDD")
+//    @ApiParam(value ="元素属性代码")
+//    private String propertyCodeRdd;
+//
+//}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -144,6 +144,11 @@ public class BfElementProperty extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private BfDataObjectProperty objectProperty;
 
+    @Transient
+    @ApiParam(value ="是否为唯一约束字段")
+    private transient Integer isUniqueProperty;
+
+
 //    public Object getFormValue() {
 //        return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
 //    }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java

@@ -0,0 +1,14 @@
+//package cn.estsh.i3plus.pojo.form.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
+//
+///**
+// * @Description : 元素约束属性
+// * @Reference :
+// * @Author : yunhao
+// * @CreateDate : 2019-03-21 20:27
+// * @Modify:
+// **/
+//public interface BfElementConstraintPropertyRepository extends BaseRepository<BfElementConstraintProperty, Long> {
+//}

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfElementConstraint;
+
+/**
+ * @Description : 元素约束
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-03-21 20:27
+ * @Modify:
+ **/
+public interface BfElementConstraintRepository extends BaseRepository<BfElementConstraint, Long> {
+}

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.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
         ddlPackBean.setOrderByStr(bfIntercept.orderBy());
@@ -324,6 +325,9 @@ public final class FormHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean);
 
@@ -352,4 +356,64 @@ public final class FormHqlPack {
 
         return result;
     }
+
+    /**
+     * 元素约束复杂查询
+     * @param bfElementConstraint 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getConstraintType(), "constraintType", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 元素约束检查重复
+     * @param bfElementConstraint 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据对象查询条件拼接
+     * @param bfDataObject
+     * @return
+     */
+    public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+
+    /**
+     * 数据对象查询条件拼接
+     * @param bfCascade
+     * @return
+     */
+    public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-hardswitch/pom.xml

@@ -13,5 +13,37 @@
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

modules/i3plus-pojo-jobflow/pom.xml

@@ -13,5 +13,37 @@
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

modules/i3plus-pojo-lac/pom.xml

@@ -19,5 +19,37 @@
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -73,6 +73,7 @@ public class LacHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -163,6 +164,10 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+        DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
+
+
         return ddlPackBean;
     }
 
@@ -190,4 +195,14 @@ public class LacHqlPack {
         DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -19,6 +19,37 @@
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
-
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java

@@ -105,4 +105,8 @@ public class MesPlc extends BaseBean implements Serializable {
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
 }

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

@@ -0,0 +1,55 @@
+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;
+import java.math.BigDecimal;
+
+/**
+ * @Description :散件产品配置明细
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 17:52
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_CFG_BOM")
+@Api("散件产品配置明细")
+public class MesProdScatterCfgBom extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+
+    @Column(name = "IS_KEY_PART")
+    @ApiParam("是否关键件")
+    private Integer isKeyPart ;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.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/18 0018 - 9:07
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SN_PHOTO_RELATION")
+@Api("条码照片关系")
+public class MesSnPhotoRelation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7732648131003455681L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("条码")
+    private String serialNumber;
+
+    @Column(name = "PHOTO_PATH")
+    @ApiParam("照片路径")
+    private String photoPath;
+
+    @Column(name = "PHOTO_NAME")
+    @ApiParam("照片名称")
+    private String photoName;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java

@@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable {
         this.snStatus = snStatus;
         this.workType = workType;
     }
+    public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+    }
 }

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 18:03
+ */
+@Repository
+public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
+
+}

modules/i3plus-pojo-mes/pom.xml

@@ -19,6 +19,37 @@
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>
-
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profileActive>DEV</profileActive>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profileActive>TEST</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <profileActive>DOCKER</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>PROD</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+    </build>
 
 </project>

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

@@ -0,0 +1,91 @@
+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;
+import java.util.Date;
+
+/**
+ * @Description :JIT发运数据同步
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-27
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "if_queue_shipping")
+@Api("JIT发运数据同步")
+public class IfQueueShipping extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8961182851667690154L;
+    @Column(name = "JIT_NO")
+    @ApiParam("JIT队列编号")
+    private String jitNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("操作人")
+    private String supplierCode;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private Date actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private Integer ifCode;
+
+}

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

@@ -0,0 +1,42 @@
+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/30 11:28
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION_MODULE_GROUP")
+@Api("工步集")
+public class MesActionModuleGroup extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1876053661752102998L;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "AM_CODE")
+    @ApiParam("组件集代码")
+    private String amCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("执行顺序")
+    private Integer seq;
+}

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

@@ -0,0 +1,49 @@
+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;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+}

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

@@ -0,0 +1,43 @@
+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 : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER")
+@Api("MES_容器类型")
+public class MesContainer extends BaseBean {
+    private static final long serialVersionUID = -3843389042411645111L;
+
+    @Column(name = "CT_NO")
+    @ApiParam(value = "容器编号")
+    private String ctNo;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "USE_STATUS")
+    @ApiParam(value = "使用状态")
+    private String useStatus;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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 : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:24
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER_TYPE")
+@Api("MES_容器类型")
+public class MesContainerType extends BaseBean {
+
+    private static final long serialVersionUID = 2831600566482383573L;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "CT_NAME")
+    @ApiParam(value = "容器类型名称")
+    private String ctName;
+
+    @Column(name = "USE_LIMIT")
+    @ApiParam(value = "使用期限")
+    private Integer useLimit;
+
+    @Column(name = "IS_RECYCLE")
+    @ApiParam(value = "是否回收")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isRecycle;
+
+    @Column(name = "LIMIT_UOM")
+    @ApiParam(value = "期限单位")
+    private String limitUom;
+}

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

@@ -70,6 +70,14 @@ public class MesDataObject extends BaseBean implements Serializable {
     @ApiParam("自增列值")
     private Long selfAdditionValue;
 
+    @Column(name = "ORDER_BY_FIELD")
+    @ApiParam("采集排序字段")
+    private String orderbyField;
+
+    @Column(name = "ORDER_BY_VALUE")
+    @ApiParam("采集排序值")
+    private Integer orderbyValue;
+
     @Transient
     @ApiParam("操作类型名称")
     private String operateTypeName;

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

@@ -0,0 +1,48 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/3/18 7:33 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ENCODE_RULE_MAP")
+@Api("MES_编码规则映射表")
+public class MesEncodeRuleMap extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4668354179377433538L;
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam("编码类型代码")
+    private String typeCode;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam("编码类型名称")
+    private String typeName;
+
+    @Column(name = "BUSINESS_CODE")
+    @ApiParam("业务代码")
+    private String businessCode;
+
+    @Column(name = "BUSINESS_VALUE")
+    @ApiParam("业务值")
+    private String businessValue;
+}

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

@@ -0,0 +1,88 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_设备工装关系
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-03-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQUIPMENT_TOOLING")
+@Api("MES_设备工装关系")
+public class MesEquipmentTooling extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1947971369479107711L;
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "TOOLING_NO")
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @Column(name = "TOOLING_CODE")
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @Column(name = "TOOLING_NAME")
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @Column(name = "TOOLING_TYPE")
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @Column(name = "USE_COUNT")
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @Column(name = "START_TIME")
+    @ApiParam("更换开始时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("更换结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("最大次数")
+    private Integer useCountMax;
+
+    public Integer getToolingType() {
+        return this.toolingType == null ? 0 : this.toolingType;
+    }
+
+    public Integer getUseCount() {
+        return this.useCount == null ? 0 : this.useCount;
+    }
+
+    public MesEquipmentTooling(){
+
+    }
+
+    public MesEquipmentTooling(MesTooling tooling, Integer useCount) {
+        this.toolingCode = tooling.getToolingCode();
+        this.toolingName = tooling.getToolingName();
+        this.useCount = useCount;
+        this.useCountMax = tooling.getUseCountMax();
+    }
+}

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

@@ -41,4 +41,12 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable {
     @Column(name = "PARENT_FP_CODE")
     @ApiParam("父阶现象代码")
     private String parentFpCode;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "FP_TYPE")
+    @ApiParam("故障现象类型")
+    private Integer fpType;
 }

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

@@ -55,6 +55,34 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("数据下限")
     private Double lowerLimit;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TORQUE_GROUP")
+    @ApiParam("扭矩组")
+    private String torqueGroup;
+
+    @Column(name = "TORQUE_GROUP_SEQ")
+    @ApiParam("扭矩组顺序")
+    private Integer torqueGroupSeq;
+
+    @Column(name = "TORQUE")
+    @ApiParam("扭矩项")
+    private String torque;
+
+    @Column(name = "TORQUE_SEQ")
+    @ApiParam("扭矩项顺序")
+    private Integer torqueSeq;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("JOB_ID")
+    private Integer jobId;
+
+    @Column(name = "LAST_TIGHTENING_ID")
+    @ApiParam("最后一次扭矩id")
+    private Long lastTighteningId;
+
     @Transient
     @ApiParam("扭矩值")
     private Double torqueValue;
@@ -63,6 +91,19 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("是否在范围之内")
     private Boolean ok;
 
+    @Transient
+    @ApiParam("应采个数")
+    private Integer shouldNum;
+
+    @Transient
+    @ApiParam("实采个数")
+    private Integer actualNum;
+
+    @Transient
+    @ApiParam("记录颜色")
+    private String color;
+
+
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;
     }

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

@@ -42,6 +42,9 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam(value = "模板内容")
     private String templateContent;
 
+    @ApiParam(value = "第二个模板内容")
+    private String otherTemplateContent;
+
     // 参数拼接，多参数都好分隔，后台在做处理
     @ApiParam(value = "模板参数拼接")
     @Transient

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

@@ -38,13 +38,13 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable {
     @ApiParam("数据对象编号")
     private String dataObjectNo;
 
-//    @Column(name = "STORE_OBJECT_CODE")
-//    @ApiParam("存储对象代码")
-//    private String storeObjectCode;
-//
-//    @Column(name = "STORE_FIELD_CODE")
-//    @ApiParam("存储字段代码")
-//    private String storeFieldCode;
+    @Column(name = "STORE_OBJECT_CODE")
+    @ApiParam("存储对象代码")
+    private String storeObjectCode;
+
+    @Column(name = "COLLECT_TYPE")
+    @ApiParam("采集数据方式")
+    private Integer collectType;
 
     @Transient
     @ApiParam("任务名称")

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

@@ -106,6 +106,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("打印缓存id")
     private String printId;
 
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+
     public MesPackage() {
     }
 

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

@@ -0,0 +1,59 @@
+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 : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_CHECK")
+@Api("物料校验项")
+public class MesPartCheck extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7706120594398072630L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "CHECK_SPEL_EXPRESS")
+    @ApiParam("校验表达式")
+    private String checkSpelExpress;
+
+    @Column(name = "TYPE_SPEL_EXPRESS")
+    @ApiParam("类型表达式")
+    private String typeSpelExpress;
+
+    @Column(name = "RECORD_NUM_SPEL_EXPRESS")
+    @ApiParam("记录数量表达式")
+    private String recordNumSpelExpress;
+
+    @Column(name = "RECORD_NUM_DESC")
+    @ApiParam("校验表达式")
+    private String recordNumDesc;
+
+}

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/bean/MesPlc.java

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -104,7 +105,37 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @Column(name = "OPC_URL")
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
+    @Column(name = "NAME_SPACE_INDEX")
+    @ApiParam("空间索引")
+    private Integer nameSpaceIndex = 2;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam("密码")
+    private String password;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;
+
+    @Transient
+    @ApiParam("OPC值")
+    private String opcValue;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
+
+
+    @Transient
+    @ApiParam("标签数据")
+    private String tableValue;
+
 }

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

@@ -29,8 +29,6 @@ import java.io.Serializable;
         @Index(columnList = "KP_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
         @Index(columnList = "ITEM_PART_NO")
-}, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"})
 })
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean implements Serializable {

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

@@ -42,4 +42,8 @@ public class MesProdCfg extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_Type_CODE")
     @ApiParam("产品配置类型代码")
     private String prodCfgTypeCode;
+
+    @Column(name = "PROD_CFG_TYPE")
+    @ApiParam("产品配置类型")
+    private String prodCfgType;
 }

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

@@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("工序代码")
     private String processCode;
 
+    @Column(name = "SM_CODE")
+    @ApiParam("状态机代码")
+    private String smCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("工步集代码")
+    private Long amgId;
+
     @Column(name = "STEP_CODE")
     @ApiParam("工步代码")
     private String stepCode;
@@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
     @ApiParam("工步参数值")
     private String paramValue;
 
+    @Column(name = "IS_ACTIVE")
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
+
     @Transient
     @Column(name = "PARAM_ATTRIBUTE")
     @ApiParam("参数属性")

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

@@ -0,0 +1,55 @@
+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;
+import java.math.BigDecimal;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 17:58
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_CFG_BOM")
+@Api("散件产品配置明细")
+public class MesProdScatterCfgBom extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+
+    @Column(name = "IS_KEY_PART")
+    @ApiParam("是否关键件")
+    private Integer isKeyPart ;
+}

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

@@ -0,0 +1,48 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/3/11 8:59 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_DETAIL")
+@Api("MES_散件产品配置关系")
+public class MesProdScatterDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3602480079910597288L;
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("散件产品名称")
+    private String partName;
+}

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
     @Transient
     @ApiParam("颜色")
     private String color;

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

@@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 655875369308810110L;
 
+
     @Column(name = "JIS_ACTUAL_NO")
     @ApiParam("队列编号")
     private String jisActualNo;
@@ -88,4 +90,20 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户需求结束时间")
     private String custPointEndDate;
 
+    @Transient
+    @ApiParam("产品配置名称")
+    private String prodCfgName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("特殊标识名称")
+    private String specialFlagName;
+
+    @Transient
+    @ApiParam(value = "下达按钮编号")
+    public String buttonCode;
+
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -31,9 +32,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1442091799346314190L;
 
-    @Column(name = "QGR_CODE")
-    @ApiParam("分组规则代码")
-    private String qgrCode;
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
 
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")
@@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCtgyCode;
 
+    @Transient
+    @ApiParam("产品位置")
+    private String prodCfgName;
+
     @Column(name = "PART_NAME")
     @ApiParam("产品名称")
     private String partName;
@@ -58,4 +63,16 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @Column(name = "GROUP_NO")
     @ApiParam("组内编号")
     private Integer groupNo;
+
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
+    @Column(name = "status")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "seq")
+    @ApiParam("主序编号")
+    private String seq;
 }

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

@@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Column(name = "IS_LOCK")
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "WORK_TYPE")
+    @ApiParam("工单类型")
+    private String workType;
+
+    @Column(name = "QUEUE_TYPE")
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
@@ -80,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("截至车号")
     private String custFlagNoEnd;
 
+    @Transient
+    @ApiParam("工单类型名称")
+    private String workTypeName;
+
+    @Transient
+    @ApiParam("锁定标识名称")
+    private String isLockName;
+
+    @Transient
+    @ApiParam("队列类型名称")
+    private String queueTypeName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -72,14 +72,30 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "产品生产类型")
+    @Column(name = "PPT_CODE")
     @ApiParam("产品类型名称")
     private String pptCode;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "IS_GROUP_PRINTED")
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
 
+    @Column(name = "FINSIH_QTY")
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }

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

@@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable {
     @ApiParam("是否必须")
     private Integer isNecessary;
 
+    @Column(name = "SM_CODE")
+    @ApiParam("状态机代码")
+    private String smCode;
+
     public int getSeqVal() {
         return this.seq == null ? 0 : this.seq;
     }

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

@@ -0,0 +1,78 @@
+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/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_ROUTE_STATUS")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态")
+public class MesRouteStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4988786372428896721L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name = "NEXT_STATUS")
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @Column(name = "TRIGGER_EVENT")
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @Column(name = "TRIGGER_WHERE")
+    @ApiParam("触发条件（MVEL）")
+    private String triggerWhere;
+
+    @Column(name = "ACTION_AMG_ID")
+    @ApiParam("触发调用")
+    private Long actionAmgId;
+
+    @Column(name = "IN_AMG_ID")
+    @ApiParam("进入状态调用")
+    private Long inAmgId;
+
+    @Column(name = "OUT_AMG_ID")
+    @ApiParam("离开状态调用")
+    private Long outAmgId;
+
+    @Column(name = "STATUS_TYPE")
+    @ApiParam("状态类型")
+    private Integer statusType;
+
+
+}

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

@@ -0,0 +1,43 @@
+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;
+import java.math.BigDecimal;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/9 0009 - 17:58
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCATTER_CFG_DETAIL")
+@Api("MES_散件配置报文关系")
+public class MesScatterCfgDetail extends BaseBean implements Serializable {
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private BigDecimal qty;
+}

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

@@ -0,0 +1,62 @@
+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/30 11:48
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SM_ROUTE_OPT_PARAM")
+@Api("产品流程状态机配置操作参数表")
+public class MesSmRouteOptParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5466013923105175070L;
+
+    @Column(name = "PROD_ROUTE_CFG_ID")
+    @ApiParam("产品流程Id")
+    private Integer prodRouteCfgId;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name="STEP_SEQ")
+    @ApiParam("工步顺序")
+    private Integer stepSeq;
+
+    @Column(name="PARAM_TYPE")
+    private Integer paramType;
+
+    @Column(name="PARAM_CODE")
+    private String paramCode;
+
+    @Column(name="PARAM_VALUE")
+    private String paramValue;
+
+    @Column(name="IS_ACTION")
+    private Integer isAction;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.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/18 0018 - 9:02
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SN_PHOTO_RELATION")
+@Api("条码照片关系")
+public class MesSnPhotoRelation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3062206473345277360L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("条码")
+   private String serialNumber;
+
+    @Column(name = "PHOTO_PATH")
+    @ApiParam("照片路径")
+    private String photoPath;
+
+    @Column(name = "PHOTO_NAME")
+    @ApiParam("照片名称")
+    private String photoName;
+
+}

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

@@ -0,0 +1,48 @@
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/30 11:12
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_STATE_MACHINE")
+@Api("MES状态机")
+public class MesStateMachine extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 6093522587973076640L;
+
+    @Column(name = "SM_CODE")
+    @ApiParam("状态机代码")
+    private String smCode;
+
+    @Column(name = "SM_NAME")
+    @ApiParam("状态机名称")
+    private String smName;
+
+    @Column(name = "SM_TYPE")
+    @ApiParam("状态机类型")
+    private String smType;
+
+    @Lob
+    @Column(name = "POSITION")
+    @ApiParam("GOJS的位置")
+    private String position;
+}

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

@@ -0,0 +1,75 @@
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/30 11:12
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_STATE_MACHINE_STATUS")
+@Api("MES状态机步骤")
+public class MesStateMachineStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 6093522587973076640L;
+
+    @Column(name = "SM_CODE")
+    @ApiParam("状态机代码")
+    private String smCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "NEXT_STATUS")
+    @ApiParam("下一状态")
+    private String nextStatus;
+
+    @Column(name = "STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型 10=内部触发 20=外部触发")
+    private Integer triggerType;
+
+    @Column(name = "TRIGGER_EVENT")
+    @ApiParam("触发事件")
+    private String triggerEvent;
+
+    @Column(name = "TRIGGER_WHERE")
+    @ApiParam("触发条件")
+    private String triggerWhere;
+
+    @Column(name = "ACTION_AMG_ID")
+    @ApiParam("触发调用")
+    private Integer actionAmgId;
+
+    @Column(name = "IN_AMG_ID")
+    @ApiParam("进入调用")
+    private Integer inAmgId;
+
+    @Column(name = "OUT_AMG_ID")
+    @ApiParam("离开调用")
+    private Integer outAmgId;
+
+    @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
+    @ApiParam("状态类型 10=初始化状态")
+    private Integer statusType;
+}

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

@@ -78,6 +78,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 
+    @Column(name = "MATCH_RULE")
+    @ApiParam(value = "匹配规则")
+    private Integer matchRule;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;
@@ -114,6 +118,14 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam(value = "是否绑定关键件名称")
     private String isBindKeyName;
 
+    @Transient
+    @ApiParam("是否扫描")
+    private Boolean isScan = false;
+
+    @Transient
+    @ApiParam("半成品条码")
+    private String halfProductSn;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,52 @@
+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 : qianhuasheng
+ * @CreateDate : 2020-03-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TOOLING")
+@Api("MES工装类型")
+public class MesTooling extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5033127912658757665L;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @Column(name = "TOOLING_NAME")
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @Column(name = "TOOLING_TYPE")
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @Column(name = "USE_COUNT_MAX")
+    @ApiParam("最大使用次数")
+    private Integer useCountMax;
+
+    @Column(name = "USE_TIME_MAX")
+    @ApiParam("最大使用时间")
+    private String useTimeMax;
+}

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

@@ -0,0 +1,79 @@
+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 : jessica.chen
+ * @CreateDate : 2020-03-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TOOLING_ACTION_RECORD")
+@Api("MES_工装操作记录")
+public class MesToolingActionRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1947971369479107712L;
+
+    @Column(name = "TOOLING_NO")
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("操作类型")
+    private Integer actionType;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "TOOLING_CODE")
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @Column(name = "TOOLING_NAME")
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @Column(name = "TOOLING_TYPE")
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @Column(name = "USE_COUNT")
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @Column(name = "START_TIME")
+    @ApiParam("更换开始时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("更换结束时间")
+    private String endTime;
+
+
+    public Integer getToolingType() {
+        return this.toolingType == null ? 0 : this.toolingType;
+    }
+
+    public Integer getUseCount() {
+        return this.useCount == null ? 0 : this.useCount;
+    }
+
+}

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

@@ -0,0 +1,56 @@
+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 : qianhuasheng
+ * @CreateDate : 2020-03-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TOOLING_DETAIL")
+@Api("MES_工装明细")
+public class MesToolingDetail extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5033127912653649665L;
+
+    @Column(name = "TOOLING_NO")
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @Column(name = "TOOLING_NAME")
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @Column(name = "TOOLING_TYPE")
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @Column(name = "USE_COUNT")
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.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/20 0020 - 16:21
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WINDOW_MODULE")
+@Api("MES_界面组件配置")
+public class MesWindowModule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -634938009999201410L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("菜单编号")
+    private String windowNo;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("按钮组件代码")
+    private String moduleCode;
+
+    @Column(name = "WINDOW_MODULE_BACK")
+    @ApiParam("回调界面方法")
+    private String windowModuleBack;
+
+}

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

@@ -0,0 +1,47 @@
+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/20 0020 - 16:25
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WINDOW_MODULE_PARAM")
+@Api("MES_界面组件参数配置")
+public class MesWindowModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5834883080240684524L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.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;
+import java.io.Serializable;
+
+/**
+ * @Description :工位投料信息
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE")
+@Api("作业程序组件参数")
+public class MesWorkCellModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3537487776977917751L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+}

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

@@ -0,0 +1,60 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :工作单元组件参数配置
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-03-12 7:45 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = {
+		@Index(columnList = "CREATE_DATE_TIME")
+})
+@Api("工作单元组件参数配置")
+public class MesWorkCellModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4836155960343256982L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+	@Column(name = "WORK_CELL_CODE")
+	@ApiParam("工作单元代码")
+	private String workCellCode;
+
+	@Column(name = "MODULE_CODE")
+	@ApiParam("组件代码")
+	private String moduleCode;
+
+	@Column(name = "CALL_CLASS")
+	@ApiParam("调用类")
+	private String callClass;
+
+	@Column(name = "PARAM_CODE")
+	@ApiParam("参数代码")
+	private String paramCode;
+
+	@Column(name = "PARAM_VALUE")
+	@ApiParam("参数值")
+	private String paramValue;
+
+}

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

@@ -0,0 +1,89 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : 工站分组队列
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-22 17:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_POINT_GROUP")
+@Api("工站分组队列")
+public class MesWorkCellPointGroup extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -6817903235638554748L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name = "QUEUE_SEQ")
+    @ApiParam("队列主表序号")
+    private Double queueSeq;
+
+    @Column(name = "QUEUE_DETAIL_SEQ")
+    @ApiParam("队列明细表序号")
+    private Double queueDetailSeq;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
+}

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

@@ -58,6 +58,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("运行状态")
     private String runningStatus;
 
+    @Column(name = "PRODUCTION_CAPACITY")
+    @ApiParam("产能")
+    private Integer productionCapacity;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -0,0 +1,59 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE")
+@Api("作业程序组件")
+public class MesWorkModule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4121840589026322086L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("组件名称")
+    private String moduleName;
+
+    @Column(name = "MODULE_TYPE")
+    @ApiParam("组件类型")
+    private Integer moduleType;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("调用类")
+    private String callClass;
+
+    @Column(name = "TRIGGER_TYPE")
+    @ApiParam("触发类型")
+    private Integer triggerType;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序号")
+    private Integer seq;
+
+
+}

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

@@ -0,0 +1,51 @@
+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 : Wynne.Lu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_MODULE_PARAM")
+@Api("作业程序组件参数")
+public class MesWorkModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3965186392895014717L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
@@ -11,27 +13,33 @@ import java.util.Map;
  * @desc
  */
 @Data
-public class ActorMessageModel<T> {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActorMessageModel {
 
-    private String msgType;
+    private boolean success;
 
-    private String clientInfo;
+    private Object dataObj;
 
-    private String workCellCode;
+    public boolean isSuccess() {
+        return success;
+    }
 
-    private String workCenterCode;
+    public static ActorMessageModel getSuccess() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private String organizeCode;
+    public static ActorMessageModel getFailure() {
+        return new ActorMessageModel(true, null);
+    }
 
-    private String routeCode;
+    public static ActorMessageModel getSuccess(Object data) {
+        return new ActorMessageModel(true, data);
+    }
 
-    private String serialNumber;
+    public static ActorMessageModel getFailure(Object data) {
+        return new ActorMessageModel(false, data);
+    }
 
-    private String productSn;
 
-    private T dataObj;
-
-    private List<? extends T> dataList;
-
-    private Map<String, Object> dataMap;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 工位扫描中，按钮组件之间传输的model
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/23 0023 - 13:14
+ */
+@Data
+@Api("按钮组件传输请求Model")
+public class ButtonComponentReqModel {
+
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("确认码")
+    private String confirmNo;
+
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @ApiParam("父界面编号")
+    private String parentWindowNo;
+
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/25 0025 - 19:41
+ */
+@Data
+@Api("按钮组件传输响应Model")
+public class ButtonComponentResultModel {
+
+    @ApiParam("成功信号")
+    private boolean isSuccess;
+
+    @ApiParam("是否跳过工序")
+    private boolean isJumpProcess;
+
+    @ApiParam("提示信息")
+    private String msg;
+
+    @ApiParam("动态按钮组")
+    private List<ButtonModel> buttonModels;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码信息")
+    private MesProduceSn produceSn;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/17 3:47 下午
+ * @Modify:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ButtonDynamicModel {
+
+    private Long id;
+
+    @ApiParam("按钮名称")
+    private String buttonName;
+
+    @ApiParam("按钮代码")
+    private String buttonCode;
+
+    @ApiParam("回调界面方法")
+    private String windowModuleBack;
+
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @ApiParam("参数值")
+    private String paramValue;
+
+
+    public ButtonDynamicModel(Long id, String buttonCode, String buttonName){
+        this.id = id;
+        this.buttonCode = buttonCode;
+        this.buttonName = buttonName;
+    }
+
+    public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
+        this.id = id;
+        this.buttonCode = buttonCode;
+        this.windowNo = windowNo;
+        this.windowModuleBack = windowModuleBack;
+        this.paramCode = paramCode;
+        this.paramValue = paramValue;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description : 按钮model
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/25 0025 - 5:02
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("按钮组件")
+public class ButtonModel {
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @ApiParam("组件名称")
+    private String moduleName;
+
+    @ApiParam("界面回调方法")
+    private String windowModuleBack;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("数据复核model")
+public class DataReviewStepModel {
+
+    @ApiParam("关键件")
+    private String itemPartNo;
+
+    @ApiParam("需要数量")
+    private String needNum;
+
+    @ApiParam("实际数量")
+    private String realNum;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
+import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
+//import com.sun.tools.javac.util.List;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/20 5:51 下午
+ * @Modify:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ElasticSearch
+public class EsProductDataModule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4514407617515827040L;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partDesc;
+
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @ApiParam("设备名称")
+    private String equName;
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("字段值")
+    private String fieldValue;
+
+    @ApiParam("数据行号")
+    private String rowNo;
+
+    @ApiParam("数据组号")
+    private String groupNo;
+
+    @Json4Es
+    @ApiParam("生产数据")
+    private ArrayList<ProductDataModel> lineData;
+
+    @ApiParam("字段总数")
+    private Integer fieldNum;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java

@@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("按配置修改按钮")
     private boolean updateButtonConfig;
 
+    @ApiParam("按散件修改按钮")
+    private boolean updateButtonScatter;
+
     @ApiParam("下达按钮")
     private boolean transmitButton;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("OPCUA路径")
+    private String opcUrl;
+
     public MesPlcModel() {
 
     }
@@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable {
         this.isAnalysis = isAnalysis;
         this.device = device;
         this.objectCode = objectCode;
+        this.opcUrl = opcUrl;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+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_JIT发运队列
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING")
+@Api("MES_JIT发运队列")
+public class MesQueueShipping extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 655875369308414110L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+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_JIT发运队列明细
+ * @Reference :
+ * @Author : qianhausheng
+ * @CreateDate : 2020-03-06 10:16 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
+@Api("MES_JIT发运队列明细")
+public class MesQueueShippingDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1442091799346314190L;
+
+    @Column(name = "JIT_NO")
+    @ApiParam("队列编号")
+    private String jitNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "status")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @Column(name = "GROUP_SEQ")
+    @ApiParam("分组序号")
+    private String groupSeq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Double qty;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("产品生产类型")
+    private String pptCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置参数Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgParamModel {
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("是否执行 1=是 2=否")
+    private Integer isActive;
+
+    List<MesRouteCfgStepModel> stepModelList;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 产品流程配置Model
+ * @Reference :
+ * @Author : adair
+ * @CreateDate : 2020-4-2
+ * @Modify:
+ **/
+@Data
+public class MesRouteCfgStepModel {
+
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    List<MesRouteCfgModel> routeCfgModelList;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/10 15:24
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MonitoringModel {
+
+    private String monitorType;
+
+    private Boolean isStop;
+
+    private MesWorkModule workModule;
+
+    private List<MesWorkCellModuleParam> cellModuleParams;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("生产数据缓存model")
+public class ProductDataCacheModel {
+
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @ApiParam("字段名称")
+    private List<ProductDataModel> productDataModelList;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/20 9:02 下午
+ * @Modify:
+ */
+@Data
+public class QueueJitActualModule {
+
+    private Long id;
+    @ApiParam("vin")
+    private String vinCode;
+    @ApiParam("排序号")
+    private Double seq;
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    public QueueJitActualModule() {
+
+    }
+
+    public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.seq = seq;
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+    }
+
+}