diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index d2c673a..f401265 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -1816,7 +1816,8 @@ public class CommonEnumUtil {
         SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
         SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
         SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
-        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
+        SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
 
         private int value;
         private String code;
@@ -1908,6 +1909,13 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public String getSchemaPattern(String schema) {
+            if(this.equals(SOURCE_SAP_HANA)){
+                return schema;
+            }
+            return defaultSchemaPattern;
+        }
+
         public String getJDBCUrl(String database,String host,Integer port){
             if(this.getValue() == SOURCE_MARIA_DB.getValue()){
                 return getJDBCUrlMySQL(database,host,port);
@@ -1917,6 +1925,8 @@ public class CommonEnumUtil {
                 return getJDBCUrlPostgreSQL(database,host,port);
             }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
                 return getJDBCUrlSQLServer(database,host,port);
+            }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){
+                return getJDBCUrlSapHana(database,host,port);
             }
             return null;
         }
@@ -1944,6 +1954,8 @@ public class CommonEnumUtil {
                     return SOURCE_POSTGRE_SQL;
                 }else if(databaseProductName.indexOf(":sqlserver:") != -1){
                     return SOURCE_SQL_SERVER;
+                }else if(databaseProductName.indexOf(":sap:") != -1){
+                    return SOURCE_SAP_HANA;
                 }
             }
             return null;
@@ -1965,6 +1977,10 @@ public class CommonEnumUtil {
             return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
 
+        private String getJDBCUrlSapHana(String database,String host,Integer port){
+            return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
+        }
+
         private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
             StringBuffer sb = new StringBuffer();
             sb.append("jdbc:sqlserver://").append(host);
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 03ff681..a3bc65a 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
@@ -2436,7 +2436,8 @@ public class MesEnumUtil {
 
         NORMAL(10, "正常"),
         REWORK(20, "返修"),
-        ON_LINE(30, "上线工位");
+        ON_LINE(30, "上线工位"),
+        QUALITY_CHECK(40, "质检工位");
 
         private int value;
         private String description;
@@ -3416,7 +3417,8 @@ public class MesEnumUtil {
         REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单"),
         SPARE_RETURN_REPAIR(140, "客退备件返修"),
-        SEIZE_SEAT_ORDER(150, "占位工单");
+        SEIZE_SEAT_ORDER(150, "占位工单"),
+        SAMPLE_ORDER(160, "样件工单");
 
         private int value;
         private String description;
@@ -3581,11 +3583,11 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_STATUS {
 
+        WAIT_LANDED(5, "待下达"),
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -5309,7 +5311,8 @@ public class MesEnumUtil {
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
         BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
-        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板");
+        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"),
+        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板");
 
         private String code;
         private String description;
@@ -7774,4 +7777,166 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 功能模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_MENU_CODE {
+
+        STATION_MONITOR("STATION_MONITOR", "工位监控");
+
+        private String value;
+        private String description;
+
+        SRC_MENU_CODE(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;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 缺陷类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DEFECT_TYPE_CODE {
+        SCRAPPED("SCRAPPED", "报废"),
+        BACK_SPRAY("BACK_SPRAY", "返喷"),
+        POLISHING("POLISHING", " 抛光"),
+        DETERMIND("DETERMIND", " 待定");
+
+        private String value;
+        private String description;
+
+        DEFECT_TYPE_CODE(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 value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+
+    /**
+     * 物料 物料类型1
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CATEGORY1 {
+        RAW_PART(10, "原材料"),
+        SEMI_FINISHED_PRODUCT(20, "半成品"),
+        FINISHED_PRODUCT(30, "成品");
+
+        private int value;
+        private String description;
+
+        PART_CATEGORY1(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            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 QUERY_GAP_TYPE {
+        MINUTE("MINUTE", "分钟"),
+        HOUR("HOUR", "小时"),
+        DAY("DAY", " 日"),
+        WEEK("WEEK", " 周"),
+        MONTH("MONTH", " 月");
+
+        private String value;
+        private String description;
+
+        QUERY_GAP_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 value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    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 bcf75a5..26bda1b 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
@@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil {
         NORMAL(10, "正常"),
         ONLINE(20, "已上线"),
         OFFLINE(30, "已下线"),
-        CLOSE(40, "已关闭"),
-        ;
+        CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -5545,8 +5544,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCE_CATEGORY_NAME {
 
-        FL("FL", "前右"),
-        FR("FR", "前左"),
+        FL("FL", "前左"),
+        FR("FR", "前右"),
         RL("RL", "后左"),
         RR("RR", "后右");
 
@@ -5576,11 +5575,11 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
-        public static String descriptionOfValue(String description) {
+        public static String descriptionOfValue(String value) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
                 }
             }
             return tmp;
@@ -5704,6 +5703,137 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 功能模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_MENU_CODE {
+
+        STATION_MONITOR("STATION_MONITOR", "工位监控");
+
+        private String value;
+        private String description;
+
+        SRC_MENU_CODE(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;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 弹窗异常提醒记录 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXCEPTION_WINDOW_RECORD_STATUS {
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private Integer value;
+        private String description;
+
+        EXCEPTION_WINDOW_RECORD_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 设备故障等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAKET_LEVEL_CODE {
+        NORMAL(10, "A", "不需要报警和安灯处理"),
+        ALARM_CALL_ANDON(20, "B", "不需要报警,安灯记录"),
+        CALL_ANDON(30, "C", "安灯记录"),
+        FORCE_ANDON(40, "D", "强制ANDON呼叫"),
+        STOPLINE_FORCE_ANDON(50, "E", "系统进行记录并停线,强制ANDON呼叫");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        TAKET_LEVEL_CODE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
 
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
 
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
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 b28e142..dc2fbac 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
@@ -9197,4 +9197,49 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 质检单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS_FLAG {
+        NORMAL(1, "NORMAL", "合格"),
+        ABNORMAL(2, "ABNORMAL", "超时");
+
+        private int value;
+        private String code;
+        private String description;
+
+        QC_STATUS_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
index 0205650..e336469 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@@ -496,6 +496,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于语句
      *
      * @param columnName 列名
@@ -508,6 +520,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于等于语句
      *
      * @param columnName 列名
@@ -520,6 +544,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装long或者int的整数对象成equal语句(不等于)
      *
      * @param columnName 列名
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
index 8d48efd..4120d0e 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@@ -88,7 +88,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         return packBean;
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
index 991b3a1..30cbe36 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
@@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java
new file mode 100644
index 0000000..98a0cd9
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.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 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG")
+@Api("MES_看板自定义参数配置")
+public class MesBoardCustomParamCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883827194753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java
new file mode 100644
index 0000000..f909fde
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java
@@ -0,0 +1,118 @@
+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 : adair
+ * @CreateDate : 2020-10-19 17:19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_BOARD_MAFACT_ASSESSMENT")
+@Api("MES_看板麦格纳评定项")
+public class MesBoardMafactAssessment extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7260899228359202210L;
+
+    @Column(name="BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name="ENG_ADV_QUALITY")
+    @ApiParam("ENG_ADV_QUALITY")
+    private String engAdvQuality;
+
+    @Column(name="MANAGEMENT")
+    @ApiParam("MANAGEMENT")
+    private String manageMent;
+
+    @Column(name="MAT_LOG_SUP")
+    @ApiParam("MAT_LOG_SUP")
+    private String matLogSup;
+
+    @Column(name="MFG_EXC")
+    @ApiParam("MFG_EXC")
+    private String mfgExc;
+
+    @Column(name="QUALITY")
+    @ApiParam("QUALITY")
+    private String quality;
+
+    @Column(name = "EHS")
+    @ApiParam("EHS")
+    private String ehs;
+
+    @Column(name = "COST")
+    @ApiParam("COST")
+    private String cost;
+
+    @Column(name = "HR")
+    @ApiParam("HR")
+    private String hr;
+
+    @Column(name = "JAN")
+    @ApiParam("JAN")
+    private String jan;
+
+    @Column(name = "FEB")
+    @ApiParam("FEB")
+    private String feb;
+
+    @Column(name = "MAR")
+    @ApiParam("MAR")
+    private String mar;
+
+    @Column(name = "APR")
+    @ApiParam("APR")
+    private String apr;
+
+    @Column(name = "MAY")
+    @ApiParam("MAY")
+    private String may;
+
+    @Column(name = "JUN")
+    @ApiParam("JUN")
+    private String jun;
+
+    @Column(name = "JUL")
+    @ApiParam("JUL")
+    private String jul;
+
+    @Column(name = "AUG")
+    @ApiParam("AUG")
+    private String aug;
+
+    @Column(name = "SEP")
+    @ApiParam("SEP")
+    private String sep;
+
+    @Column(name = "OCT")
+    @ApiParam("OCT")
+    private String oct;
+
+    @Column(name = "NOV")
+    @ApiParam("NOV")
+    private String nov;
+
+    @Column(name = "DEC")
+    @ApiParam("DEC")
+    private String dec;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java
index f422957..ffd58b8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java
@@ -56,7 +56,7 @@ public class MesDataWarning extends BaseBean implements Serializable {
     private Integer informMode;
 
     @Lob
-    @Column(name = "INFORM_USER")
+    @Column(name = "INFORM_USER",columnDefinition = "TEXT")
     @ApiParam("通知对象")
     private String informUser;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
index 54d14d1..e7ae500 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@@ -101,6 +101,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("质量状态")
     private Integer qcStatus;
 
+    @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectActionTypeName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java
index 7e86112..d68cdec 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java
@@ -43,9 +43,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable {
     @ApiParam("作业类型")
     private Integer taskType;
 
-    @Column(name = "TASK_CYCLE")
-    @ApiParam("周期(天)")
-    private Integer taskCycle;
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
 
     @Column(name = "LAST_TIME")
     @ApiParam("上一执行时间")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java
new file mode 100644
index 0000000..057933b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :设备计划配置
+ * @Reference :
+ * @Author : Wynne.Lu
+ * @CreateDate : 2020-10-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_TASK_PLAN_CFG")
+@Api("设备周期作业计划配置")
+public class MesEquTaskPlanCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7734079474434307857L;
+
+    @Column(name = "PLAN_CFG_CODE")
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
+
+    @Column(name = "BACKGROUND_COLOR")
+    @ApiParam("显示背景色")
+    private String backgroundColor;
+
+    @Column(name = "COLOR")
+    @ApiParam("字体颜色")
+    private String color;
+
+    @Column(name = "CYCLE")
+    @ApiParam("周期(天)")
+    private Integer taskCycle;
+
+    @Column(name = "DISPLAY_TEXT")
+    @ApiParam("显示文字")
+    private String displayText;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java
new file mode 100644
index 0000000..8c348e2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+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/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_ALERT_CFG")
+@Api("MES_异常提醒配置")
+public class MesExceptionAlertCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895221L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "SRC_MENU_NAME")
+    @ApiParam("来源模块名称")
+    private String srcMenuName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "USER_CODE_GROUP")
+    @ApiParam("提醒人员集合")
+    private String userCodeGroup;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java
new file mode 100644
index 0000000..a904459
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXCEPTION_WINDOW_RECORD")
+@Api("MES_弹窗异常提醒记录")
+public class MesExceptionWindowRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2733956307324895345L;
+
+    @Column(name = "SRC_MENU_CODE")
+    @ApiParam("来源模块代码")
+    private String srcMenuCode;
+
+    @Column(name = "USER_CODE")
+    @ApiParam("提醒人员")
+    private String userCode;
+
+    @Column(name = "MESSAGE_TYPE")
+    @ApiParam("消息类型")
+    private Integer messageType;
+
+    @Column(name = "MESSAGE_HEAD")
+    @ApiParam("提示表头")
+    private String messageHead;
+
+    @Column(name = "MESSAGE_CONTENT")
+    @ApiParam("提示内容")
+    private String messageContent;
+
+    @Column(name = "STATUS")
+    @ApiParam("处理状态")
+    private Integer status;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index 95ae538..4dc2203 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -78,7 +78,7 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CTGY_CODE")
+    @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
index 82bfdf1..ca4851d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@@ -79,10 +79,22 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
     @Column(name = "STOCK_QTY")
     @ApiParam("排程实时库存")
     private Integer stockQty;
 
+    @Column(name = "MIN_GEN_LOT")
+    @ApiParam("最小下达批次")
+    private Integer minGenLot;
+
+    @Transient
+    @ApiParam("已下达箱数")
+    private Integer alreadyLandedNum;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
index cc636ce..e5ac585 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@@ -80,6 +80,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
     @ApiParam(value = "同步的时候是否区分工厂")
     private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    @Column(name = "IGNORE_FIELDS")
+    @ApiParam(value = "同步的时候部分字段不同步")
+    private String ignoreFields;
+
     @Transient
     @ApiParam("同步方式")
     private String syncPatternName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 4cd5e8a..c14092e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -217,6 +217,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Transient
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Transient
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @Transient
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
     public MesProduceSn() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index dd46d65..ad5c91b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description :
@@ -145,6 +146,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private Integer noticeSign = 10;
 
     @Transient
+    @ApiParam("创建时间")
+    private String cdtTruncated;
+
+    @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index 5162f3d..20308b4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index 1a8a0d8..ffc36d6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         return this.qty == null ? 0.0d : this.qty;
     }
 
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java
index 8ddba7c..15600fe 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java
@@ -85,6 +85,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
+    @Lob
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
index b677ede..cd9ba33 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
@@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable {
     @ApiParam("工序代码名称")
     private String processCodeName;
 
+    @Transient
+    @ApiParam("正在生产队列数量")
+    private Integer genningNum;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
index fe879fa..81c5005 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java
@@ -61,6 +61,10 @@ public class MesShift extends BaseBean implements Serializable {
     @ApiParam("班次顺序")
     private Integer shiftSeq;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     public int getShiftSeqVal() {
         return this.shiftSeq == null ? 0 : this.shiftSeq;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java
index ae77fe6..11f933e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java
@@ -48,4 +48,12 @@ public class MesShiftRest extends BaseBean implements Serializable {
     @ColumnDefault("0")
     @ApiParam("休息时长")
     private Double restTimes;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="REST_DESC")
+    @ApiParam("班休描述")
+    private String restDesc;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index e159d8e..6d2a731 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Integer length;
 
     @Transient
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Transient
     @ApiParam("校验内容")
     private String checkContent;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
index 129386f..4ac3d6d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
@@ -77,4 +77,7 @@ public class BoardModel {
 
     @ApiParam("工位状态监控明细")
     private List<MesBoardWorkCell> boardWorkCellList;
+
+    @ApiParam("天津麦格纳看板")
+    private MgnBoardAreaYieldModel mgnBoardAreaYieldModel;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
index 1fdcdda..f1114df 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -19,12 +20,15 @@ public class FutrueTaskModel<T> {
     @ApiParam("实现类")
     private Object futrueTaskService;
 
-    @ApiParam("包装条码")
+    @ApiParam("工位请求bean")
     private StationRequestBean stationRequestBean;
 
-    @ApiParam("过程条码")
+    @ApiParam("产品条码表")
     private MesProduceSn produceSn;
 
+    @ApiParam("产品绑定记录表")
+    private MesProdBindRecord prodBindRecord;
+
     @ApiParam("组织代码")
     private String organizeCode;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
index e632a49..0538b0f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -19,8 +22,8 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("作业类型")
     private Integer taskType;
 
-    @ApiParam("周期(天)")
-    private Integer taskCycle;
+    @ApiParam("计划配置代码")
+    private String planCfgCode;
 
     @ApiParam("上一执行时间")
     private String lastTime;
@@ -67,17 +70,19 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("设备类别名称")
     private String equipmentCategoryName;
 
+    @ApiParam("设备周期计划配置")
+    private MesEquTaskPlanCfg planCfg;
 
     public MesEquTaskPlanModel() {
 
     }
 
-    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
+    public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String planCfgCode, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.taskType = taskType;
-        this.taskCycle = taskCycle;
+        this.planCfgCode = planCfgCode;
         this.lastTime = lastTime;
         this.daysInAdvance = daysInAdvance;
         this.memo = memo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java
new file mode 100644
index 0000000..e40623b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAreaYieldModel {
+
+    @ApiParam("组装")
+    private MgnBoardListModel assembleBoardListModel;
+
+    @ApiParam("涂装")
+    private MgnBoardListModel paintBoardListModel;
+
+    @ApiParam("注塑")
+    private MgnBoardListModel injectMoldBoardListModel;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java
new file mode 100644
index 0000000..e4e28cb
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAssembleCompRateModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("合格率目标值")
+    private String qualifiedRateTargetValue;
+
+    @ApiParam("完成率")
+    private String planCompleteRate;
+
+    @ApiParam("合格率偏差值")
+    private String fpyDeviationValue;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
new file mode 100644
index 0000000..fca607d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MgnBoardListModel {
+
+    @ApiParam("产线产量汇总")
+    private List<MgnBoardYieldModel> centerYieldList;
+
+    @ApiParam("月度产量汇总")
+    private List<MgnBoardYieldModel> monthlyYieldList;
+
+    @ApiParam("当班计划产量")
+    private Double shiftPlanYield;
+
+    @ApiParam("当班实际产量")
+    private Double shiftActualYield;
+
+    @ApiParam("计划完成率")
+    private String planCompleteRate;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java
new file mode 100644
index 0000000..795cfce
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardYieldModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("计划产量")
+    private Double planYield;
+
+    @ApiParam("实际产量")
+    private Double actualYield;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java
new file mode 100644
index 0000000..5f7725a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPaintPolishingReportModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料描述")
+    private String partDesc;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("日期")
+    private String modifyDate;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("抛光数量")
+    private Double polishingQty;
+
+    @ApiParam("返喷标识")
+    private String reverseSprayMark;
+
+    @ApiParam("打磨件物料号")
+    private String polishPartNo;
+
+    @ApiParam("打磨件物料描述")
+    private String polishPartDesc;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index 70b769e..9f15432 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -116,9 +116,21 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @ApiParam("箱条码")
+    private String packageNo;
+
     public QueueOrderModel() {
     }
 
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
+
     public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
         this.queueSeq = queueSeq;
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 3134f85..846880d 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
@@ -196,6 +196,22 @@ public class StationRequestBean implements Serializable {
     @ApiParam("密码")
     private String password;
 
+    public StationRequestBean() {
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+    }
+
+    public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.userInfo = userInfo;
+    }
+
     @Override
     public String toString() {
         return "StationRequestBean{" +
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java
new file mode 100644
index 0000000..4c4035b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/19 15:02
+ * @desc
+ */
+@Data
+public class JisaJphReportModel {
+
+    private Double jphVal;
+
+    private Map<String, Long> detailsMap;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java
new file mode 100644
index 0000000..a8f2e8a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomParamCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardCustomParamCfgRepository extends BaseRepository<MesBoardCustomParamCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java
new file mode 100644
index 0000000..511a124
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardMafactAssessment;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:33
+ * @Modify:
+ **/
+public interface MesBoardMafactAssessmentRepository extends BaseRepository<MesBoardMafactAssessment, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java
new file mode 100644
index 0000000..516002d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskPlanCfgRepository extends BaseRepository<MesEquTaskPlanCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java
new file mode 100644
index 0000000..8f81f87
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.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.MesExceptionAlertCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_异常提醒配置
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionAlertCfgRepository extends BaseRepository<MesExceptionAlertCfg, Long> {
+    
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java
new file mode 100644
index 0000000..81e3258
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.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.MesExceptionWindowRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : MES_弹窗异常提醒记录
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-10-13 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesExceptionWindowRecordRepository extends BaseRepository<MesExceptionWindowRecord, 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 fcc4640..6a6e8bc 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
@@ -9,8 +9,8 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -783,6 +783,8 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode);
         DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
         return packBean;
     }
 
@@ -870,7 +872,7 @@ public class MesHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
         if (!StringUtils.isEmpty(keyData.getObjectCode())) {
             DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean);
@@ -898,6 +900,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * MES 物料关键数据关系信息查询条件封装
      *
@@ -1660,6 +1663,24 @@ public class MesHqlPack {
     }
 
     /**
+     * 设备任务配置  查询条件封装
+     *
+     * @param equTaskPlanCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode);
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean);
+        }
+        if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) {
+            DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES 类型信息查询条件封装
      *
      * @param mesTypeCfg
@@ -2349,6 +2370,7 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
     /**
      * 监听任务查询条件封装
      *
@@ -2410,7 +2432,7 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List<String> orderList, String organizeCode) {
+    public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, List<String> orderList, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean);
@@ -2442,7 +2464,7 @@ public class MesHqlPack {
                     queueJitActual.getCustPointEndDate(),
                     "createDatetime", packBean, true);
         }
-        if(!CollectionUtils.isEmpty(orderList)){
+        if (!CollectionUtils.isEmpty(orderList)) {
             DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean);
         }
         DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean);
@@ -3310,6 +3332,7 @@ public class MesHqlPack {
 
     /**
      * 客户JIT队列下达配置
+     *
      * @param jitIssueCfg
      * @param organizeCode
      * @return
@@ -3336,6 +3359,7 @@ public class MesHqlPack {
 
     /**
      * 条码照片关系
+     *
      * @param snPhotoRelation
      * @param organizeCode
      * @return
@@ -3415,4 +3439,45 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode());
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
+            DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
+                    "modifyDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) {
+        DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 3e7316f..81613fd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -106,7 +106,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;
@@ -122,7 +122,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
index 009c019..ca619c2 100755
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
@@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable {
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
     private Integer minuteDiff;//处理周期(分钟)
-    private String whereHql;//业务查询条件HQL
+    private List<String> fixPartList;//需要特殊处理的零件号集合
+    private String fixPartAndWhere; // 特殊零件号需要加的过滤条件
+    private Integer pageSize;//数据条数
+    private Integer isCheckSn;//是否检查条码存在
+    private Integer erpSyncFlag;//查询SHIPPING表的条件
+
 
     public int getMinuteDiffVal() {
         return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
index a718377..b92fbbe 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
@@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable {
     private static final long serialVersionUID = -6968143574442339454L;
     private WmsMoveDetails details;
     private List<WmsMoveSn> moveSnList;
+
+    public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
+        this.details = details;
+        this.moveSnList = moveSnList;
+    }
+
+    public WmsMoveDetailsModel() {
+    }
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
index 0e1e684..ff464ed 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
@@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable {
     private static final long serialVersionUID = -5490167040159056107L;
     private WmsMoveMaster moveMaster;
     private List<WmsMoveDetailsModel> moveDetails;
+
+    public WmsMoveMasterModel(WmsMoveMaster moveMaster, List<WmsMoveDetailsModel> moveDetails) {
+        this.moveMaster = moveMaster;
+        this.moveDetails = moveDetails;
+    }
+
+    public WmsMoveMasterModel() {
+    }
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
index a805f86..70f38db 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@@ -1,8 +1,11 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,4 +45,14 @@ public class WmsStockFifoModel {
 
     @ApiParam("同批次")
     private boolean fifoSameBatch;
+
+    @ApiParam("FIFO查询获取方式")
+    private Integer fifoSnByLood;
+
+    @ApiParam("物料条码信息")
+    Map<String, List<WmsStockSn>> snMap = new HashMap<>();
+
+    @ApiParam("所有推荐条码信息")
+    List<WmsStockSn> wmsStockSnAllList = new ArrayList<>();
+
 }
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 ff6f6bc..a472e9f 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
@@ -1232,4 +1232,23 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
+
+    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
+
+        DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
+
+        DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
index dac4976..b21f150 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
@@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
+    public String getProcessStateTxt() {
+        return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
+                BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
+    }
+
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")
     private String processTime;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
index 9ff19b8..4caf068 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@@ -121,7 +121,7 @@ public class WmsASNMasterDetails extends BaseBean {
     public Double recQty;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 
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 f24ff0c..4ea43ea 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
@@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
+    @Column(name = "REF_ITEM")
+    @ApiParam("关联行号")
+    public Integer refItem;
+
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
@@ -380,7 +384,7 @@ public class WmsDocMovementDetails extends BaseBean {
     }
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java
index afcb69b..8457f27 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java
@@ -98,4 +98,8 @@ public class WmsDocSoDetails extends BaseBean {
     @ApiParam("业务类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
+
+    @Transient
+    @ApiParam(value = "客户发往地代码")
+    private String custDeliveryCode;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index fda0174..c3f8106 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -237,7 +237,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     private String createDateTime;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index f04cc9c..7f47f40 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 库存移动单主表信息
@@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("总行数")
     private Long itemQty;
 
+    @Transient
+    @ApiParam("存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam("仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam("状态集合")
+    private List<Integer> orderStatusList;
+
+    @Transient
+    @ApiParam("交易类型集合")
+    private List<String> transTypeCodeList;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index 530005d..e9b0b82 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -205,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
     private String transTypeName;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index d97792c..f65a06b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -160,7 +160,7 @@ public class WmsPOMasterDetails extends BaseBean {
     //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; }
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     private transient Integer lockVersion;
 
@@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean {
         this.totalBoxes = totalBoxes.intValue();
         this.qty = qty;
     }
+
+    public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
+                              Double rcQty, Integer itemStatus) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.rcQty = rcQty;
+        this.itemStatus = itemStatus;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 50d0007..15d26d2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -221,6 +221,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;
 
+    @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)")
+    @ApiParam(value = "标准质检时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double stdCheckTime;
+
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
index 8d77ca7..83a6c13 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
@@ -83,7 +83,7 @@ public class WmsQCDetails extends BaseBean {
     public Double rejectQty;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 6dafc68..c6e6c68 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.persistence.Version;
 import java.util.List;
 
 /**
@@ -119,6 +120,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量")
     private Double scrapQty;
 
+    @Version
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
+    @ApiParam(value = "乐观锁", defaultValue = "0")
+    public Integer lockVersion;
+
     @Transient
     @ApiParam(value = "总数量")
     private Double totalQty;
@@ -220,6 +226,12 @@ public class WmsStockQuan extends BaseBean {
         return this.boxQty == null ? 0 : this.boxQty;
     }
 
+
+    public Integer getLockVersion() {
+        return this.lockVersion == null ? 0 : this.lockVersion;
+    }
+
+
     public WmsStockQuan() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 8f33aa6..764d333 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seqNo;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
index edcf03a..7051b98 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
@@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "交易处理组件名称")
     private String tmName;
 
+    @Column(name = "DIRECT")
+    @ApiParam(value = "交易的方向：IN,OUT,MOVE")
+    private String direct;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java
new file mode 100644
index 0000000..c5a9443
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java
@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @质检完成状态模型
+ * @author jason.niu
+ * @date 2020/10/16
+ */
+@Data
+@Api("质检完成状态模型")
+public class WmsQCStatusModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("ASN单号")
+    private String asnOrderNo;
+
+    @ApiParam("质检单号")
+    private String qcOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("标准质检时间（分钟）")
+    private Double stdQcTime;
+
+    @ApiParam("收货时间")
+    private String receiveTime;
+
+    @ApiParam("计划质检完成时间")
+    private String planCompleteTime;
+
+    @ApiParam("实际质检完成实际")
+    private String actualCompleteTime;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("开始时间")
+    private String startDateTime;
+
+    @ApiParam("结束时间")
+    private String endDateTime;
+
+    @ApiParam("零件数量")
+    private Double qty;
+
+    @ApiParam("待质检比例")
+    private Double proportion;
+
+    @ApiParam("标准质检时间")
+    private Integer stdCheckTime;
+
+    public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) {
+        this.asnOrderNo = asnOrderNo;
+        this.qcOrderNo = qcOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.stdQcTime = stdQcTime;
+        this.qty = qty;
+        this.proportion = proportion;
+        this.stdCheckTime = stdCheckTime;
+    }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
index 97dad56..4d30cc8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
@@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
      * @return 配置信息
      */
     WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
+
+    /**
+     * 按照配置代码查询配置信息
+     * @param configCode 配置代码
+     * @return 配置信息
+     */
+    WmsConfig getFirstByConfigCode(String configCode);
 }