diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 0629798..cdb17df 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/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;
@@ -644,7 +716,10 @@ public class MesEnumUtil {
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
         WC_CHECK("WC_CHECK", "开线检查项"),
-        BOARD("BOARD", "看板类型");
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
 
         private String value;
         private String description;
@@ -5251,20 +5326,20 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
-        MANUAL_ASSIGNMENT(10, "手工赋值"),
-        SPEL_EXPRESSION(20, "spel表达式"),
-        FUNCTION_ASSIGNMENT(30, "函数赋值"),
-        JOB_ASSIGNMENT(40, "job赋值");
+        MANUAL_ASSIGNMENT("10", "手工赋值"),
+        SPEL_EXPRESSION("20", "spel表达式"),
+        FUNCTION_ASSIGNMENT("30", "函数赋值"),
+        JOB_ASSIGNMENT("40", "job赋值");
 
-        private int value;
+        private String value;
         private String description;
 
-        VALUE_TYPE(int value, String description) {
+        VALUE_TYPE(String value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public int getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -5272,10 +5347,19 @@ public class MesEnumUtil {
             return description;
         }
 
-        public static String valueOfDescription(int val) {
+        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 == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -5284,24 +5368,24 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象 运算类型
+     * 	运算对象 对象代码
      */
     @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");
+        ORGANIZE_OEE("10", "工厂OEE"),
+        WORK_CENTER_OEE("20", "产线OEE"),
+        WORK_CELL_CEE("30", "工位OEE"),
+        EQU_OEE("40", "设备OEE");
 
-        private int value;
+        private String value;
         private String description;
 
-        OBJECT_CODE(int value, String description) {
+        OBJECT_CODE(String value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public int getValue() {
+        public String getValue() {
             return value;
         }
 
@@ -5309,10 +5393,19 @@ public class MesEnumUtil {
             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 == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -5325,9 +5418,9 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_TYPE {
-        ORGANIZE_OEE(10, "组件"),
-        WORK_CENTER_OEE(20, "表单"),
-        WORK_CELL_CEE(30, "报表"),
+        ASSEMBLY(10, "组件"),
+        FORM(20, "表单"),
+        REPORT_FORM(30, "报表"),
         JOB(40, "JOB"),
         OTHER(50, "其他");
 
@@ -5396,4 +5489,87 @@ public class MesEnumUtil {
         }
     }
 
+
+
+    /**
+     * 	运算对象代码
+     */
+    @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;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index b7d0c56..900dbb7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FSM_STATE_TYPE {
         BEGIN(10, "begin", "开始状态点"),
-        END(20, "end", "结束状态点");
+        END(40, "end", "结束状态点");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index cf8e1ea..7e9ef99 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -715,8 +715,8 @@ public class WmsEnumUtil {
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
         TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
-        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
-
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
         private int value;
         private String code;
         private String description;
@@ -6611,5 +6611,4 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
-
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
index 5e7684b..651f8dc 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
@@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
index d08568e..0549d1f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
@@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java
new file mode 100644
index 0000000..f727900
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java
@@ -0,0 +1,65 @@
+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_FULL_NAME")
+    @ApiParam("数据对象全称")
+    private String dataObjectFullName;
+
+    @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();
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiData.java
new file mode 100644
index 0000000..f21e756
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
index 81b3951..2a3b94c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
@@ -11,7 +11,9 @@ 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:
@@ -109,4 +111,16 @@ public class MesOee extends BaseBean implements Serializable {
     @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;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java
index 46fe2ed..bc7b401 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java
+++ b/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;
 
 /**
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
index 56649b6..e05a54e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.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;
 
 /**
@@ -45,4 +46,12 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable
     @Column(name = "OPERATE_TYPE")
     @ApiParam("运算类型")
     private Integer operateType;
+
+    @Transient
+    @ApiParam("属性值")
+    private String attributeValue;
+
+    @Transient
+    @ApiParam("是否自定义属性")
+    private boolean customAttribute = false;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java
index 80fd5fd..6357830 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java
@@ -41,6 +41,10 @@ public class MesProdPack extends BaseBean implements Serializable {
     @ApiParam("包装规格")
     private String packSpec;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
     @Column(name = "PROD_LABEL_TEMPLATE")
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 0bc3879..48a7682 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @Transient
     private List<MesQcCheckStandard> childQcList;
 
+    @Transient
+    @ApiParam("备注")
+    private String memo;
+
     public MesQcCheckStandard() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 6a70107..f244016 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/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;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
index 4a8aec6..a4b29ec 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java
@@ -43,6 +43,13 @@ public class ButtonDynamicModel {
         this.buttonName = buttonName;
     }
 
+
+    public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
+        this.buttonCode = buttonCode;
+        this.buttonName = buttonName;
+        this.paramCode = paramCode;
+    }
+
     public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
         this.id = id;
         this.buttonCode = buttonCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java
new file mode 100644
index 0000000..f9eeea2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java
@@ -0,0 +1,181 @@
+//package cn.estsh.i3plus.pojo.mes.model;
+//
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiParam;
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import org.apache.poi.ss.usermodel.CellStyle;
+//import org.springframework.util.StringUtils;
+//
+//import java.io.Serializable;
+//import java.math.BigDecimal;
+//
+///**
+// * @Author: wangjie
+// * @CreateDate: 2019/8/21 9:19 AM
+// * @Description:
+// **/
+//@Data
+//@NoArgsConstructor
+//@AllArgsConstructor
+//@Api("EXCEL参数model")
+//public class ExcelDataParamModel<T> implements Serializable {
+//
+//    public ExcelDataParamModel(Class<T> clazz){
+//        this.clazz = clazz;
+//    }
+//
+//    @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据")
+//    private Class<T> clazz;
+//
+//    @ApiParam("对应类的映射字段名，String类型")
+//    private String[] strField;
+//
+//    @ApiParam("对应类的标题，需要一一对应")
+//    private String[] titleStr;
+//
+//    @ApiParam("大标题")
+//    private String title;
+//
+//    @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机")
+//    private String fileName;
+//
+//    @ApiParam("后缀")
+//    private String sufix;
+//
+//    @ApiParam("大标题样式")
+//    private CellStyle bigTitleCellStyle;
+//
+//    @ApiParam("标题样式")
+//    private CellStyle titleCellStyle;
+//
+//    @ApiParam("数据样式")
+//    private CellStyle cellStyle;
+//
+//    @ApiParam("sheet名")
+//    private String sheetName;
+//
+//    @ApiParam("每个格子的宽度")
+//    private BigDecimal[] cellWidth;
+//
+//    @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序")
+//    private Integer sheetNo;
+//
+//    @ApiParam("导出数据转换器")
+//    private QueryDataInterface queryDataInterface;
+//
+//    public Class<T> getClazz() {
+//        return clazz;
+//    }
+//
+//    public String[] getStrField() {
+//        return strField;
+//    }
+//
+//    public String[] getTitleStr() {
+//        return titleStr;
+//    }
+//
+//    public String getTitle() {
+//        if(StringUtils.isEmpty(this.title)){
+//            return "无效的标题";
+//        }else{
+//            return title;
+//        }
+//    }
+//
+//    public String getFileName() {
+//        if(StringUtils.isEmpty(this.fileName)){
+//            return "未命名";
+//        }else{
+//            return this.fileName;
+//        }
+//    }
+//
+//    public CellStyle getBigTitleCellStyle() {
+//        return bigTitleCellStyle;
+//    }
+//
+//    public CellStyle getTitleCellStyle() {
+//        return titleCellStyle;
+//    }
+//
+//    public CellStyle getCellStyle() {
+//        return cellStyle;
+//    }
+//
+//    public String getSheetName() {
+//        return sheetName;
+//    }
+//
+//    public Integer getSheetNo() {
+//        return sheetNo;
+//    }
+//
+//    public BigDecimal[] getCellWidth() {
+//        return cellWidth;
+//    }
+//
+//    public String getSufix() {
+//        return sufix;
+//    }
+//
+//    public QueryDataInterface getQueryDataInterface() {
+//        return queryDataInterface;
+//    }
+//
+//    public void setClazz(Class<T> clazz) {
+//        this.clazz = clazz;
+//    }
+//
+//    public void setStrField(String[] strField) {
+//        this.strField = strField;
+//    }
+//
+//    public void setTitleStr(String[] titleStr) {
+//        this.titleStr = titleStr;
+//    }
+//
+//    public void setTitle(String title) {
+//        this.title = title;
+//    }
+//
+//    public void setFileName(String fileName) {
+//        this.fileName = fileName;
+//    }
+//
+//    public void setSufix(String sufix) {
+//        this.sufix = sufix;
+//    }
+//
+//    public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) {
+//        this.bigTitleCellStyle = bigTitleCellStyle;
+//    }
+//
+//    public void setTitleCellStyle(CellStyle titleCellStyle) {
+//        this.titleCellStyle = titleCellStyle;
+//    }
+//
+//    public void setCellStyle(CellStyle cellStyle) {
+//        this.cellStyle = cellStyle;
+//    }
+//
+//    public void setSheetName(String sheetName) {
+//        this.sheetName = sheetName;
+//    }
+//
+//    public void setCellWidth(BigDecimal[] cellWidth) {
+//        this.cellWidth = cellWidth;
+//    }
+//
+//
+//    public void setSheetNo(Integer sheetNo) {
+//        this.sheetNo = sheetNo;
+//    }
+//
+//    public void setQueryDataInterface(QueryDataInterface queryDataInterface) {
+//        this.queryDataInterface = queryDataInterface;
+//    }
+//
+//}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterGroup.java
new file mode 100644
index 0000000..a262480
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java
new file mode 100644
index 0000000..0d91df9
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRuleAndOr.java
new file mode 100644
index 0000000..1991cfd
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
index 19d1a22..d1220a7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
@@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("连接类型")
     private String connectTypeName;
 
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
 
     public MesEquipmentModel() {
 
@@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.checkModel = checkModel;
     }
 
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
index 9ea903c..1e4ee99 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
@@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable {
     @ApiParam("OPCUA路径")
     private String opcUrl;
 
+    @ApiParam("PLC类型")
+    private Integer plcType;
+
     public MesPlcModel() {
 
     }
@@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable {
     public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
                        String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
                        String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
-                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
+                       String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable {
         this.device = device;
         this.objectCode = objectCode;
         this.opcUrl = opcUrl;
+        this.plcType = plcType;
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
index b7a7eef..9fce24b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java
@@ -29,7 +29,7 @@ public class MesWorkOrderModel {
     //客户产线代码
     @ApiParam("ProductionLineID")
     @AnnoOutputColumn
-    private String custProdLineCode;
+    private String workCenterCode;
 
     //数量
     @ApiParam("DemandQty")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
new file mode 100644
index 0000000..2b25ff8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/30 2:01 下午
+ * @Modify:
+ */
+@Data
+public class OperateObjectParamModel {
+
+    private String organizeCode;
+
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @ApiParam("运算对象代码")
+    private String objectCode;
+
+    @ApiParam("日期")
+    private String oeeDate;
+
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Transient
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @ApiParam("属性值")
+    private Integer attributeValue = 0;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoFieldModel.java
new file mode 100644
index 0000000..21671e7
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PojoModel.java
new file mode 100644
index 0000000..230c8a2
--- /dev/null
+++ b/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;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java
index f82a656..1a6ff37 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java
@@ -42,9 +42,6 @@ public class ProdPlanBatchCompileModel {
     @ApiParam("班次")
     private String shiftCode;
 
-    @ApiParam("客户名称")
-    private String custCodeName;
-
     @ApiParam("客户代码")
     private String custCode;
 
@@ -75,4 +72,52 @@ public class ProdPlanBatchCompileModel {
     @ApiParam("计划类型名称")
     private String planTypeName;
 
+    @ApiParam("数量1")
+    private String qty1;
+
+    @ApiParam("完成数量1")
+    private String completeQty1;
+
+    @ApiParam("数量2")
+    private String qty2;
+
+    @ApiParam("完成数量2")
+    private String completeQty2;
+
+    @ApiParam("数量3")
+    private String qty3;
+
+    @ApiParam("完成数量3")
+    private String completeQty3;
+
+    @ApiParam("数量4")
+    private String qty4;
+
+    @ApiParam("完成数量4")
+    private String completeQty4;
+
+    @ApiParam("数量5")
+    private String qty5;
+
+    @ApiParam("完成数量5")
+    private String completeQty5;
+
+    @ApiParam("数量6")
+    private String qty6;
+
+    @ApiParam("完成数量6")
+    private String completeQty6;
+
+    @ApiParam("数量7")
+    private String qty7;
+
+    @ApiParam("完成数量7")
+    private String completeQty7;
+
+    @ApiParam("合计")
+    private String amountStr;
+
+    @ApiParam("完成合计")
+    private String completeAmountStr;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java
new file mode 100644
index 0000000..e16935b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintLabelTemplateModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码打印模版model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("条码打印模版model")
+public class SnPrintLabelTemplateModel {
+
+    @ApiParam("模版信息")
+    private MesLabelTemplate labelTemplate;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("条码类型  10-过程条码，20-产品条码，30-包装条码")
+    private Integer snType;
+
+    @ApiParam("包装条码层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
+    public SnPrintLabelTemplateModel() {
+    }
+
+    public SnPrintLabelTemplateModel(String organizeCode, String partNo, String custCode, Integer snType, Integer packLevel, MesLabelTemplate labelTemplate) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.custCode = custCode;
+        this.snType = snType;
+        this.packLevel = packLevel;
+        this.labelTemplate = labelTemplate;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index 7bd7307..78826ad 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户工厂代码")
     private String customerFactoryCode;
 
-    @ApiParam("发运命令")
-    private String shippingCmd;
-
     @Override
     public String toString() {
         return "StationRequestBean{" +
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataAuthRepository.java
new file mode 100644
index 0000000..73d98eb
--- /dev/null
+++ b/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> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 0e1510d..e3808fb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -2495,6 +2495,30 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 散件产品组配置
+     *
+     * @param mesProdScatterDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode);
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
         DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);
@@ -2625,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;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 839d22a..8e68d4d 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/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
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
index ebf9603..b077ae5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java
@@ -41,6 +41,10 @@ public class BasVendor extends BaseBean{
     @ApiParam("供应商全称")
     private String vendorDesc;
 
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    private String userName;
+
     @Column(name="VENDOR_ADDR")
     @ApiParam("供应商地址")
     private String vendorAddr;
@@ -57,10 +61,6 @@ public class BasVendor extends BaseBean{
     @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;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
index f250b58..90d32ae 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java
@@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean {
     @Column(name = "DELAY_HOUR")
     @ApiParam(value = "容差")
     private Integer delayHour;
+
+    public WmsCustWindow(WmsCustWindow custWindow) {
+        this.custNo = custWindow.getCustNo();
+        this.custWindowTime = custWindow.getCustWindowTime();
+        this.weeks = custWindow.getWeeks();
+        this.delayHour = custWindow.getDelayHour();
+    }
+
+    public WmsCustWindow() {
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 574361d..5398ffd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
@@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+
+    public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) {
+        this.orderNo = poMasterDetails.getOrderNo();
+        this.planDate = poMasterDetails.getPlanDate();
+        this.planTime = poMasterDetails.getPlanTime();
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index 3fe234b..9b74c53 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean {
     public int getBusiTypeVal() {
         return this.busiType == null ? 0 : this.busiType;
     }
+
+    public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) {
+        this.orderNo = wmsPoMaster.getOrderNo();
+        this.vendorNo = wmsPoMaster.getVendorNo();
+    }
+
+    public WmsDocMovementMaster() {
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java
index b7e6d03..e2ff9c2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java
@@ -72,6 +72,10 @@ public class WmsDockOrderInfo extends BaseBean {
     private String orderNo;
 
     @Transient
+    @ApiParam("驾驶员编码")
+    private String driverNo;
+
+    @Transient
     @ApiParam("库位代码")
     private Integer masterStatus;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java
new file mode 100644
index 0000000..45776dc
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java
@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description : 发运计划任务跟踪
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-04-27 4:37 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+public class AssignmentDto {
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @ApiParam(value = "时间")
+    private String createDatetime;
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件号名称")
+    private String partNameRdd;
+
+    @ApiParam(value = "源存储区")
+    private String srcZoneNo;
+
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
+    @ApiParam(value = "状态中文描述", example = "1")
+    private String itemStatusStr;
+
+    @ApiParam(value = "出库数量")
+    private Double outQty;
+
+    public AssignmentDto(String orderNo, String createDatetime, String partNameRdd,
+                         String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) {
+        this.orderNo = orderNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.srcZoneNo = srcZoneNo;
+        this.custNo = custNo;
+        this.itemStatus = itemStatus;
+        this.outQty = outQty;
+        this.partNo = partNo;
+    }
+
+    public AssignmentDto() {
+    }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
index ffaf492..9f03900 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java
@@ -72,4 +72,7 @@ public class WmsStockSnDto {
         this.partSpec = partSpec;
         this.zoneNo = zoneNo;
     }
+
+    public WmsStockSnDto() {
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java
index 680c401..a1db922 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java
@@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @ApiParam(value = "供应商编号")
+    private String vendorName;
+
     @ApiParam(value = "数量")
     private Integer num;
 
@@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto {
 
     }
 
-    public WmsSupplierExtensionDto(String vendorNo, Integer num) {
+    public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) {
         this.vendorNo = vendorNo;
         this.num = num;
+        this.vendorName = vendorName;
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java
new file mode 100644
index 0000000..edefeab
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.engine.script;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+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.Transient;
+
+/**
+ * 脚本持久化历史记录
+ *
+ * @author jason.niu
+ * @since 2020-04-29
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SCRIPT_PERSISTENCE_HISTORY")
+@Api("系统动态脚本")
+public class EngineScriptPersistenceHistory extends BaseBean {
+
+    // 脚本调用的唯一编号，例如：WMS_PDA_0001
+    @Column(name = "SCRIPT_NO", length = 50)
+    private String scriptNo;
+
+    // 脚本的中文名称
+    @Column(name = "SCRIPT_NAME", length = 50)
+    private String scriptName;
+
+    // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
+    @Column(name = "SCRIPT_TYPE")
+    private Integer scriptType;
+
+    // 脚本编写的语言
+    // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+    @Column(name = "LANGUAGE_TYPE")
+    private Integer languageType;
+
+    // 脚本的具体内容
+    @Lob
+    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    private String scriptContent;
+
+    // 脚本的描述，包含脚本的用法，参数说明等
+    @Column(name = "SCRIPT_REMARK", length = 2000)
+    private String scriptRemark;
+
+    // 编译后的脚本内容，通过预编译加快脚本的运行速度
+    @Transient
+    private Object compiledScript;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java
new file mode 100644
index 0000000..4e90509
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 脚本执行日志
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-29
+ * @Modify:
+ **/
+@Data
+@Api("插件日志")
+public class ScriptLoggerModel {
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("用户编号")
+    private String userCode;
+
+    @ApiParam("脚本编号")
+    private String scriptNo;
+
+    @ApiParam("日志内容")
+    private String context;
+
+    @ApiParam("日志打印日期")
+    private String printDate;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java
new file mode 100644
index 0000000..52818f2
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EngineScriptPersistenceHistoryRepository extends BaseRepository<EngineScriptPersistenceHistory, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 86700bb..c1e1ebc 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1663,7 +1663,8 @@ public class WmsHqlPack {
 		DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
 		DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
 		DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
-		DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
 
 		DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
 		DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);