Merge branch 'dev' into test

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

@@ -11,6 +11,75 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 
 public class MesEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HQL_EXPRESSION {
+        GT(10,">","大于"),
+        LT(20,"<","小于"),
+        EQ(30,"=","等于"),
+        NEQ(40,"!=","不等于"),
+        GTE(50,">=","大于等于"),
+        LTE(60,"<=","小于等于"),
+        LIKE(70,"like","LIKE"),
+        IN(80,"in","包含");
+
+        private int value;
+        private String code;
+        private String description;
+
+        HQL_EXPRESSION(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
     /**
      * 作业程序组件类型
      */
@@ -430,6 +499,9 @@ public class MesEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        TEN_MIN(300, "十分钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -5174,4 +5246,327 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * 	运算对象属性 运算类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPERATE_TYPE {
+        OEE(10, "OEE"),
+        MTBF(20, "MTBF平均故障间隔"),
+        MTTR(30, "MTTR平均修理时间");
+
+        private int value;
+        private String description;
+
+        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 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 ATTRIBUTE_TYPE {
+        STANDARD_ATTRIBUTE(10, "标准属性"),
+        CUSTOM_ATTRIBUTE(20, "自定义属性");
+
+        private int value;
+        private String description;
+
+        ATTRIBUTE_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 VALUE_TYPE {
+        MANUAL_ASSIGNMENT("10", "手工赋值"),
+        SPEL_EXPRESSION("20", "spel表达式"),
+        FUNCTION_ASSIGNMENT("30", "函数赋值"),
+        JOB_ASSIGNMENT("40", "job赋值");
+
+        private String value;
+        private String description;
+
+        VALUE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static VALUE_TYPE getByValue(String value) {
+            for (VALUE_TYPE valueType : values()) {
+                if (valueType.getValue().equals(value)) {
+                    return valueType;
+                }
+            }
+            return null;
+        }
+
+        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 OBJECT_CODE {
+        ORGANIZE_OEE("10", "工厂OEE"),
+        WORK_CENTER_OEE("20", "产线OEE"),
+        WORK_CELL_CEE("30", "工位OEE"),
+        EQU_OEE("40", "设备OEE");
+
+        private String value;
+        private String description;
+
+        OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OBJECT_CODE getByValue(String value) {
+            for (OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 	脚本类型（组件、表单、报表、JOB、其他）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_TYPE {
+        ASSEMBLY(10, "组件"),
+        FORM(20, "表单"),
+        REPORT_FORM(30, "报表"),
+        JOB(40, "JOB"),
+        OTHER(50, "其他");
+
+        private int value;
+        private String description;
+
+        SCRIPT_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;
+        }
+    }
+
+    /**
+     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCRIPT_LANGUAGE {
+        GROOVY(10, "Groovy"),
+        PYTHON(20, "Python"),
+        JAVA_SCRIPT(30, "JavaScript"),
+        SCALA(40, "Scala"),
+        RUBY(50, "Ruby");
+
+        private int value;
+        private String description;
+
+        SCRIPT_LANGUAGE(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 OPERATE_OBJECT_CODE {
+        ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
+        ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
+        WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
+        EQU_OEE_DAY("EQU_OEE_Day", "设备OEE(天)");
+
+        private String value;
+        private String description;
+
+        OPERATE_OBJECT_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OPERATE_OBJECT_CODE getByValue(String value) {
+            for (OPERATE_OBJECT_CODE objectCode : values()) {
+                if (objectCode.getValue().equals(value)) {
+                    return objectCode;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 	oee 运算状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OEE_STATUS {
+        STAY_OPERATE(10, "待运算"),
+        ALREADY_OPERATE(20, "已运算");
+
+        private int value;
+        private String description;
+
+        OEE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :数据权限
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DATA_AUTH")
+@Api("数据权限")
+public class MesDataAuth extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8665559475167190408L;
+    @Column(name = "ROLE_ID")
+    @ApiParam("角色编号")
+    private Long roleId;
+
+    @Column(name = "ROLE_NAME")
+    @ApiParam("角色名称")
+    private String roleName;
+
+    @Column(name = "DATA_OBJECT")
+    @ApiParam("数据对象")
+    private String dataObject;
+
+    @Column(name = "DATA_OBJECT_NAME")
+    @ApiParam("数据对象名称")
+    private String dataObjectName;
+
+    @Column(name = "FILTER_RULE", columnDefinition = "TEXT")
+    @ApiParam("过滤规则")
+    private String filterRule;
+
+    public long getRoleIdVal() {
+        return this.roleId == null ? 0 : this.roleId.longValue();
+    }
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.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/4/28 21:30
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EDI_DATA")
+@Api("EDI数据")
+public class MesEdiData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4671561947551462256L;
+
+    @Column(name = "HOST")
+    @ApiParam("edi电脑名")
+    private String host;
+
+    @Column(name = "DATA")
+    @ApiParam("数据")
+    private String data;
+
+    @Column(name = "CONFIG")
+    @ApiParam("edi配置")
+    private String config;
+}

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

@@ -0,0 +1,126 @@
+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/28 4:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OEE")
+@Api("MES_OEE数据")
+public class MesOee extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -9163026983140909748L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @Column(name = "STATUS")
+    @ApiParam("运算状态")
+    private Integer status;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "OEE_DATE")
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @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 = "TOTAL_RUN_TIME")
+    @ApiParam("总生产时间")
+    private String totalRunTime;
+
+    @Column(name = "TOTAL_STOP_TIME")
+    @ApiParam("总停机时间")
+    private String totalStopTime;
+
+    @Column(name = "TOTAL_QTY")
+    @ApiParam("总生产数")
+    private Integer totalQty;
+
+    @Column(name = "QUALIFIED_QTY")
+    @ApiParam("一次合格数")
+    private Integer qualifiedQty;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "ACTUAL_TAKT")
+    @ApiParam("实际节拍")
+    private Integer actualTakt;
+
+    @Column(name = "TIME_RATE")
+    @ApiParam("时间开动率")
+    private String timeRate;
+
+    @Column(name = "TAKT_RATE")
+    @ApiParam("性能开动率")
+    private String taktRate;
+
+    @Column(name = "QUALIFIED_RATE")
+    @ApiParam("良品率")
+    private String qualifiedRate;
+
+    @Column(name = "OEE")
+    @ApiParam("OEE")
+    private String oee;
+
+    @Column(name = "BUSI_DATA")
+    @ApiParam("自定义数据")
+    private String busiData;
+
+    @Transient
+    @ApiParam("开始日期")
+    private String oeeDateStart;
+
+    @Transient
+    @ApiParam("结束日期")
+    private String oeeDateEnd;
+
+    @Transient
+    @ApiParam("自定义数据map")
+    private List<MesOperateObjectAttribute> operateObjectAttributes;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.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;
 
 /**
@@ -65,4 +66,34 @@ public class MesOffLineRecord extends BaseBean implements Serializable {
     @Column(name = "OFF_LINE_TIME")
     @ApiParam("下线时间")
     private String offLineTime;
+
+    /*************冗余字段****************/
+
+    @Transient
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Transient
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @Transient
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @Transient
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Transient
+    @ApiParam("一次合格数")
+    private Integer qualifiedQty;
+
+    @Transient
+    @ApiParam("总生产数")
+    private Integer totalQty;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObject.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:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:04 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT")
+@Api("MES_运算对象")
+public class MesOperateObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7829216855303543146L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.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/28 4:08 下午
+ * @Modify:MES_OPERATE_OBJECT_CFG
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Api("MES_运算对象属性")
+public class MesOperateObjectAttribute extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3916105499867386686L;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "ATTRIBUTE_NAME")
+    @ApiParam("属性名称")
+    private String attributeName;
+
+    @Column(name = "ATTRIBUTE_TYPE")
+    @ApiParam("属性类型")
+    private Integer attributeType;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("运算类型")
+    private Integer operateType;
+
+    @Transient
+    @ApiParam("属性值")
+    private String attributeValue;
+
+    @Transient
+    @ApiParam("是否自定义属性")
+    private boolean customAttribute = false;
+}

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

@@ -0,0 +1,65 @@
+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/28 4:12 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_OPERATE_OBJECT_ATTRIBUTE")
+@Api("MES_运算对象属性配置")
+public class MesOperateObjectCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8066603810736365082L;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name = "ATTRIBUTE_CODE")
+    @ApiParam("属性代码")
+    private String attributeCode;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("赋值类型")
+    private String valueType;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("函数方法")
+    private String methodCode;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("job编号")
+    private String jobId;
+
+    @Column(name = "SPEL_CONTENT")
+    @ApiParam("spel表达式")
+    private String spelContent;
+
+    @Column(name = "SEQ")
+    @ApiParam("运算顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("属性名称")
+    private String attributeName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScriptPersistence.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:
+ * @Author: jokelin
+ * @Date: 2020/4/28 4:58 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCRIPT_PERSISTENCE")
+@Api("动态脚本")
+public class MesScriptPersistence extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1941422535481564572L;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @Column(name = "SCRIPT_NAME")
+    @ApiParam("脚本名称")
+    private String scriptName;
+
+    @Column(name = "SCRIPT_REMARK")
+    @ApiParam("脚本描述")
+    private String scriptRemark;
+
+    @Column(name = "SCRIPT_TYPE")
+    @ApiParam("脚本类型")
+    private Integer scriptType;
+
+    @Column(name = "LANGUAGE_TYPE")
+    @ApiParam("语言类型")
+    private Integer languageType;
+
+    @Column(name = "SCRIPT_CONTENT")
+    @ApiParam("脚本内容")
+    private String scriptContent;
+}

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

@@ -260,6 +260,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("计划类型")
     private Integer planType;
 
+    @Transient
+    @ApiParam(value = "完成按钮编号")
+    public String comButtonCode;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterGroup {
+    private String andOr;
+    private List<FilterRuleAndOr> groups;
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+@Data
+public class FilterRule {
+    private String filed;
+    private String op;
+    private String value;
+}

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterRuleAndOr {
+    private String andOr;
+    private List<FilterRule> rules;
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class PojoFieldModel implements Serializable {
+    private static final long serialVersionUID = 6761788924707802928L;
+
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class PojoModel implements Serializable {
+    private static final long serialVersionUID = -3617516560880011259L;
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<PojoFieldModel> fieldList;
+}

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

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

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOee;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOeeRepository extends BaseRepository<MesOee, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectAttribute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectAttributeRepository extends BaseRepository<MesOperateObjectAttribute, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObjectCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:04 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectCfgRepository extends BaseRepository<MesOperateObjectCfg, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesOperateObject;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:05 下午
+ * @Modify:
+ */
+@Repository
+public interface MesOperateObjectRepository extends BaseRepository<MesOperateObject, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesScriptPersistence;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/28 5:03 下午
+ * @Modify:
+ */
+@Repository
+public interface MesScriptPersistenceRepository extends BaseRepository<MesScriptPersistence, Long> {
+}

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

@@ -2649,4 +2649,15 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
+            DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
+        }
+        if (dataAuth.getRoleIdVal() > 0) {
+            DdlPreparedPack.getNumEqualPack(dataAuth.getRoleIdVal(), "roleId", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -53,6 +53,21 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+
+    /**
+     * In 参数封装
+     * @param columnName
+     * @return
+     */
+    public static DdlPackBean packHqlInStr(String columnName, String[] params){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+        DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
+        return ddlPackBean;
+    }
+
+
     /**
      * 资源查询
      * @param resource