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>
@@ -49,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <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>
@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>
@@ -53,7 +54,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-base/pom.xml

@@ -5,14 +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-base</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -71,7 +71,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
 
 import java.util.List;
 import java.util.Map;
@@ -124,6 +123,23 @@ public class BaseResultBean<Obj> {
         return this;
     }
 
+    public static BaseResultBean success(String msg){
+        BaseResultBean rs =  new BaseResultBean(true);
+        rs.setMsg(msg);
+        return rs;
+    }
+
+    public static BaseResultBean success(){
+        BaseResultBean rs =  new BaseResultBean(true);
+        return rs;
+    }
+
+    public static BaseResultBean fail(String msg){
+        BaseResultBean rs =  new BaseResultBean(false,msg);
+        rs.setErrorMsg(msg);
+        return rs;
+    }
+
     public static BaseResultBean buildBaseResultBean(boolean success, String msg){
         BaseResultBean rs = new BaseResultBean();
         rs.success = success;
@@ -138,6 +154,33 @@ public class BaseResultBean<Obj> {
         return rs;
     }
 
+    public BaseResultBean() {
+    }
+
+    public BaseResultBean(boolean isSuccess) {
+        success = isSuccess;
+        if(success){
+            //国际化
+            code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        }else{
+            code = ResourceEnumUtil.MESSAGE.FAIL.getCode();
+        }
+    }
+
+    public BaseResultBean(boolean success, List<Obj> resultList) {
+        this.success = success;
+        this.resultList = resultList;
+    }
+
+    public BaseResultBean(boolean success, Obj resultObject) {
+        this.success = success;
+        if(resultObject instanceof String){
+            this.msg = resultObject.toString();
+        }else{
+            this.resultObject = resultObject;
+        }
+    }
+
     @Override
     public String toString() {
         return "BaseResultBean{" +

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

@@ -1158,7 +1158,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleAdd(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1175,7 +1175,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleLess(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1192,7 +1192,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleMake(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1209,7 +1209,7 @@ public class BlockFormEnumUtil {
 
         private Double getPropertyVirtualDoubleDivision(Object ... objs){
             if(objs != null && objs.length > 0){
-                Double result = new Double(0);
+                Double result = Double.valueOf(0);
                 for (Object o : objs) {
                     try {
                         if(o != null){
@@ -1235,7 +1235,8 @@ public class BlockFormEnumUtil {
         SQL(10, "SQL", "SQL脚本"),
         CLASS_METHOD(20, "ClassMethod", "类方法"),
         SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
-        SCRIPT(40, "Script", "脚本");
+        SCRIPT(40, "Script", "脚本"),
+        URL(50, "URL", "网址");
 
         private int value;
         private String code;
@@ -1668,7 +1669,8 @@ public class BlockFormEnumUtil {
         DIALOG(10, "DIALOG", "弹出窗口"),
         NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"),
         SQL(30, "SQL", "执行SQL"),
-        CLASS_METHOD(40, "CLASS_METHOD", "执行类方法");
+        CLASS_METHOD(40, "CLASS_METHOD", "执行类方法"),
+        URL(50, "URL", "网址");
 
         private int value;
         private String name;
@@ -1928,8 +1930,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ELEMENT_TREE_DIRECTION {
-        horizontal(1, "horizontal", "横向"),
-        vertical(2, "vertical", "竖向");
+        HORIZONTAL(1, "horizontal", "横向"),
+        VERTICAL(2, "vertical", "竖向");
 
         private int value;
         private String code;
@@ -2133,4 +2135,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

@@ -867,4 +867,53 @@ public class BlockSoftSwitchEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 长数据关联数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REF_DATA_TYPE {
+        SUIT_MESSAGE(10, "适配信息"),
+        REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
+        ORIGINAL_MESSAGE(30,  "原始报文"),
+        CONVERTED_MESSAGE(40,  "转换报文");
+
+        private int value;
+        private String description;
+
+        private REF_DATA_TYPE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static REF_DATA_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

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

@@ -38,12 +38,13 @@ public class CommonEnumUtil {
         HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
         LAC(26, 8600, 13, "lac", "连接适配器"),
         ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排程"),
+        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
         CENTER(99, 8000, 1, "icloud-server", "注册中心"),
         SURFACE(98, 0, 0, "i3surface", "对外服务"),
         CLOUD(97, 0, 0, "i3cloud", "微服务"),
         GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
-        CONSOLE(95, 8010, 2, "impp-console", "服务监控台");
+        CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
+        DEV(9999, 0000, 0, "Development", "系统调试");
 
         /**
          * 产品ID
@@ -847,7 +848,8 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CLOUD_APP_STATUS {
         UP(1,"UP" ,"在线"),
-        DOWN(2, "DOWN","断线");
+        DOWN(2, "DOWN","断线"),
+        RESTRICTED(3,"RESTRICTED" ,"受限");
 
         private int value;
         private String code;
@@ -1230,7 +1232,7 @@ public class CommonEnumUtil {
      * 日志记录方式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum  LOG_DETAIL_SHOW_TYPE {
+    public enum LOG_DETAIL_SHOW_TYPE {
         DEBUG(1, "DEBUG"),
         OVER_TIME(2, "记录超时服务"),
         ALL_METHOD(3, "所有服务"),
@@ -1483,6 +1485,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 +1917,262 @@ 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;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DAO_OPERATE_TYPE {
+        INSERT(1, "新增"),
+        DELETE(2, "删除"),
+        UPDATE(3, "修改"),
+        SELECT(4, "查询");
+
+        private int value;
+        private String description;
+
+        private DAO_OPERATE_TYPE(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;
+        }
+    }
+
+    /**
+     * actuator env
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTUATOR_ENV_PATH {
+        PID(1,"PID" ,"PID"),
+        JAVA_VERSION(2, "java.version","jdk版本");
+
+        private int value;
+        private String path;
+        private String description;
+
+        private ACTUATOR_ENV_PATH(int value, String path, String description) {
+            this.value = value;
+            this.path = path;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfPath(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].path;
+                }
+            }
+            return tmp;
+        }
+
+        public static int pathOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String pathOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * actuator env
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTUATOR_METRICS_INFO {
+        UPTIME(1, "/process.uptime", "上线时间"),
+        PROCESS_CPU_USAGE(1, "/process.cpu.usage", "进程CPU使用率"),
+        CPU_COUNT(1, "/system.cpu.count", "CPU数量"),
+        SYSTEM_CPU_USAGE(1, "/system.cpu.usage", "系统CPU使用率"),
+        GC_PAUSE(1, "/jvm.gc.pause", "GC暂停"),
+        THREADS_LIVE(1, "/jvm.threads.live", "实时线程"),
+        THREADS_PEAK(1, "/jvm.threads.peak", "线程峰值"),
+        THREADS_DAEMON(1, "/jvm.threads.daemon", "守护线程"),
+
+        MEMORY_HEAP_MAX(1, "/jvm.memory.max", "area:heap", "堆内存最大空间"),
+        MEMORY_HEAP_USE(1, "/jvm.memory.used", "area:heap", "堆内存使用量"),
+        MEMORY_HEAP_SIZE(1, "/jvm.memory.committed", "area:heap", "堆内存大小"),
+
+        MEMORY_NON_HEAP_MAX(1, "/jvm.memory.max", "area:nonheap", "非堆内存最大空间"),
+        MEMORY_NON_HEAP_USE(1, "/jvm.memory.used", "area:nonheap", "非堆内存"),
+        MEMORY_NON_HEAP_METASPACE(1, "/jvm.memory.used", "area:nonheap,id:Metaspace", "非堆原空间"),
+        MEMORY_NON_HEAP_SIZE(1, "/jvm.memory.committed", "area:nonheap", "非堆大小");
+
+        private int value;
+        private String path;
+        private String tag;
+        private String description;
+
+        private ACTUATOR_METRICS_INFO(int value, String path, String description) {
+            this.value = value;
+            this.path = path;
+            this.description = description;
+        }
+
+        private ACTUATOR_METRICS_INFO(int value, String path, String tag,  String description) {
+            this.value = value;
+            this.path = path;
+            this.tag = tag;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getPath() {
+            return path;
+        }
+        public String getTag() {
+            return tag;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfPath(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].path;
+                }
+            }
+            return tmp;
+        }
+
+        public static int pathOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String pathOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].path.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -11,6 +11,109 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+    /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 排序方式
+     */
+    public 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
@@ -18,7 +121,8 @@ public class MesEnumUtil {
     @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;
@@ -539,7 +643,8 @@ public class MesEnumUtil {
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
-        WC_CHECK("WC_CHECK", "开线检查项");
+        WC_CHECK("WC_CHECK", "开线检查项"),
+        BOARD("BOARD", "看板类型");
 
         private String value;
         private String description;
@@ -1734,7 +1839,8 @@ public class MesEnumUtil {
         MES_PLC(390, "PLC地址清单"),
         MES_PROCESS(400, "工序信息"),
         MES_KPSN_RULE(410, "关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
+        MES_PART_BOM_IMPORT(430, "散件BOM导入");
 
         private int value;
         private String description;
@@ -1811,18 +1917,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;
         }
@@ -3052,7 +3158,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;
@@ -4162,8 +4269,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;
@@ -4598,4 +4705,423 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 容器使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_CONTAINER_STATUS {
+        FREE(10, "空闲"),
+        OCCUPY(20, "占用");
+
+        private int value;
+        private String description;
+
+        MES_CONTAINER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 脚本语言类型
+     * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+     */
+    public enum LANGUAGE_TYPE {
+        GROOVY(1, "Groovy", 10),
+        PYTHON(2, "jython", 20), // "jython" string can not change
+        JS(3, "JavaScript", 30);
+        // 下面这2种语言没人会写，暂不支持
+        //SCALA(40,"scala"),
+        //JRUBY(50,"jruby");
+
+        private int index;
+        private String description;
+        private int value;
+
+        LANGUAGE_TYPE(int index, String description, int value) {
+            this.index = index;
+            this.description = description;
+            this.value = value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public int getIndex() {
+            return this.index;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        // 根据枚举编号获取语言代码
+        public static String getCodeByIndex(Integer index) {
+            for (MesEnumUtil.LANGUAGE_TYPE languageType : MesEnumUtil.LANGUAGE_TYPE.values()) {
+                if (languageType.getValue() == index.intValue()) {
+                    return languageType.getDescription();
+                }
+            }
+
+            return null;
+        }
+    }
+
+
+    /**
+     * 产品特性
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TRAIT {
+        NORMAL(10, "正常件"),
+        FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
+
+        private int value;
+        private String description;
+
+        PART_TRAIT(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;
+        }
+    }
+
+    /**
+     * 配置类型
+     */
+    /**
+     * mes工步类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_CFG_TYPE {
+
+        NORMAL("10", "正常"),
+        SCATTERED("20", "散件");
+
+        private String value;
+        private String description;
+
+        PROD_CFG_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        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].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 配方类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_FORMULA_TYPE {
+        DEVICE_SEMAPHORE(10, "设备信号");
+
+        private int value;
+        private String description;
+
+        PART_FORMULA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_FORMULA_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;
+        }
+    }
+
+    /**
+     * 	作业校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_MODEL {
+        NO_CHECK(10, "不校验"),
+        CHECK(20, "校验设备就绪信号");
+
+        private int value;
+        private String description;
+
+        CHECK_MODEL(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;
+        }
+    }
+
+    /**
+     * 	PLC类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_TYPE {
+        STANDARD(10, "标准"),
+        EQU_OPERATION_SIGNLE(20, "设备作业信号");
+
+        private int value;
+        private String description;
+
+        PLC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	看板类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_TYPE {
+        BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
+
+        private String code;
+        private String description;
+
+        BOARD_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BOARD_TYPE getByCode(String code) {
+            for (BOARD_TYPE boardType : values()) {
+                if (boardType.getCode().equals(code)) {
+                    return boardType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 	看板类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_OBJECT_TYPE {
+        ORGANIZE_CODE("organizeCode", "工厂代码"),
+        AREA_CODE("areaCode", "区域代码"),
+        WORK_CENTER_CODE("workCenterCode", "产线代码");
+
+        private String value;
+        private String description;
+
+        BOARD_OBJECT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BOARD_OBJECT_TYPE getByCode(String code) {
+            for (BOARD_OBJECT_TYPE boardObjectType : values()) {
+                if (boardObjectType.getValue().equals(code)) {
+                    return boardObjectType;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes 员工技能等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SKILL_LEVEL {
+
+        TRAINING("10", "培训中"),
+        QUALIFIED("20", "合格"),
+        GOOD("30", "良好"),
+        CAN_GUIDE_OTHERS("40", "可指导他人");
+
+        private String value;
+        private String description;
+
+        SKILL_LEVEL(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        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].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

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

@@ -13,6 +13,77 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_MODULE_TYPE {
+        MONITOR_MODULE(10, "监听组件"),
+        REVEAL_MODULE(10, "展示组件"),
+        BUTTON_MODULE(30, "按钮组件");
+
+        private int value;
+        private String description;
+
+        WORK_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 监听任务明细-采集数据方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum 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)
@@ -1988,7 +2059,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * MesPartCategory实体对应的categoryType值  条码表条码质量状态
+     * MesPartCategory实体对应的categoryType值
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CATEGORY_TYPE {
@@ -2288,8 +2359,7 @@ public class MesPcnEnumUtil {
         PACKAGE_SCAN(35, "打包扫描"),
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
-        CLOSE(90, "关闭"),
-        ;
+        CLOSE(90, "关闭");
 
         private int value;
         private String description;
@@ -2425,6 +2495,7 @@ public class MesPcnEnumUtil {
     public enum STATION_BUSI_TYPE {
         MESSAGE("message", "返回信息"),
         STEP_LIST("stepList", "工步列表"),
+        STATE_LIST("stateList", "状态列表"),
         STEP_CONTENT("stepContent", "工步内容"),
         MODULE_CONTENT("moduleContent", "组件内容"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
@@ -2651,8 +2722,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;
@@ -3091,7 +3162,7 @@ public class MesPcnEnumUtil {
     }
 
     /**
-         * mes_设备工装类型
+     * mes_设备工装类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum EQUIPMENT_TOOLING_TOOLING_TYPE {
@@ -3234,4 +3305,263 @@ public class MesPcnEnumUtil {
             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_STATE(10, "JUMP_STATE", "跳过状态点"),
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATION_REQUEST_BEAN_CMD(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;
+        }
+    }
+
+
+    /**
+     * 容器使用状态
+     */
+    @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;
+        }
+    }
+
+    /**
+     * 换膜状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DIE_CHANGE_STATUS {
+
+        INITIALIZATION(0, "初始化"),
+        START(1, "开始换模"),
+        COMPLETE(2, "完成换模");
+
+        private int value;
+        private String description;
+
+        DIE_CHANGE_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 LOAD_FSM_ROUTE_TYPE {
+
+        BY_PART("0", "通过物料号加载"),
+        BY_AUTO("1", "自动加载");
+
+        private String value;
+        private String description;
+
+        LOAD_FSM_ROUTE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATUS_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;
+        }
+    }
 }

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

@@ -11,6 +11,214 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class PtlEnumUtil {
 
     /**
+     * 流程状态-触发类型
+     */
+    @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 ROUNT_STATUS_TRIGGER_EVENT {
+        SUCCESS("SUCCESS", "是"),
+        FAILURE("FAILURE", "否");
+
+        private String value;
+        private String description;
+
+        ROUNT_STATUS_TRIGGER_EVENT(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) {
+            for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) {
+                if (triggerEvent.getValue().equals(value)) {
+                    return triggerEvent;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件状态类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATUS_TYPE {
+        START(10, "START", "开始状态"),
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
+
+        private int value;
+        private String code;
+        private String description;
+
+        STATUS_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;
+        }
+    }
+
+    /**
+     * 作业流程类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_ROUTE_TYPE {
+        GEN_TASK(10, "GEN_TASK", "生成任务"),
+        OFF_TAG(20, "OFF_TAG", "灭灯");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_ROUTE_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;
+        }
+    }
+
+    /**
+     * 状态机执行方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_EVENT {
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
+
+        private String value;
+        private String code;
+        private String description;
+
+        ROUTE_EVENT(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public static ROUTE_EVENT getByValue(String value) {
+            for (ROUTE_EVENT routeEvent : values()) {
+                if (routeEvent.getValue().equals(value)) {
+                    return routeEvent;
+                }
+            }
+            return null;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 组件参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_PARAM_TYPE {
+
+        QUALIFIED(10, "number", "数字"),
+        DEFECTED(20, "text", "字符串"),
+        SCRAPED(30, "select", "可选值"),
+        BUTTON(40, "button", "按钮");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ACTION_MODULE_PARAM_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 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)

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.util.StringUtils;
 
+import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
+
 /**
  * @author Wynne.Lu
  * @date 2020/2/12 17:41
@@ -547,23 +549,26 @@ public class PtlPcnEnumUtil {
 
     }
 
+    /**
+     * 状态机执行方法
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteEvent {
-        TRIGGER(10, "trigger", "触发"),
-        ENTRY(20, "entry", "进入状态"),
-        EXIT(30, "exit", "离开状态");
+    public enum ROUTE_EVENT {
+        TRIGGER("10", "trigger", "触发"),
+        ENTRY("20", "entry", "进入状态"),
+        EXIT("30", "exit", "离开状态");
 
-        private int value;
+        private String value;
         private String code;
         private String description;
 
-        RouteEvent(int value, String code, String description) {
+        ROUTE_EVENT(String value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
         }
 
-        public int getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -576,8 +581,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteState {
+    public enum ROUTE_STATE {
         START(10, "START", "开启流程"),
         TERMINATE(20, "TERMINATE", "终止流程"),
         FINISH(30, "FINISH", "结束流程");
@@ -586,7 +594,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteState(int value, String code, String description) {
+        ROUTE_STATE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -605,6 +613,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 标签类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TAG_TYPE {
         BIN_TAG(10, "库位标签"),
@@ -639,15 +650,18 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 流程状态-触发类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TriggerType {
+    public enum TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TriggerType(int value, String description) {
+        TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -661,8 +675,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 作业流程类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RouteType {
+    public enum ACTION_ROUTE_TYPE {
         GEN_TASK(10, "GEN_TASK", "生成任务"),
         OFF_TAG(20, "OFF_TAG", "灭灯");
 
@@ -670,7 +687,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        RouteType(int value, String code, String description) {
+        ACTION_ROUTE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -689,6 +706,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 监听消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_PROCESS_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -732,7 +752,7 @@ public class PtlPcnEnumUtil {
             if (StringUtils.isEmpty(code)) {
                 return null;
             }
-            for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) {
+            for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
                 if (enums.getCode().equals(code)) {
                     return enums;
                 }
@@ -741,6 +761,9 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 界面消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
         CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@@ -794,7 +817,7 @@ public class PtlPcnEnumUtil {
     }
 
     /**
-     * 生成任务actor message type
+     * 任务消息类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GEN_TASK_MESSAGE_TYPE {
@@ -841,8 +864,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket业务类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsBusiType {
+    public enum WS_BUSI_TYPE {
         MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
         INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
 
@@ -850,7 +876,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsBusiType(int value, String code, String description) {
+        WS_BUSI_TYPE(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
@@ -869,8 +895,11 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * websocket消息类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum WsDataType {
+    public enum WS_DATA_TYPE {
         TEXT(10, "TEXT", "正常信息"),
         EXP_TEXT(20, "EXP_TEXT", "异常信息"),
         TABLE(30, "TABLE", "表格");
@@ -879,7 +908,7 @@ public class PtlPcnEnumUtil {
         private String code;
         private String description;
 
-        WsDataType(int value, String code, String description) {
+        WS_DATA_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -898,11 +927,15 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * 组件状态类型
+     */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATUS_TYPE {
         START(10, "START", "开始状态"),
-        FINISH(20, "FINISH", "完成状态"),
-        TERMINATE(30, "TERMINATE", "中断状态");
+        EXECUTING(20, "EXECUTING", "执行中状态"),
+        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(40, "FINISH", "完成状态");
 
         private int value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -21,6 +21,23 @@ import java.util.Map;
 public interface BaseRepository <T, ID extends Serializable> extends JpaRepository<T, ID> {
 
     /**
+     * 清空一级缓存，可能影响service中对象的状态，慎用
+     */
+    void clearSession();
+
+    /**
+     * 清除一级缓存对象，设为游离态
+     * @param t
+     */
+    void detachObject(T t);
+
+    /**
+     * 清除一级缓存集合，设为游离态
+     * @param list
+     */
+    void detachList(List<T> list);
+
+    /**
      * 新增对象<br/>
      * 注意：如果对象id是long，并且为0，则设为
      * 字符串，并且没有赋值，该方法将自动设置为uuid值

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

@@ -48,6 +48,24 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         this.snowflakeIdMaker = snowflakeIdMaker;
     }
 
+    public void clearSession(){
+        entityManager.clear();
+    }
+
+    public void detachObject(T t){
+        entityManager.detach(t);
+    }
+
+    //集合设置为游离态
+    public void detachList(List<T> list){
+        if(list != null){
+            for(T t : list) {
+                //设置对象为游离态
+                entityManager.detach(t);
+            }
+        }
+    }
+
     private void setParameter(Query query, String[] propName, Object[] propValue) {
         String name = null;
         Object value = null;

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>
@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
 
         <dependency>
@@ -50,6 +51,6 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 </project>

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

@@ -46,6 +46,10 @@ public class BfButton extends BaseBean {
         }
     }
 
+    @Column(name = "IS_REQUIRED_DATA")
+    @ApiParam(value = "是必填数据")
+    private Integer isRequiredData;
+
     // 关联表单功能表id
     @Column(name = "METHOD_ID")
     @ApiParam(value = "表单功能id")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -38,10 +40,12 @@ public class BfElementGrid extends BaseBean {
 
     @Column(name = "IS_LINE_SHOW_NUMBER")
     @ApiParam(value = "显示行号")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_NUMBER.class)
     private Integer isLineShowNumber;
 
     @Column(name = "IS_LINE_MULTIPLE")
     @ApiParam(value = "是否单选")
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_PICK.class)
     private Integer isLineMultiple;
 
     @Column(name = "IS_OBJECT_FIND")

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

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.util.List;
@@ -89,6 +88,10 @@ public class BfMenu extends BaseBean {
     @ApiParam(value ="功能名称")
     private String methodNameRdd;
 
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="所属模块")
+    private Integer softType;
+
     @Column(name = "MENU_STATUS")
     @ApiParam(value = "菜单状态")
     private Integer menuStatus;
@@ -96,8 +99,4 @@ public class BfMenu extends BaseBean {
     @Transient
     @ApiParam(value = "菜单子集")
     private List<BfMenu> bfMenuList;
-
-    @Transient
-    @ApiParam(value = "菜单父级")
-    private List<BfMenu> parentBfMenuList;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :按钮功能关系
@@ -61,4 +62,10 @@ public class BfRefButtonMethod extends BaseBean {
     @ApiParam(value ="按钮位置关联名称")
     private String buttonPositionRefNameRdd;
 
+    /**
+     * 关联按钮
+     */
+    @Transient
+    private BfButton bfbutton;
+
 }

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

@@ -39,12 +39,12 @@ public final class FormHqlPack {
      * @param params 参数
      * @return hql
      */
-    public static String packHqlIds(String columnName, Long[] params) {
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlIds(String columnName, Long[] params) {
+        DdlPackBean result =  DdlPackBean.getDdlPackBean();
 
         // 参数数组 [1,2,3] -> "1,2,3"
-        HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
-        return result.toString();
+        DdlPreparedPack.getInPack(StringUtils.join(params, ","), columnName, result);
+        return result;
     }
 
     /**
@@ -69,11 +69,11 @@ public final class FormHqlPack {
      * @param isDeleted 数据状态
      * @return hql
      */
-    public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
-        StringBuffer result =  new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
+    public static DdlPackBean packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
+        DdlPackBean result = FormHqlPack.packHqlIds(columnName, params);
 
-        HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
-        return result.toString();
+        DdlPreparedPack.getNumEqualPack(isDeleted, "isDeleted", result);
+        return result;
     }
 
     /**
@@ -81,13 +81,13 @@ public final class FormHqlPack {
      * @param bfLayout 表单布局
      * @return hql
      */
-    public static String packHqlBfLayout(BfLayout bfLayout) {
-        StringBuffer result =  new StringBuffer();
+    public static DdlPackBean packHqlBfLayout(BfLayout bfLayout) {
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfLayout);
 
-        HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
-        HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result);
+        DdlPreparedPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -95,14 +95,13 @@ public final class FormHqlPack {
      * @param bfLayoutRow 表单布局
      * @return hql
      */
-    public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
+        DdlPackBean result =DdlPackBean.getDdlPackBean(bfLayoutRow);
 
-        HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
-        HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
 
-        result.append(bfLayoutRow.orderBy());
-        return result.toString();
+        return result;
     }
 
     /**
@@ -110,14 +109,13 @@ public final class FormHqlPack {
      * @param bfLayoutColumn 表单布局行
      * @return hql
      */
-    public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bfLayoutColumn);
 
-        HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
-        HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
+        DdlPreparedPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
 
-        result.append(bfLayoutColumn.orderBy());
-        return result.toString();
+        return result;
     }
 
     /**
@@ -126,13 +124,13 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) {
-        DdlPackBean result =  new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMenu);
 
         DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result);
         DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
-        result.setOrderByStr(bfMenu.orderBy());
+        DdlPreparedPack.getNumEqualPack(bfMenu.getSoftType(), "softType", result);
 
         return result;
     }
@@ -143,12 +141,11 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) {
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMethod);
 
         DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
         DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
         DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
-        result.setOrderByStr(bfMethod.orderBy());
 
         return result;
     }
@@ -159,12 +156,11 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetail);
 
         DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfMethodDetail.orderBy());
 
         return ddlPackBean;
     }
@@ -175,13 +171,13 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfIntercept);
 
         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());
 
         return ddlPackBean;
     }
@@ -192,7 +188,7 @@ public final class FormHqlPack {
      * @return 查询条件
      */
     public static DdlPackBean packHqlBfButton(BfButton bfButton){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfButton);
 
         DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean);
@@ -208,7 +204,7 @@ public final class FormHqlPack {
      * @return 查询条件
      */
     public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@@ -222,14 +218,13 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefButtonMethod);
 
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
 
         return ddlPackBean;
     }
@@ -240,11 +235,10 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfRefMethodRole);
 
         DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
-        ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
 
         return ddlPackBean;
     }
@@ -255,7 +249,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean);
@@ -274,7 +268,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
@@ -289,7 +283,7 @@ public final class FormHqlPack {
      * @return
      */
     public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) {
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean);
@@ -304,7 +298,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElement(BfElement bfElement){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean);
@@ -321,9 +315,12 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfDataSource(BfDataSource source){
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(source);
 
         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);
 
@@ -337,7 +334,7 @@ public final class FormHqlPack {
      * @return hql
      */
     public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) {
-        DdlPackBean result =  new DdlPackBean();
+        DdlPackBean result =  DdlPackBean.getDdlPackBean(bfMenu);
 
         DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(
@@ -359,7 +356,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElementConstraint(BfElementConstraint bfElementConstraint){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
 
         DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bfElementConstraint.getElementId(), "elementId", ddlPackBean);
@@ -374,7 +371,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfElementConstraintOnly(BfElementConstraint bfElementConstraint){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfElementConstraint);
 
         DdlPreparedPack.getNumNOEqualPack(bfElementConstraint.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bfElementConstraint.getConstraintName(), "constraintName", ddlPackBean);
@@ -383,4 +380,33 @@ public final class FormHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据对象查询条件拼接
+     * @param bfDataObject
+     * @return
+     */
+    public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfDataObject);
+
+        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 = DdlPackBean.getDdlPackBean(bfCascade);
+
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

modules/i3plus-pojo-hardswitch/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-hardswitch</artifactId>
     <packaging>jar</packaging>
+
     <profiles>
         <profile>
             <id>dev</id>
@@ -42,7 +43,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

modules/i3plus-pojo-ics/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-PROD-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-ics</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:56
+ * @Modify:
+ **/
+@Data
+public class IcsActuatorMetrics {
+
+    private String name;
+    private List<Measurements> measurements;
+    private List<AvailableTags> availableTags;
+
+    @Data
+    @NoArgsConstructor
+    public static class Measurements {
+
+        private String statistic;
+        private Object value;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class AvailableTags {
+
+        private String tag;
+        private List<String> values;
+
+    }
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java

@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 应用信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 17:55
+ * @Modify:
+ **/
+@Data
+@ApiModel("应用信息")
+public class IcsApplication {
+
+    @ApiModelProperty("应用名称")
+    private String appName;
+
+    @ApiModelProperty("实例数量")
+    private Integer totalInstanceNum;
+
+    @ApiModelProperty("在线实例数量")
+    private Integer upInstanceNum;
+
+    public int getUpInstanceNumVal() {
+        return upInstanceNum == null ? 0 : upInstanceNum.intValue();
+    }
+
+
+    public void addUpInstanceNum() {
+        if (upInstanceNum == null) {
+            upInstanceNum = 0;
+        }
+        upInstanceNum++;
+    }
+
+    @ApiModelProperty("下线实例数量")
+    private Integer downInstanceNum;
+
+    public int getDownInstanceNumVal() {
+        return downInstanceNum == null ? 0 : downInstanceNum.intValue();
+    }
+
+    public void addDownInstanceNum() {
+        if (downInstanceNum == null) {
+            downInstanceNum = 0;
+        }
+        downInstanceNum++;
+    }
+
+    @ApiModelProperty("应用状态")
+    private Integer appStatus;
+
+    public String getAppStatusTxt(){
+        return appStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(appStatus);
+    }
+
+    @ApiModelProperty("状态时间戳")
+    private Long statusTimeStamp;
+
+    @ApiModelProperty("状态时间")
+    private String statusTimeStampStr;
+
+    @ApiModelProperty("实例集合")
+    private List<IcsInstance> icsInstanceList;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 18:02
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例信息")
+public class IcsInstance {
+
+    @ApiModelProperty("实例id")
+    private String instanceId;
+
+    @ApiModelProperty("实例状态url")
+    private String instanceStatusUrl;
+
+    @ApiModelProperty("实例状态")
+    private Integer instanceStatus;
+
+    @ApiModelProperty("状态时间戳")
+    private Long statusTimeStamp;
+
+    @ApiModelProperty("状态时间")
+    private String statusTimeStampStr;
+
+    public String getInstanceStatusTxt(){
+        return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
+    }
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例明细
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:52
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例明细")
+public class IcsInstanceDetail {
+
+    @ApiModelProperty("pid")
+    private String pid;
+
+    @ApiModelProperty("正常运行时间")
+    private double uptime;
+
+    @ApiModelProperty("正常运行时间")
+    private String uptimeStr;
+
+    @ApiModelProperty("进程Cpu使用情况")
+    private double processCpuUsage;
+
+    @ApiModelProperty("系统Cpu使用情况")
+    private double systemCpuUsage;
+
+    @ApiModelProperty("CPU数量")
+    private int cpuNum;
+
+    @ApiModelProperty("gc计数")
+    private int gcCount;
+
+    @ApiModelProperty("gc总花费时间")
+    private double gcTotalTimeSpent;
+
+    @ApiModelProperty("gc花费的最长时间")
+    private double gcMaxTimeSpent;
+
+    @ApiModelProperty("监控网址")
+    private String monitorUrl;
+
+    @ApiModelProperty("ApiUrl")
+    private String apiUrl;
+
+    @ApiModelProperty("服务网址")
+    private String serviceUrl;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例堆内存
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例堆内存")
+public class IcsInstanceMemoryHeap {
+
+    @ApiModelProperty("堆使用的内存")
+    private double heapMemoryUsed;
+
+    @ApiModelProperty("堆内存大小")
+    private double heapMemorySize;
+
+    @ApiModelProperty("堆内存最大")
+    private double heapMemoryMax;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :实例堆非内存
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例堆非内存")
+public class IcsInstanceMemoryNonHeap {
+
+    @ApiModelProperty("非堆内存元空间")
+    private double nonHeapMemoryMetaspace;
+
+    @ApiModelProperty("非堆内存使用")
+    private double nonHeapMemoryUsed;
+
+    @ApiModelProperty("非堆内存大小")
+    private double nonHeapMemorySize;
+
+    @ApiModelProperty("非堆内存最大")
+    private double nonHeapMemoryMax;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 实例线程信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-10 16:57
+ * @Modify:
+ **/
+@Data
+@ApiModel("实例线程信息")
+public class IcsInstanceThread {
+
+    @ApiModelProperty("实时线程")
+    private double threadLive;
+
+    @ApiModelProperty("守护线程")
+    private double threadDaemon;
+
+    @ApiModelProperty("线程峰值")
+    private double threadPeakLive;
+
+}

modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java

@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.ics.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 注册中心信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-04-09 10:12
+ * @Modify:
+ **/
+@Data
+@ApiModel("注册中心")
+public class IcsRegist {
+
+    @ApiModelProperty("环境")
+    private String environment;
+
+    @ApiModelProperty("数据中心")
+    private String dataCenter;
+
+    @ApiModelProperty("集群信息")
+    private List<String> clusterInfo;
+
+    @ApiModelProperty("是否低于续订阈值")
+    private Integer isBelowRenewThresold;
+
+    @ApiModelProperty("启用自我保护模式")
+    private Integer selfPreservationModeEnabled;
+
+    @ApiModelProperty("注册中心启动时长")
+    private String upDateTime;
+
+    @ApiModelProperty("租约到期启用")
+    private Integer leaseExpirationEnabled;
+
+    @ApiModelProperty("实例IP")
+    private String instanceIp;
+
+    @ApiModelProperty("实例状态")
+    private String instanceStatus;
+
+    @ApiModelProperty("cpu数量")
+    private Integer cpuNum;
+
+    @ApiModelProperty("总可用内存")
+    private Integer totalAvailMemory;
+
+    @ApiModelProperty("当前的内存使用情况")
+    private Integer currentMemoryUsage;
+
+    @ApiModelProperty("应用数量")
+    private Integer appNum;
+
+    @ApiModelProperty("实例数量")
+    private Integer instanceNum;
+
+    @ApiModelProperty("下线实例数量")
+    private Integer downInstanceNum;
+
+    @ApiModelProperty("应用集合")
+    private List<IcsApplication> icsApplicationList;
+
+}

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,13 +5,15 @@
     <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-jobflow</artifactId>
     <packaging>jar</packaging>
+
+
     <profiles>
         <profile>
             <id>dev</id>
@@ -42,7 +44,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <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>
@@ -49,7 +49,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <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,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-pcn</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -49,7 +50,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <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>
@@ -49,7 +50,7 @@
         </profile>
     </profiles>
     <build>
-        <finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
 </project>

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

@@ -0,0 +1,103 @@
+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 : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_VENDOR")
+@Api("供应商信息")
+public class BasVendor extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592779L;
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    private String vendorDesc;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    private String vendorEmail;
+
+    @Column(name = "IS_ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
+    private Integer isAsn;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam(value = "密码")
+    private String password;
+
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    private String vendorPhone;
+
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    private String decimals;
+
+    //20-承运商
+    @Column(name = "VENDOR_TYPE")
+    private Integer vendorType;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
+    public BasVendor() {
+    }
+
+    public BasVendor(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
+}

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

@@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("特殊批次")
     private String fixLotNo;
 
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam("原材料用量")
+    private String itemQty;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam("原材料单位")
+    private String itemUnit;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
     @Column(name = "ACTION_USER")
     @ApiParam("操作人")
     private String actionUser;
@@ -85,4 +105,20 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "PRODUCE_CATEGORY_CODE")
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
 }

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

@@ -13,7 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description :JIT发运数据同步
@@ -30,62 +29,78 @@ import java.util.Date;
 @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;
+	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 = "VIN_CODE")
+	@ApiParam("vin")
+	private String vinCode;
 
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
+	@Column(name = "CUST_FLAG_NO")
+	@ApiParam("客户标识号")
+	private String custFlagNo;
 
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
+	@Column(name = "PART_NO")
+	@ApiParam("物料号")
+	private String partNo;
 
-    @Column(name = "PART_NAME")
-    @ApiParam("物料名称")
-    private String partName;
+	@Column(name = "PART_NAME")
+	@ApiParam("物料名称")
+	private String partName;
 
-    @Column(name = "PRODUCT_SN")
-    @ApiParam("产品条码")
-    private String productSn;
+	@Column(name = "PRODUCT_SN")
+	@ApiParam("产品条码")
+	private String productSn;
 
-    @Column(name = "QTY")
-    @ApiParam("数量")
-    private Double qty;
+	@Column(name = "QTY")
+	@ApiParam("数量")
+	private Double qty;
 
-    @Column(name = "SUPPLIER_CODE")
-    @ApiParam("操作人")
-    private String supplierCode;
+	@Column(name = "SUPPLIER_CODE")
+	@ApiParam("供应商代码")
+	private String supplierCode;
 
-    @Column(name = "ACTION_DATE_TIME")
-    @ApiParam("操作时间")
-    private Date actionDateTime;
+	@Column(name = "ACTION_USER")
+	@ApiParam("操作人")
+	private String actionUser;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "ACTION_DATE_TIME")
+	@ApiParam("操作时间")
+	private String actionDateTime;
 
-    @Column(name = "SYNC_STATUS")
-    @ApiParam("同步状态")
-    private Integer syncStatus;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("异常消息")
-    private String errorMessage;
+	@Column(name = "PRODUCE_CATEGORY_CODE")
+	@ApiParam("产品位置")
+	private String produceCategoryCode;
 
 
-    @Column(name = "ACTION_CODE")
-    @ApiParam("动作代码")
-    private String actionCode;
+	@Column(name = "QUEUE_GROUP_NO")
+	@ApiParam("分组队列编号")
+	private String queueGroupNo;
 
-    @Column(name = "IF_CODE")
-    @ApiParam("接口代码")
-    private Integer ifCode;
+	@Column(name = "JIT_LOT_NO")
+	@ApiParam("JIT队列批次")
+	private String jitLotNo;
+
+	@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 String ifCode;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_RAW_PART_DATA")
+@Api("原料上线数据")
+public class IfRawPartData  extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895596L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("原料类型")
+    private String partType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("原料条码")
+    private String serialNumber;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "SRC_LOT_NO")
+    @ApiParam("收货批次")
+    private String srcLotNo;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "ORGANIZATION_CODE")
+    @ApiParam("工厂代码")
+    private String organizationCode;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD")
+@Api("MES_看板")
+public class MesBoard extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883110518753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "BOARD_NAME")
+    @ApiParam("看板名称")
+    private String boardName;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "REFRESH_INTERVAL")
+    @ApiParam("刷新时间")
+    private Integer refreshInterval;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:07 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_DETAIL")
+@Api("MES_看板设备明细")
+public class MesBoardEquDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2187463105092165451L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "X_AXES")
+    @ApiParam(value = "横坐标")
+    private Double xAxes = 0d;
+
+    @Column(name = "Y_AXES")
+    @ApiParam(value = "纵坐标")
+    private Double yAxes = 0d;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:01 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_STATUS")
+@Api("MES_看板设备状态")
+public class MesBoardEquStatus extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8426698586967483537L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_STATUS_CODE")
+    @ApiParam("状态代码")
+    private Integer equStatusCode;
+
+    @Column(name = "EQU_STATUS_DESC")
+    @ApiParam("状态描述")
+    private String equStatusDesc;
+
+    @Column(name = "COLOR")
+    @ApiParam("颜色")
+    private String color;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_MONITOR_OBJECT")
+@Api("MES_看板监控对象")
+public class MesBoardMonitorObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4136991652901768961L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private String objectType;
+
+    @Column(name = "OBJECT_VALUE")
+    @ApiParam("对象值")
+    private String objectValue;
+
+    @Column(name = "OBJECT_VALUE_DESC")
+    @ApiParam("对象值描述")
+    private String objectValueDesc;
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:53 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PICTURE")
+@Api("MES_看板图片")
+public class MesBoardPicture extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5784111763887252647L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片路径")
+    private String pictureUrl;
+}

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

@@ -0,0 +1,66 @@
+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;
+
+import java.util.List;
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 6:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PLAN_CAPACITY")
+@Api("MES_看板计划产能")
+public class MesBoardPlanCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7355311263972875850L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "PLAN_PEOPLE_NUM")
+    @ApiParam("计划人数")
+    private Integer planPeopleNum;
+
+    @Column(name = "ACTUAL_PEOPLE_NUM")
+    @ApiParam("实际人数")
+    private Integer actualPeopleNum;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+
+    @Transient
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Transient
+    @ApiParam("看板时段计划产量")
+    private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacities;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT")
+@Api("MES_看板班次")
+public class MesBoardShift extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404086L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+}

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

@@ -0,0 +1,57 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:13 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION")
+@Api("MES_看板班次时段")
+public class MesBoardShiftSection extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -957301986885952078L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "IS_SPANDAY")
+    @ApiParam("是否跨天")
+    private Integer isSpanday;
+
+    @Transient
+    @ApiParam("班次名称")
+    private String shiftName;
+}

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

@@ -0,0 +1,61 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:24 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY")
+@Api("MES_看板时段计划产量")
+public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1184108324734484237L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+
+    @Transient
+    @ApiParam("实际产量")
+    private Integer actualCapacity;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:43 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE")
+@Api("MES_看板类型")
+public class MesBoardType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3652595133806144706L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "BOARD_TYPE_NAME")
+    @ApiParam("看板类型名称")
+    private String boardTypeName;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE_BASE_CFG")
+@Api("MES_看板类型基础配置")
+public class MesBoardTypeBaseCfg extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 5405378688706555644L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+}

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

@@ -37,6 +37,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
@@ -77,6 +81,11 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
+
     @Transient
     private List<MesDefect> mesDefectList;
 

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

@@ -56,6 +56,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String sn;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
     @Column(name = "QTY")
     @ApiParam("产品数量")
     private Double qty;
@@ -92,6 +96,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable {
     @ApiParam("关联批次")
     private String lotNo;
 
+//    @Column(name = "WORK_ORDER_NO")
+//    @ApiParam("工单号")
+//    private String workOrderNo;
+
     @Transient
     private String serialNumber;
 }

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_CAUSE")
+@Api("MES_设备故障原因")
+public class MesEquFaultCause extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1229825283741375978L;
+    @Column(name = "FC_CODE")
+    @ApiParam("故障原因代码")
+    private String fcCode;
+
+    @Column(name = "FC_NAME")
+    @ApiParam("故障原因描述")
+    private String fcName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_METHOD")
+@Api("MES_设备故障处理措施")
+public class MesEquFaultMethod extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1366849727309967125L;
+    @Column(name = "FM_CODE")
+    @ApiParam("故障方法代码")
+    private String fmCode;
+
+    @Column(name = "FM_NAME")
+    @ApiParam("故障方法描述")
+    private String fmName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -0,0 +1,44 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_FAULT_PHENOMENON")
+@Api("MES_设备故障现象")
+public class MesEquFaultPhenomenon extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4373435091738791300L;
+    @Column(name = "FP_CODE")
+    @ApiParam("故障现象代码")
+    private String fpCode;
+
+    @Column(name = "FP_NAME")
+    @ApiParam("故障现象描述")
+    private String fpName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+}

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

@@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name = "CHECK_MODEL")
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_CAUSE")
-@Api("mes设备故障原因表")
+@Api("mes故障原因表")
 public class MesFaultCause extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1229825197241375978L;
@@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable {
     @ApiParam("故障原因描述")
     private String fcName;
 
-    @Column(name = "PARENT_FC_CODE")
-    @ApiParam("父阶原因代码")
-    private String parentFcCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FC_TYPE")
+    @ApiParam("故障原因类型编码")
+    private String fcType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_METHOD")
-@Api("mes设备故障方法表")
+@Api("MES_故障处理措施")
 public class MesFaultMethod extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -1366849757709967125L;
@@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable {
     @ApiParam("故障方法描述")
     private String fmName;
 
-    @Column(name = "PARENT_FM_CODE")
-    @ApiParam("父阶故障代码")
-    private String parentFmCode;
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
+    @Column(name = "FM_TYPE")
+    @ApiParam("故障措施类型编码")
+    private String fmType;
 }

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

@@ -26,7 +26,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FAULT_PHENOMENON")
-@Api("mes设备故障现象表")
+@Api("mes故障现象表")
 public class MesFaultPhenomenon extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 4373435095236791300L;
@@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable {
     @ApiParam("故障现象描述")
     private String fpName;
 
-    @Column(name = "PARENT_FP_CODE")
-    @ApiParam("父阶现象代码")
-    private String parentFpCode;
-
-    @Column(name = "EQUIPMENT_CODE")
-    @ApiParam("设备代码")
-    private String equipmentCode;
-
+    // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段
     @Column(name = "FP_TYPE")
-    @ApiParam("故障现象类型")
-    private Integer fpType;
+    @ApiParam("故障现象类型编码")
+    private String fpType;
 }

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

@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/22 11:03 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OFF_LINE_RECORD")
+@Api("MES_产品下线记录")
+public class MesOffLineRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2767323581134885752L;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "OFF_LINE_TIME")
+    @ApiParam("下线时间")
+    private String offLineTime;
+}

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

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

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -53,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("通道")
     private String channel;
 
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
     @Column(name = "TAG_NAME")
     @ApiParam("标签名称")
     private String tagName;
@@ -69,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("分组名称")
     private String groupName;
 
-    @Column(name = "DEVICE")
-    @ApiParam("驱动")
-    private String device;
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC配置")
+    private String plcCfg;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Column(name = "TOOLING_CODE ")
+    @ApiParam("工装代码")
+    private String toolingCode;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("生产线")
     private String workCenterCode;
@@ -85,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
-    @Column(name = "PLC_CFG")
-    @ApiParam("PLC的值的设定")
-    private String plcCfg;
-
-    @Column(name = "ANALYSIS_RULE")
-    @ApiParam("解析规则")
-    private String analysisRule;
-
-    @Column(name = "IS_ANALYSIS")
-    @ApiParam("是否解析")
-    private String isAnalysis;
-
     @Column(name = "FEED_VALUE")
     @ApiParam("反馈值")
     private String feedValue;
@@ -113,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("空间索引")
     private Integer nameSpaceIndex = 2;
 
+    @Column(name = "PLC_TYPE")
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     @Column(name = "USER_NAME")
     @ApiParam("用户名")
     private String userName;
@@ -127,9 +136,11 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("OPC值")
-    private String opcValue;
+    private List<ProductDataModel> opcValue;
+
+
+    @Transient
+    @ApiParam("标签数据")
+    private String tableValue;
 
-    @Column(name = "TOOLING_CODE ")
-    @ApiParam("工装代码")
-    private String toolingCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.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;
 
 /**
@@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable {
     @Column(name = "PROCESS_NAME")
     @ApiParam("工序名称")
     private String processName;
+
+    @Transient
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Transient
+    @ApiParam("流程代码")
+    private String routeCode;
 }

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

@@ -123,6 +123,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
+
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -164,6 +165,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+
+
     public MesProduceSn() {
     }
 

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

@@ -82,6 +82,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("生产组代码")
     private String pgCode;
 
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

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

@@ -92,6 +92,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("生产组代码")
     private String pgCode;
 
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.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;
+
+/**
+ * @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 = "CAR_NO")
+    @ApiParam("车号")
+    private String carNo;
+
+    @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;
+
+    @Column(name = "JIT_LOT_NO")
+    @ApiParam("JIT队列批次")
+    private String jitLotNo;
+
+    @Column(name = "JIT_ACTUAL_NO")
+    @ApiParam("客户JIT队列编号")
+    private String jitActualNo;
+
+}

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

@@ -0,0 +1,73 @@
+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_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/bean/MesRoute.java

@@ -8,10 +8,7 @@ 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 javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable {
     @Column(name = "ROUTE_TYPE")
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
+
+    @Transient
+    @ApiParam("生产线")
+    private String workCenterCode;
 }

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

@@ -0,0 +1,40 @@
+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: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SHIFT_CLASS")
+@Api("MES_班制表")
+public class MesShiftClass extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222874834741345978L;
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+
+    @Column(name = "SHIFT_CLASS_NAME")
+    @ApiParam("班制名称")
+    private String shiftClassName;
+}

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

@@ -0,0 +1,53 @@
+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: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SHIFT_CLASS_DETAIL")
+@Api("MES_班制班次表")
+public class MesShiftClassDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222874274741347278L;
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+
+    @Column(name = "SHIFT_CLASS_NAME")
+    @ApiParam("班制名称")
+    private String shiftClassName;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -0,0 +1,40 @@
+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: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SKILLS")
+@Api("MES_技能表")
+public class MesSkills extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1229825214741345978L;
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+}

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,96 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
+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 = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @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;
+
+    @Transient
+    @ApiParam("状态执行情况")
+    private StepResult stepResult;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_USER_SKILL")
+@Api("MES_人员技能表")
+public class MesUserSkill extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222847514741345978L;
+    @Column(name = "USER_EMP_NO")
+    @ApiParam("员工编码")
+    private String userEmpNo;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("员工名称")
+    private String userName;
+
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+
+    @Column(name = "SKILL_LEVEL")
+    @ApiParam("技能等级")
+    private String skillLevel;
+}

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

@@ -54,6 +54,10 @@ public class MesWcCheck extends BaseBean implements Serializable {
     @ApiParam("检查标准")
     private String standard;
 
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
     @Transient
     @ApiParam("检查类型名称")
     private String checkTypeName;

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

@@ -80,4 +80,8 @@ public class MesWcCheckRecord extends BaseBean implements Serializable {
     @ApiParam("总体结果")
     private Integer overAllResult;
 
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
 }

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

@@ -31,11 +31,11 @@ import java.io.Serializable;
 })
 @Api("工作单元组件参数配置")
 public class MesWorkCellModuleParam extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 4836155960343256982L;
+	private static final long serialVersionUID = 4836155960343256982L;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
 	@Column(name = "WORK_CELL_CODE")
 	@ApiParam("工作单元代码")

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_SKILL")
+@Api("MES_工位技能表")
+public class MesWorkCellSkill extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1239825214741345208L;
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.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;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORKDAY")
+@Api("MES_工作日历表")
+public class MesWorkDay extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222899824741345978L;
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_DATE")
+    @ApiParam("日期")
+    private String workDate;
+
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+}