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

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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/bean/BaseBean.java

@@ -82,7 +82,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
@@ -94,7 +95,8 @@ public abstract class BaseBean implements Serializable {
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
+            isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")

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

@@ -2133,4 +2133,51 @@ public class BlockFormEnumUtil {
         }
     }
 
+
+    /**
+     * 操作触发来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FORM_TRIGGER_SOURCE {
+        INTERCEPTOR(10,  "拦截器"),
+        BUTTON(20,  "按钮");
+
+        private int value;
+        private String description;
+
+        private FORM_TRIGGER_SOURCE (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 FORM_TRIGGER_SOURCE 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/BlockReportEnumUtil.java

@@ -785,20 +785,20 @@ public class BlockReportEnumUtil {
 
     /**
      * 报表排版枚举
-     * ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+     * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum REPORT_TYPESET_TYPE{
+    public enum REPORT_REF_TYPE{
 
-        ELEMENT(1,"元素"),TEMPLATE(2,"模板");
+        ELEMENT(1,"元素"),TEMPLATE(2,"对象视图");
 
         private int value;
         private String description;
 
-        REPORT_TYPESET_TYPE() {
+        REPORT_REF_TYPE() {
         }
 
-        REPORT_TYPESET_TYPE(int value, String description) {
+        REPORT_REF_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }

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/CommonEnumUtil.java

@@ -1483,6 +1483,50 @@ public class CommonEnumUtil {
     }
 
     /**
+     * 缺失资源来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MiSS_RESOURCE_SOURCE {
+        WEB(10, "网页端"),
+        SERVER(20, "服务端");
+
+        private int value;
+        private String description;
+
+        private MiSS_RESOURCE_SOURCE(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 MiSS_RESOURCE_SOURCE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * 属性类型信息(属性转换器)
      * <per>
      * <br/>    Form 核心转换器
@@ -1871,4 +1915,50 @@ public class CommonEnumUtil {
         }
     }
 
+    /**
+     * 变量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  LICENSE_SOURCE {
+        LOCAL_SYSTEM_FILE(1, "本地文件"),
+        NETWORK_ESTSH(2, "网络-官方授权"),
+        SENSE_HARDWARE_USB_LOCK(3, "硬件锁"),
+        SENSE_SOFTWARE_CODE_LOCK(4, "软锁");
+
+        private int value;
+        private String description;
+
+        private LICENSE_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -13,12 +13,81 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * 排序方式
+     */
+    public enum ASC_OR_DESC {
+        ASC(1, "正序"), DESC(2, "倒序");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private ASC_OR_DESC(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+    }
+
+    /**
+     * 监听任务明细-采集数据方式
+     */
+    @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;
+        }
+    }
+
+    /**
      * 动作-module
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
         WORK_ORDER_LANDED(10, "生产工单下达"),
-        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"),
+        MES_WORK_ORDER(30, "生产工单导入");
 
         private int value;
         private String description;
@@ -1239,7 +1308,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;
@@ -1809,18 +1880,18 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes设备作业通知配置-通知方式
+     * mes通知配置-通知方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
+    public enum NOTIFY_CFG_PATTERN {
 
-        EMAIL(10, "邮件"),
-        USERPHONE(20, "手机号");
+        EMAIL(10, "邮件");
+//        USERPHONE(20, "手机号");
 
         private int value;
         private String description;
 
-        MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) {
+        NOTIFY_CFG_PATTERN(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -3050,7 +3121,8 @@ public class MesEnumUtil {
         ATTEMPT_ORDER(30, "试制工单"),
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
-        STOCK_ORDER(60, "库存工单");
+        STOCK_ORDER(60, "库存工单"),
+        REPAIR(70,"返修插单");
 
         private int value;
         private String description;
@@ -4160,8 +4232,8 @@ public class MesEnumUtil {
     @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;
@@ -4558,4 +4630,87 @@ public class MesEnumUtil {
             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;
+        }
+    }
+
+    /**
+     * 容器使用状态
+     */
+    @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,7 +237,7 @@ 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");
@@ -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)
@@ -2483,7 +2508,7 @@ public class MesPcnEnumUtil {
         IMAGE("image", "图片"),
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
-        DATA("data", "表格");
+        FORM("form", "文本按钮");
 
         private String value;
         private String description;
@@ -2661,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;
@@ -2963,7 +2988,7 @@ public class MesPcnEnumUtil {
 
         BARCODE_RULE_MATCHING(10, "条码规则匹配"),
         PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
-        BAR_CODE_MATCHING(20, "条码匹配");
+        BAR_CODE_MATCHING(30, "箱条码匹配");
 
         private int value;
         private String description;
@@ -3101,7 +3126,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-         * mes_设备工装类型
+     * mes_设备工装类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum EQUIPMENT_TOOLING_TOOLING_TYPE {
@@ -3173,4 +3198,222 @@ public class MesPcnEnumUtil {
             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 FSM_EVENT {
+        TRIGGER(10, "trigger", "触发"),
+        ENTRY(20, "entry", "进入状态"),
+        EXIT(30, "exit", "离开状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private FSM_EVENT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FSM_STATE_TYPE {
+        BEGIN(10, "begin", "开始状态点"),
+        END(20, "end", "结束状态点");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private FSM_STATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRIGGER_TYPE {
+        INNER_TRIGGER(10, "内部触发"),
+        OUTER_TRIGGER(20, "外部触发");
+
+        private int value;
+        private String description;
+
+        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 STATION_REQUEST_BEAN_CMD {
+        JUMP_STATUS(10, "跳过状态点"),
+        FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点");
+
+        private int value;
+        private String description;
+
+        STATION_REQUEST_BEAN_CMD(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 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/PtlPcnEnumUtil.java

@@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum AREA_SECTION_TASK_TYPE {
-        CREATE(10, "CREATE", "JIT任务"),
-        RECEIPT(20, "IN_PROGRESS", "单据任务"),
-        RECEIPT_FINISH(30, "COMPLETED", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
@@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil {
      */
     @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", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;
@@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MAIN_TASK_TYPE {
-        CREATE(10, "JIT_TASK", "JIT任务"),
-        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
-        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+        JIT_TASK(10, "JIT_TASK", "JIT任务"),
+        DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"),
+        SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务");
 
         private int value;
         private String code;

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

@@ -713,7 +713,8 @@ public class WmsEnumUtil {
         KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
-        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料");
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
 
         private int value;
         private String code;
@@ -3914,6 +3915,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static PRINT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -4512,7 +4522,9 @@ public class WmsEnumUtil {
         SAFETY_STOCK_PULL(10, "安全库存拉动"),
         ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"),
         LINE_PULL(30, "巡线拉动"),
-        PLANNED_PULL(40, "计划拉动");
+        PLANNED_PULL(40, "计划拉动"),
+        ANDON_PULL(50, "安灯拉动"),
+        EXTERNAL_PULL(60, "手工拉动");
 
         private int value;
         private String description;
@@ -4551,6 +4563,53 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 尾数计算方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAIL_QTY_MODE {
+        NONE(1, "不处理"),
+        ORIGIN_NUMBER(10, "原数值"),
+        UP_ROUND(20, "向上取整"),
+        DOWN_ROUND(30, "向下取整");
+
+        private int value;
+        private String description;
+
+        TAIL_QTY_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TAIL_QTY_MODE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 收货看板状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5178,13 +5237,14 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  插件类型 10-PDA插件，20-交易处理插件
+     *  插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLUGIN_TYPE {
         PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"),
-        TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件");
+        BTN_PLUGIN(20, "BTN_PLUGIN", "按钮增强插件"),
+        TRANS_PLUGIN(30, "TRANS_PLUGIN", "交易处理插件");
 
         private int value;
         private String code;
@@ -5300,4 +5360,550 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     *  波次合并规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_RULE {
+        IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10,
+                0, "isSameCustomer", "同客户"),
+        IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10,
+                0, "isSameWareHouse", "同仓库"),
+        IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10,
+                0, "isSamePriority", "同优先级"),
+        IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10,
+                0, "isSameSrcZone", "同来源存储区"),
+        IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10,
+                0, "isSameDestZone", "同目标存储区"),
+        IS_SAME_PART("同物料", "isSamePart", "2", 10,
+                0, "isSamePart", "同物料"),
+        IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10,
+                0, "isSamePartGroup", "同物料组"),
+        IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10,
+                0, "isSameDeliveryTime", "同发货时间"),
+        IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10,
+                0, "isSameBusiType", "同业务类型"),
+        IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10,
+                0, "isSameOrderStatus", "同单据状态"),
+        IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10,
+                0, "isCrossArea", "允许跨区"),
+        IS_COLLECTION("物料整箱归集", "isCollection", "2", 10,
+                0, "isCollection", "物料整箱归集");
+
+        private String fieldChName;
+
+        private String fieldEnName;
+
+        private int mergeOperatorType;
+
+        private String fieldValue;
+
+        private int value;
+
+        private String code;
+
+        private String description;
+
+        WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value,
+                        String code, String description) {
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
+            this.fieldValue = fieldValue;
+            this.mergeOperatorType = mergeOperatorType;
+            this.value = value;
+            this.description = description;
+            this.code = code;
+        }
+
+        public String getFieldChName() {
+            return fieldChName;
+        }
+
+        public String getFieldEnName() {
+            return fieldEnName;
+        }
+
+        public String getFieldValue() {
+            return fieldValue;
+        }
+
+        public int getMergeOperatorType() {
+            return mergeOperatorType;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
+    /**
+     *  波次合并规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_RANGE {
+        CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
+                "custNo,custName", "custNo,custName", "custNo",
+                20, "", "custNo", 0, "客户代码"),
+        WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+                "code,name", "code,name", "code",
+                20, "", "srcWhNo", 0, "仓库代码"),
+        PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
+                "", "", 20, "",
+                "priority", 0, "优先级"),
+        SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
+                20, "", "srcZoneNo", 0, "来源存储区代码"),
+        DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
+                20, "", "destZoneNo", 0, "目标存储区代码"),
+        PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+                "partNo,partName", "partNo", "partNo",
+                20, "", "partNo", 0, "物料号"),
+        PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
+                "partGroupNo,partGroupName", "partGroupNo",
+                "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"),
+        BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
+                "", "", 20, "", "busiType", 0, "业务类型"),
+        ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "",
+                "", "", 20, "", "orderStatus", 0, "单据状态");
+
+        // 中文名称
+        String fieldChName;
+        // 英文名称
+        String fieldEnName;
+        // 下拉枚举名称
+        String entityName;
+        // 下拉列表显示列名称,多个列名需要根据逗号分隔
+        String listColumnName;
+        // 下拉搜索列名称,多个列名需要根据逗号分隔
+        String searchColumnName;
+        // 回显列名
+        String explicitColumnName;
+        // 合并操作类型
+        private int mergeOperatorType;
+
+        private String fieldValue;
+
+        private int value;
+
+        private String code;
+
+        private String description;
+
+        WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName,
+                         String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue,
+                         String code, int value, String description) {
+            this.fieldChName = fieldChName;
+            this.fieldEnName = fieldEnName;
+            this.entityName = entityName;
+            this.listColumnName = listColumnName;
+            this.searchColumnName = searchColumnName;
+            this.explicitColumnName = explicitColumnName;
+            this.mergeOperatorType = mergeOperatorType;
+            this.fieldValue = fieldValue;
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getFieldEnName() {
+            return fieldEnName;
+        }
+
+        public String getFieldChName() {
+            return fieldChName;
+        }
+
+        public String getEntityName() {
+            return entityName;
+        }
+
+        public String getListColumnName() {
+            return listColumnName;
+        }
+
+        public String getSearchColumnName() {
+            return searchColumnName;
+        }
+
+        public String getExplicitColumnName() {
+            return explicitColumnName;
+        }
+
+        public int getMergeOperatorType() {
+            return mergeOperatorType;
+        }
+
+        public String getFieldValue() {
+            return fieldValue;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return "description";
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
+    /**
+     *  插件类型 10-合并规则，20-合并范围
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WAVE_MERGE_TYPE {
+        WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"),
+        WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WAVE_MERGE_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 WAVE_MERGE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 存储区-补货方式
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ZONE_PULL_WAY {
+        JOB_CYCLE(10, "JOB周期"),
+        FIXED_CYCLE(20, "固定周期");
+
+        private int value;
+        private String description;
+
+        ZONE_PULL_WAY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static ZONE_PULL_WAY codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 拉动任务-任务类型
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_TASK_TYPE {
+        NORMAL_PULL(10, "普通拉动"),
+        GROUP_PULL(20, "组合拉动");
+
+        private int value;
+        private String description;
+
+        PULL_TASK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PULL_TASK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 道口预约订单状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_ORDER_STATUS {
+        WAIT_SEND(10, "待送货"),
+        ARRIVED(20, "已到达"),
+        RECEIVED(30, "已收货"),
+        CANCELED(40, "已取消");
+
+        private int value;
+        private String description;
+
+        DOCK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_ORDER_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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 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 DOCK_APPOINTMENT_STATUS {
+        WAIT_SEND(10, "待送货"),
+        HAS_SENDED(20, "已送达"),
+        RECEIVING(30, "收货中"),
+        COMPLETED(40, "已完成"),
+        OVERTIME(50, "供货超时");
+
+        private int value;
+        private String description;
+
+        DOCK_APPOINTMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_APPOINTMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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 QAD_DOC_TYPE {
+        TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
+
+        private int value;
+        private String code;
+        private String description;
+
+        public String getCode() {
+            return code;
+        }
+
+        QAD_DOC_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 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;
+        }
+    }
+
+
+    /**
+     * 业务场景Supplier
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BUSI_SCENE_TYPE {
+        YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"),
+        TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"),
+        ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"),
+        SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"),
+        CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提");
+        private int value;
+        private String code;
+        private String description;
+
+        BUSI_SCENE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BUSI_SCENE_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java

@@ -6,6 +6,7 @@ import com.mongodb.Block;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Sorts;
+import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -14,6 +15,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -248,6 +250,25 @@ public class BsonPackTool {
     }
 
     /**
+     * 查询方位分装
+     * @param columnName    列名称
+     * @param bson
+     * @param startTime     开始值
+     * @param endTime       结束之
+     * @return
+     */
+    public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) {
+        if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){
+            bson = Filters.and(
+                    bson,
+                    Filters.gte(columnName, startTime),  //大于等于开始日期
+                    Filters.lte(columnName, endTime)     //小于等于结束日期
+            );
+        }
+        return bson;
+    }
+
+    /**
      * 大于日期
      * @param dateTime 日期
      * @param columnName HQL里对应的时间字段

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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/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);
 
@@ -383,4 +387,33 @@ public final class FormHqlPack {
         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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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/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/pom.xml

@@ -5,13 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -19,6 +20,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/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/MesDataWarning.java

@@ -0,0 +1,63 @@
+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: wangjie
+ * @CreateDate: 2020/04/03 7:12 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_WARNING")
+@Api("数据预警配置")
+public class MesDataWarning extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8328008752104417017L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "WARNING_RULE")
+    @ApiParam("预警规则")
+    private String warningRule;
+
+    @Column(name = "CHECK_TIME")
+    @ApiParam("校验时间")
+    private String checkTime;
+
+    @Column(name = "QTY")
+    @ApiParam("数据量最大限制(分钟)")
+    private Integer qty;
+
+    @Column(name = "WARNING_ITEM")
+    @ApiParam("预警内容项")
+    private String warningItem;
+
+    @Column(name = "INFORM_MODE")
+    @ApiParam("通知方式")
+    private Integer informMode;
+
+    @Lob
+    @Column(name = "INFORM_USER")
+    @ApiParam("通知对象")
+    private String informUser;
+
+}

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

@@ -55,9 +55,9 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("数据下限")
     private Double lowerLimit;
 
-    @Column(name = "TERMINAL_ID")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工位")
-    private Integer terminalId;
+    private String workCellCode;
 
     @Column(name = "TORQUE_GROUP")
     @ApiParam("扭矩组")
@@ -79,6 +79,10 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("JOB_ID")
     private Integer jobId;
 
+    @Column(name = "LAST_TIGHTENING_ID")
+    @ApiParam("最后一次扭矩id")
+    private Long lastTighteningId;
+
     @Transient
     @ApiParam("扭矩值")
     private Double torqueValue;

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
 })
-@Api("包装规格")
+@Api("包装表")
 public class MesPackage extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5275923991324889995L;
 
@@ -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

@@ -53,7 +53,7 @@ public class MesPartCheck extends BaseBean implements Serializable {
     private String recordNumSpelExpress;
 
     @Column(name = "RECORD_NUM_DESC")
-    @ApiParam("校验表达式")
+    @ApiParam("校验表达式描述")
     private String recordNumDesc;
 
 }

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

@@ -132,4 +132,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @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/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/MesQueueJitActual.java

@@ -33,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;

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;
 
 /**
@@ -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;
@@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @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/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/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,87 @@
+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;
+
+/**
+ * @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 = "TRIGGER_AMG_ID")
+    @ApiParam("触发调用")
+    private Long triggerAmgId;
+
+    @Column(name = "IN_AMG_ID")
+    @ApiParam("进入调用")
+    private Long inAmgId;
+
+    @Column(name = "OUT_AMG_ID")
+    @ApiParam("离开调用")
+    private Long outAmgId;
+
+    @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0")
+    @ApiParam("状态类型 10=初始化状态")
+    private Integer statusType;
+
+    @Transient
+    @ApiParam("状态点是否完成")
+    private boolean isComplete;
+
+    @Transient
+    @ApiParam("状态点是否完成")
+    private boolean isJump;
+
+    @Transient
+    @ApiParam("前端显示颜色")
+    private String color;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.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_STEP_GROUP")
+@Api("工步集")
+public class MesStepGroup extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1876053661752102998L;
+
+    @Column(name = "AMG_ID")
+    @ApiParam("组件集编号")
+    private Long amgId;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("组件集代码")
+    private String stepCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("执行顺序")
+    private Integer seq;
+}

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/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/model/ActorMessageModel.java

@@ -30,7 +30,7 @@ public class ActorMessageModel {
     }
 
     public static ActorMessageModel getFailure() {
-        return new ActorMessageModel(true, null);
+        return new ActorMessageModel(false, null);
     }
 
     public static ActorMessageModel getSuccess(Object data) {

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

@@ -24,12 +24,31 @@ public class ButtonDynamicModel {
     @ApiParam("按钮代码")
     private String buttonCode;
 
-    @ApiParam("调用类")
-    private String callClass;
+    @ApiParam("回调界面方法")
+    private String windowModuleBack;
 
-    public ButtonDynamicModel(Long id, String buttonName, String buttonCode) {
+    @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/CellFeedModel.java

@@ -18,8 +18,16 @@ public class CellFeedModel {
 
     private String partNo;
 
+    private String partName;
+
     private String itemPartNo;
 
-    private String qty;
+    private String itemPartName;
+
+    private String shouldQty;
+
+    private String remainQty;
+
+    private String scanQty;
 
 }

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

@@ -3,12 +3,14 @@ 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:
@@ -20,7 +22,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @ElasticSearch
-public class EsProductData extends BaseBean implements Serializable {
+public class EsProductDataModule extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 4514407617515827040L;
 
@@ -80,7 +82,7 @@ public class EsProductData extends BaseBean implements Serializable {
 
     @Json4Es
     @ApiParam("生产数据")
-    private String lineData;
+    private ArrayList<ProductDataModel> lineData;
 
     @ApiParam("字段总数")
     private Integer fieldNum;

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/30 22:18
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FsmStatusModel {
+
+    private String from;
+
+    private String to;
+
+    private String event;
+
+    private Object context;
+
+    private String status;
+
+}

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

@@ -34,6 +34,24 @@ public class GenSerialNoModel {
     @ApiParam("客户代码")
     private String custCode;
 
+    @ApiParam("年")
+    private String year;
+
+    @ApiParam("月")
+    private String month;
+
+    @ApiParam("日")
+    private String day;
+
+    @ApiParam("时")
+    private String hour;
+
+    @ApiParam("分")
+    private String minute;
+
+    @ApiParam("秒")
+    private String second;
+
     @ApiParam("过程条码")
     private String serialNumber;
 

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesTooling;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : MES_设备工装关系Model
+ * @Reference :
+ * @Author :qianhuasheng
+ * @CreateDate : 2020-04-02 16:34
+ * @Modify:
+ **/
+@Data
+@Api("MES_设备工装关系Model")
+public class MesEquipmentToolingModel implements Serializable {
+
+    private static final long serialVersionUID = 1947971352179107711L;
+
+    private Long id;
+
+    @ApiParam("显示颜色")
+    private String color;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("工装编号")
+    private String toolingNo;
+
+    @ApiParam("工装代码")
+    private String toolingCode ;
+
+    @ApiParam("工装名称")
+    private String toolingName;
+
+    @ApiParam("工装类型")
+    private Integer toolingType;
+
+    @ApiParam("使用次数")
+    private Integer useCount;
+
+    @ApiParam("更换开始时间")
+    private String startTime;
+
+    @ApiParam("更换结束时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("最大次数")
+    private Integer useCountMax;
+
+    public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) {
+        this.toolingCode = tooling.getToolingCode();
+        this.toolingName = tooling.getToolingName();
+        this.useCount = useCount;
+        this.useCountMax = tooling.getUseCountMax();
+    }
+    public MesEquipmentToolingModel() {
+    }
+}

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/NotifyUserModel.java

@@ -29,7 +29,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("用户信息model")
-public class EquTaskNotifyUserModel extends BaseBean {
+public class NotifyUserModel extends BaseBean {
 
     @ApiParam(value ="账户ID")
     private Long userInfoId;

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
 import java.io.Serializable;
 
@@ -66,6 +67,17 @@ public class QueueOrderModel implements Serializable {
     private Integer groupNo;
     @ApiParam("产品配置代码")
     private String prodCfgCode;
+    @ApiParam("是否已扫描")
+    private int isScan;
+
+    @ApiParam("队列编号")
+    private String orderNo;
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
+
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品类型名称")
+    private String pptCode;
 
     public QueueOrderModel() {
     }
@@ -85,7 +97,7 @@ public class QueueOrderModel implements Serializable {
     }
 
     public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -97,8 +109,8 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.snStatus = snStatus;
         this.workType = workType;
-        this.finsihQty=finsihQty;
-        this.qty=qty;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
     }
 
     public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@@ -116,12 +128,110 @@ public class QueueOrderModel implements Serializable {
         this.workType = workType;
     }
 
-    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snStatus = snStatus;
+        this.workType = workType;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
+    }
+
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.snStatus = snStatus;
+        this.workType = workType;
+        this.orderNo = orderNo;
+    }
+
+    public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
         this.prodCfgCode = prodCfgCode;
+        this.isGroupPrinted = isGroupPrinted;
+    }
+
+    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) {
+        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;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
+    }
+
+    //getWaitQueueOrderModelNoSn
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) {
+        this.serialNumber = serialNumber;
+        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;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
+        this.pptCode=pptCode;
+    }
+    //getAlreadyQueueOrderModelNoSn
+    public QueueOrderModel(String serialNumber,String orderNo, 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;
+        this.orderNo = orderNo;
+        this.serialNumber=serialNumber;
+    }
+
+    //料架分组队列展示组件
+    public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
+                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+        this.queueGroupNo = queueGroupNo;
+        this.groupNo = groupNo;
+        this.orderNo = orderNo;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.organizeCode = organizeCode;
     }
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : JIT发运队列列表Model
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-05-22 16:34
+ * @Modify:
+ **/
+@Data
+@Api("JIT发运队列列表Model")
+public class QueueShippingModel implements Serializable {
+    private Long id;
+
+    @ApiParam("显示颜色")
+    private String color;
+
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @ApiParam("产品位置")
+    private String prodCfgName;
+
+    @ApiParam("起始vin")
+    private String vin;
+
+    @ApiParam("结束vin")
+    private String endVin;
+
+    @ApiParam("料架号")
+    private String queueGroupNo;
+
+}

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

@@ -1,11 +1,15 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus;
+import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -60,11 +64,20 @@ public class StationRequestBean implements Serializable {
     @ApiParam("按钮编号")
     private String buttonCode;
 
+    @ApiParam("状态代码")
+    private String statusCode;
+
     @ApiParam("工步代码")
     private String stepCode;
 
+    @ApiParam("工步序号")
+    private Integer stepSeq;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
+
+    @ApiParam("强制执行状态点代码")
+    private String forceSpecStatusCode;
     /**
      * doScan-扫描，doModule-处理组件,initModule-初始化组件
      */
@@ -95,8 +108,20 @@ public class StationRequestBean implements Serializable {
     @ApiParam("生产主队列编号")
     private String orderNo;
 
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
     @ApiParam("数据map")
-    private Map<String, Object> dataMap;
+    private Map<String, Object> dataMap = new HashMap<>();
+
+    @ApiParam("流程状态集合")
+    private List<MesStateMachineStatus> fsmStates;
+
+    @ApiParam("当前流程状态")
+    private MesStateMachineStatus curFsmState;
+
+    @ApiParam("展示组件")
+    private Object moduleService;
 
     @Override
     public String toString() {

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/31 18:41
+ * @desc
+ */
+@Data
+public class StationRequestCmdBean {
+
+    private StationRequestBean requestBean;
+
+    private MesPcnEnumUtil.STATION_REQUEST_BEAN_CMD cmd;
+}

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

@@ -18,12 +18,18 @@ public class StepDispatchModel {
 
     private String cellParamKey;
 
+    private String requestBeanKey;
+
+    private String moduleDataMapKey;
+
     private String scanInfo;
 
-    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) {
+    public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
         this.stepListKey = stepListKey;
         this.firstScanKey = firstScanKey;
         this.cellParamKey = cellParamKey;
+        this.requestBeanKey = requestBeanKey;
+        this.moduleDataMapKey = moduleDataMapKey;
         this.scanInfo = scanInfo;
     }
 }

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

@@ -66,11 +66,13 @@ public class StepModel implements Serializable {
      */
     @ApiParam("工步是否跳过")
     private boolean isJump;
+
     /**
      * 参数代码
      */
     @ApiParam("参数代码")
     private String paramCode;
+
     /**
      * 工作单元代码
      */

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

@@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
+
 /**
  * @Description: 打印条码工步， 打印信息模板
  * @Reference:
@@ -18,6 +20,9 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("打印描述")
     private String printDesc;
 
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
     @ApiParam("条码")
     private String barCode;
 
@@ -91,5 +96,9 @@ public class StepPrintSnModel extends MesProduceSn {
     private String jitCarNo;
     @ApiParam("车型代码")
     private String carModuleCode;
+    @ApiParam("上一个序列号")
+    private Double lastQueDetailSeq;
+    @ApiParam("包装数量")
+    private Integer pgCodeNum;
 
 }

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

@@ -18,26 +18,52 @@ public class StepResult<T> {
 
     private String msg;
 
-    public static StepResult getSuccessComplete() {
-        return new StepResult(true,"");
-    }
+    private StationRequestBean stationRequestBean;
 
     public static StepResult getNonComplete() {
-        return new StepResult(false,"");
+        return new StepResult(false, "");
     }
 
-    public static StepResult getSuccessComplete(String msg) {
-        return new StepResult(true, msg);
+    public static StepResult getNonComplete(StationRequestBean requestBean) {
+        return new StepResult(false, "");
+    }
+
+    public static <T> StepResult getNonCompleteData(T data, String msg) {
+        return new StepResult(false, data, msg);
+    }
+
+    public static <T> StepResult getNonCompleteReqBean(StationRequestBean reqBean) {
+        return new StepResult(false, reqBean);
+    }
+
+    public static <T> StepResult getNonCompleteData(T data) {
+        return new StepResult(false, data, "");
     }
 
     public static StepResult getNonComplete(String msg) {
         return new StepResult(false, msg);
     }
 
+    public static StepResult getSuccessComplete(String msg) {
+        return new StepResult(true, msg);
+    }
+
+    public static StepResult getSuccessComplete() {
+        return new StepResult(true, "");
+    }
+
+    public static <T> StepResult getSuccessCompleteReqBean(StationRequestBean reqBean) {
+        return new StepResult(true, reqBean);
+    }
+
     public static <T> StepResult<T> getSuccessData(T data, String msg) {
         return new StepResult<>(true, data, msg);
     }
 
+    public static <T> StepResult<T> getSuccessData(T data) {
+        return new StepResult<>(true, data, "");
+    }
+
     public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
         return new StepResult<T>(true, data, msg);
     }
@@ -54,6 +80,12 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+
+    public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) {
+        this.isCompleted = isCompleted;
+        this.stationRequestBean = stationRequestBean;
+    }
+
     public StepResult(boolean isCompleted, T data, String msg) {
         this.isCompleted = isCompleted;
         this.data = data;
@@ -66,4 +98,11 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+    public StepResult(boolean isCompleted, T data, Collection<T> dataCollection, String msg, StationRequestBean stationRequestBean) {
+        this.isCompleted = isCompleted;
+        this.data = data;
+        this.dataCollection = dataCollection;
+        this.msg = msg;
+        this.stationRequestBean = stationRequestBean;
+    }
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfQueueShipping;
+
+/**
+ * @Description :IF_JIT发运数据
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface IfQueueShippingRepository extends BaseRepository<IfQueueShipping, Long> {
+}

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

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

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate:2019\10\9
+ * @Modify:
+ **/
+public interface MesStateMachineStatusRepository extends BaseRepository<MesStateMachineStatus, Long> {
+}

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

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

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

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

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPointGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站分组队列
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointGroupRepository extends BaseRepository<MesWorkCellPointGroup, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1079,6 +1079,9 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
+        if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
         }
@@ -2172,9 +2175,15 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) {
             DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean);
         }
+        if (!StringUtils.isEmpty(monitorTaskDetail.getStoreObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getStoreObjectCode(), "storeObjectCode", packBean);
+        }
         if (monitorTaskDetail.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean);
         }
+        if (monitorTaskDetail.getCollectType() != null) {
+            DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getCollectType(), "collectType", packBean);
+        }
         return packBean;
     }
 
@@ -2237,4 +2246,70 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 界面组件配置
+     * @param windowModule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
+        if(!StringUtils.isEmpty(windowModule.getWindowNo())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModule.getModuleCode())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 界面组件参数配置
+     * @param windowModuleParam
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
+        if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 数据预警配置
+     * @param dataWarning
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
+        if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
+            DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
+        }
+        if(!StringUtils.isEmpty(dataWarning.getInformMode())){
+            DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -60,6 +60,37 @@
         </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-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 表单操作数据模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-02 10:22
+ * @Modify:
+ **/
+@Data
+@ApiModel("表单操作数据模型")
+@NoArgsConstructor
+public class FormOperateDataModel {
+
+    @ApiModelProperty("元素代码")
+    private Long refId;
+
+    @ApiModelProperty("元素名称")
+    private String refName;
+
+    @ApiModelProperty("操作来源")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TRIGGER_SOURCE.class)
+    private String triggerSource;
+
+    @ApiModelProperty("来源名称")
+    private String sourceName;
+
+    @ApiModelProperty("操作数据集合")
+    private List<Map<String,String>> operateDataList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 缺失资源
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-01 09:31
+ * @Modify:
+ **/
+@Data
+public class MissResourceModel implements Serializable {
+
+    private static final long serialVersionUID = 677360677490162891L;
+
+    @ApiParam(value = "主键")
+    @AnnoOutputColumn
+    private String key;
+
+    @ApiParam(value = "产品类型", example = "0", access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, required = false)
+    private Integer softType;
+
+    @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class)
+    @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
+    private Integer resourceType;
+
+    @ApiParam(value = "语言编码", example = "浏览器语言编码")
+    @AnnoOutputColumn
+    private String languageCode;
+
+    @ApiParam(value = "资源KEY")
+    @AnnoOutputColumn
+    private String resourceKey;
+
+    @ApiParam(value = "资源Value")
+    @AnnoOutputColumn
+    private String resourceValue;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class)
+    private Integer resourceSource;
+
+    @ApiParam(value = "数据来源")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class)
+    private Integer isValid;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.report;
+
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+import cn.estsh.i3plus.pojo.report.bean.BrLayout;
+import cn.estsh.i3plus.pojo.report.bean.BrRefReport;
+import cn.estsh.i3plus.pojo.report.bean.BrReport;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-3-24 下午3:28
+ * @Modify:
+ **/
+@Data
+public class BrDynamicPageModel {
+
+    @ApiParam(value ="报表信息")
+    private BrReport report;
+
+    @ApiParam(value ="布局信息")
+    private BrLayout layout;
+
+    @ApiParam(value = "报表排版关系")
+    private List<BrRefReport> refReportList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<BrElement> elementList;
+
+    @ApiParam(value ="页面元素内容")
+    private List<TemplateModel> templateModelList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java

@@ -70,7 +70,7 @@ public class TemplateModel implements Serializable {
     private List<Map<String, Object>> rows;
 
     @ApiParam(value = "跨服务调用解析后数据")
-    private Object option;
+    private String option;
 
     @ApiParam(value = "分页参数")
     private Pager pager;

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -1,12 +1,15 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 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;
@@ -43,6 +46,7 @@ public class SysConfig extends BaseBean {
     // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
     @Column(name="CONFIG_GROUP")
     @ApiParam(value ="参数组")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.SYS_CONFIG_GROUP.class)
     private Integer configGroup;
 
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板内容")
     private String templateContent;
 
+    @Lob
+    @Column(name="OTHER_TEMPLATE_CONTENT")
+    @ApiParam(value ="其他模板内容")
+    private String otherTemplateContent;
+
     // 参数拼接，多参数都好分隔，后台在做处理
     @Transient
     @ApiParam(value ="模板参数拼接")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -56,6 +56,7 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "语言名称",example = "浏览器语言名称")
     private String languageNameRdd;
 
+    @Lob
     @Column(name="resource_key")
     @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
     @AnnoOutputColumn
@@ -82,4 +83,11 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "是否系统参数",example = "2")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isSystem;
+
+    /**
+     * 检索条件
+     */
+    @Transient
+    private String resourceTypes;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -54,6 +54,10 @@ public class SysLogOperate extends BaseBean {
     @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
     private Integer operateType;
 
+    public String getOperateTypeName(){
+        return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType);
+    }
+
     @Column(name="OPERATE_MESSAGE")
     @ApiParam(value ="操作信息" , access ="操作信息")
     private String operateMessage;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -91,4 +91,5 @@ public class SysLogSystem extends BaseBean {
     @ApiParam(value ="执行耗时")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long executeTime;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java

@@ -1,116 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.sqlpack;
-
-import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
-import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-import com.mongodb.BasicDBObject;
-import org.bson.conversions.Bson;
-
-/**
- * @Description : Bson对象封装
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2018-11-08 13:15
- * @Modify:
- **/
-public class CoreBsonPack {
-
-    /**
-     * 日志复杂查询
-     *
-     * @param logSystem
-     * @return
-     */
-    public static Bson packBsonByLogSystem(SysLogSystem logSystem) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
-        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson);
-
-        return bson;
-    }
-
-    /**
-     * 系统操作日志
-     *
-     * @param logOperate
-     * @return
-     */
-    public static Bson packBsonByLogOperate(SysLogOperate logOperate) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
-        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
-
-        return bson;
-    }
-
-    /**
-     * 系统异常日志复杂查询
-     *
-     * @param sysLogException
-     * @return
-     */
-    public static Bson packBsonBySysLogException(SysLogException sysLogException) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
-        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false);
-
-        return bson;
-    }
-
-    /**
-     * 定时任务日志复杂查询
-     *
-     * @param sysLogTaskTime
-     * @return
-     */
-    public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
-        bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false);
-
-        return bson;
-    }
-
-    /**
-     * 区间
-     *
-     * @param colName
-     * @param min
-     * @param max
-     * @return
-     */
-    public static Bson packBsonByInterval(String colName, Object min, Object max) {
-        Bson bson = new BasicDBObject();
-
-        bson = BsonPackTool.getNumBiggerPack(min, colName, bson);
-        bson = BsonPackTool.getNumSmallerPack(max, colName, bson);
-
-        return bson;
-    }
-
-    /**
-     * 指定日期之后
-     * @param dateTime 日期
-     * @return
-     */
-    public static Bson packBsonByDateTimeAfter(String dateTime){
-        return BsonPackTool.timeLess(dateTime, "createDatetime", null, true);
-    }
-}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
-import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
-import cn.estsh.i3plus.pojo.platform.bean.SysFile;
-import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
-import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
-import cn.estsh.i3plus.pojo.platform.bean.SysRole;
-import cn.estsh.i3plus.pojo.platform.bean.SysTask;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
-import cn.estsh.i3plus.pojo.platform.bean.SysTool;
-import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +20,10 @@ import java.util.stream.Collectors;
  **/
 public class CoreHqlPack {
 
+    private CoreHqlPack() {
+        throw new IllegalStateException("Utility class");
+    }
+
     /**
      * In 参数封装
      * @param columnName
@@ -81,6 +63,11 @@ public class CoreHqlPack {
 
         if(resource != null){
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            // 是否多类型查询
+            if(StringUtils.isNotBlank(resource.getResourceTypes())){
+                DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
+            }
+
             DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
             DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
@@ -319,18 +306,19 @@ public class CoreHqlPack {
      * @param config
      * @return
      */
-    public static String packHqlSysConfig(SysConfig config) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean   packHqlSysConfig(SysConfig config) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(config.getName(),"name",result);
-        HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
-        HqlPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
+        DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(config);
+        DdlPreparedPack.getOrderDefault(config);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -350,7 +338,8 @@ public class CoreHqlPack {
             DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
         }
         DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
-        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
+        DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result);
+        DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
 
         // 添加默认排序
         DdlPreparedPack.getOrderDefault(dictionary);
@@ -420,7 +409,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
 
-        ddlPackBean.setOrderByStr(message.orderBy());
+        DdlPreparedPack.getOrderDefault(message);
 
         return  ddlPackBean;
     }
@@ -430,19 +419,21 @@ public class CoreHqlPack {
      * @param file
      * @return
      */
-    public static String packHqlSysFile(SysFile file) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysFile(SysFile file) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
-        HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
-        HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
-        HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
+        DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result);
+        DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result);
+        DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result);
+        DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
+        DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(file);
+        DdlPreparedPack.getOrderDefault(file);
 
-        return  result.toString();
+        return  result;
     }
 
     /**
@@ -468,20 +459,22 @@ public class CoreHqlPack {
      * @param sysTaskPlan
      * @return
      */
-    public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         // hql拼接
-        HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
-        HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
-        HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
-        HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
+        DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
+        DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);
 
         // 添加默认排序
-        HqlPack.getOrderDefault(sysTaskPlan);
+        DdlPreparedPack.getOrderDefault(sysTaskPlan);
 
-        return  result.toString();
+        return  result;
     }
 
     /**
@@ -630,7 +623,7 @@ public class CoreHqlPack {
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
         HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
 
-        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+        if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){
             HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
         }
 
@@ -653,7 +646,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
         DdlPreparedPack.getInPackList(idList,"id",result);
 
-        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+        if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){
             DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
         }
 
@@ -677,7 +670,7 @@ public class CoreHqlPack {
 
         // And
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
-        if(idList != null && idList.size() > 0){
+        if(idList != null && !idList.isEmpty()){
             HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
         }
 
@@ -751,18 +744,23 @@ public class CoreHqlPack {
      * @param orderNoRule
      * @return
      */
-    public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
 
-        HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
-        HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
-        HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
+        DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+        DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
+        if (orderNoRule.getSerialNo() != null) {
+            DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
+        }
 
         // 添加默认排序
-        HqlPack.getOrderDefault(orderNoRule);
+        DdlPreparedPack.getOrderDefault(orderNoRule);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -792,13 +790,18 @@ public class CoreHqlPack {
      * @param sysTask
      * @return
      */
-    public static String packHqlSysTask(SysTask sysTask){
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlSysTask(SysTask sysTask){
+        DdlPackBean result =  DdlPackBean.getDdlPackBean();
 
-        HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
-        HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
+        DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
+        DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);
 
-        return result.toString();
+        DdlPreparedPack.getOrderDefault(sysTask);
+
+        return result;
     }
 
     public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){
@@ -977,7 +980,7 @@ public class CoreHqlPack {
      */
     public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
-        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
+        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean);
 
         return packBean;
     }

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -19,4 +19,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-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java

@@ -33,6 +33,10 @@ public class PtlMainTask extends BaseBean implements Serializable {
     @ApiParam("主任务编号")
     private String taskNo;
 
+    @Column(name = "ORDER_NO")
+    @ApiParam("业务单号")
+    private String orderNo;
+
     @Column(name = "SEQ")
     @ApiParam("主任务顺序号")
     private Integer seq;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java

@@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "PART_NAME")
-    @ApiParam("产品物料名称")
+    @ApiParam("产品物料号名称")
     private String partName;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("拣选物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("拣选物料名称")
+    private String itemPartName;
+
     @Column(name = "QTY")
     @ApiParam("数量")
     private Integer qty;
@@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable {
     @ApiParam("物料种类")
     private Integer partCategory;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 生产队列主表
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@ApiModel("生产队列主表")
+public class  MesQueueOrder implements Serializable {
+
+    private static final long serialVersionUID = -3124113504001270712L;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("Vin")
+    private String vinCode;
+
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @ApiParam("产品配置名称")
+    private String prodCfgNameRdd;
+
+    @ApiParam("排序")
+    private Double seq;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("工单类型")
+    private String workType;
+
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @ApiParam("生产组代码")
+    private String pgCode;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java

@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 生产队列明细
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@ApiModel("生产队列明细")
+public class MesQueueOrderDetail implements Serializable {
+
+    private static final long serialVersionUID = 1945173626511595078L;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("队列明细序号")
+    private Double seq;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("生产类型")
+    private String workType;
+
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @ApiParam("产品类型名称")
+    private String produceCategoryNameRdd;
+
+    @ApiParam("产品类型名称")
+    private String pptCode;
+
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
+    @ApiParam("料架是否已打印")
+    private Integer isGroupPrinted;
+
+    @ApiParam("已生产数量")
+    private Double finsihQty;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :工位物料清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@ApiModel("工位物料清单")
+public class MesStationBom implements Serializable {
+
+    private static final long serialVersionUID = -2658812944873600461L;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("产品物料名称")
+    private String partName;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam(value = "子零件数量")
+    private Double qty;
+
+    @ApiParam(value = "是否可重复")
+    private Integer isRepeat;
+
+    @ApiParam(value = "是否检查")
+    private Integer isCheck;
+
+    @ApiParam(value = "是否投料配置")
+    private Integer isFeed;
+
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
+    @ApiParam(value = "匹配规则")
+    private Integer matchRule;
+
+    @ApiParam(value = "id")
+    public Long id;
+
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
+}

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -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>