diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java
new file mode 100644
index 0000000..846bc5d
--- /dev/null
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 人员model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class AndonUserModel extends BaseBean {
+
+    @ApiParam(value ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="员工编号")
+    private String userEmpNo;
+
+}
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 3d4b375..1dba3c4 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
@@ -2559,10 +2559,8 @@ public class CommonEnumUtil {
         MASTER,NODE
     }
 
-
-
     /**
-     * 业务表：库存条码状态
+     * 会话模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SESSION_MODE {
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index f6eb1ae..76f1b9b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -1331,4 +1331,49 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 用户定制化配置类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_CUSTOMIZE_CONFIG_TYPE {
+        WEB_TABLE_SHOW_COL(10, "前端表格显示列");
+
+        private int value;
+        private String description;
+
+        USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+
+        public static Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }
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 4ee916c..50c47c9 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
@@ -1968,7 +1968,9 @@ public class MesEnumUtil {
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
-        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
+        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
+        MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
+        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
 
         private int value;
         private String service;
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 1d26919..2d69e23 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
@@ -4067,7 +4067,8 @@ public class MesPcnEnumUtil {
         JUMP_STEP(20, "跳过工步"),
         JUMP_STATE(30, "跳过状态点"),
         ABNORMAL_DEDUCTION(40, "扣减异常"),
-        REDO_STATION(50, "工位重做");
+        REDO_STATION(50, "工位重做"),
+        RELEASE(60, "放行继续");
 
         private int value;
         private String description;
@@ -4673,6 +4674,25 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_BUSI_TYPE {
+        AGV_EMERGENCY_STOP(10, "紧急停止"),
+        AGV_EMERGENCY_RESET(20, "急停复位"),
+        AGV_DELAY_HELP(30, "延时帮助");
+
+        private int value;
+        private String description;
+
+        PLC_BUSI_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     /**
      * mes设备状态
      */
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index afd81eb..3b2f5a2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -61,6 +61,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     public void detachObject(T t){
+        if (t == null) {
+            return;
+        }
         entityManager.detach(t);
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index 1b57440..807a90b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -135,4 +135,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "WORK_ORDER_NO")
     @ApiParam("生产工单号")
     private String workOrderNo;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus = 10;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index d43d5af..43c3535 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -88,7 +88,7 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
-    private String busiType;
+    private Integer busiType;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java
index 419799b..d648c10 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java
@@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
     private String prodCfgTypeName;
+
+    @Column(name = "PCT_VERSION")
+    @ApiParam("项目版本")
+    private String pctVersion;
+
+    @Column(name = "DWG_VERSION")
+    @ApiParam("图纸版本")
+    private String dwgVersion;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
index e2e4915..738bfd3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
@@ -48,6 +48,10 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @ApiParam("料箱条码")
     private String partSn;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     @Column(name = "TARGET_PASS_RATE")
     @ApiParam("目标合格率")
     private Double targetPassRate;
@@ -55,4 +59,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @Column(name = "PRIORITY_ORDER")
     @ApiParam("优先级顺序")
     private Integer priorityOder = 0;
+
+    @ApiParam("物料名称")
+    private String partName;
 }
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 44080c9..92c400f 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
@@ -152,6 +152,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
index fb90102..f439e4f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
@@ -126,6 +126,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("托盘号")
     private String trayNo;
 
+    @Column(name = "VIN_CODE")
+    @ApiParam("Vin")
+    private String vinCode;
+
     @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
index 5a00f18..e1066b7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.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;
 
 /**
@@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "OPTION_TYPE")
     @ApiParam("选配类型")
     private Integer optionType;
+
+    @Transient
+    @ApiParam("物料类型3")
+    private String categoryCode3;
 }
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 16df925..efeeefb 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
@@ -184,6 +184,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("队列类型")
     private Integer queueType;
 
+    @Transient
+    @ApiParam("等级名称")
+    private String gradeName;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
index 7642f27..2249e46 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
@@ -85,4 +85,8 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @Column(name = "RECIPE_SEQ")
     @ApiParam("配方序号")
     private String recipeSeq;
+
+    @Column(name = "CHANGE_NO")
+    @ApiParam("change No")
+    private String changeNo;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
index 9a5b3a8..dc8fe48 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java
@@ -1,22 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 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.AllArgsConstructor;
 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.Table;
-import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description : 设备任务通知人员model
@@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean {
     @ApiParam(value ="账户ID")
     private Long userInfoId;
 
-    @Column(name="USER_NAME_RDD")
     @ApiParam(value ="用户名称" , access ="账号名称")
     private String userName;
 
-    @Column(name="USER_LOGIN_NAME")
     @ApiParam(value ="登陆名称" , access ="登陆名称")
     private String userLoginName;
 
-    @Column(name="USER_EMAIL")
     @ApiParam(value ="邮箱" , access ="邮箱")
     private String userEmail;
 
-    @Column(name="USER_PHONE")
     @ApiParam(value ="手机号" , access ="手机号")
     private String userPhone;
 
-    @Column(name="USER_STATUS")
     @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
     private Integer userStatus;
 
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 f4b82d7..b71500a 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
@@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     public QueueOrderModel() {
     }
 
@@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable {
     //getWaitQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
-                           String vinCode) {
+                           String vinCode, String formulaContent, String queueGroupNo) {
         this.serialNumber = serialNumber;
         this.id = id;
         this.queueSeq = queueSeq;
@@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSnMgn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
-                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) {
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
         this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
@@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable {
         this.serialNumber = serialNumber;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.vinCode = vinCode;
+        this.formulaContent = formulaContent;
+        this.queueGroupNo = queueGroupNo;
     }
 
     //getAlreadyQueueOrderModelNoSn
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
index 2ac3a02..7f07cff 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
@@ -108,4 +108,21 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品配置名称")
     private String prodCfgCodeName;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("产品位置")
+    private String produceCategoryCode;
+    @ApiParam("结果")
+    private String result;
+    @ApiParam("项目版本")
+    private String pctVersion;
+    @ApiParam("图纸版本")
+    private String dwgVersion;
+    @ApiParam("班次名称")
+    private String shiftName;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+    @ApiParam("产品位置名称")
+    private String produceCategoryName;
+
 }
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 7acc4df..b5c5b21 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
@@ -2012,6 +2012,9 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+        }
         if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
@@ -2206,6 +2209,9 @@ public class MesHqlPack {
         if (mesProduceSnTravel.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean);
+        }
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
             DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
         }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java
new file mode 100644
index 0000000..68a5917
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java
@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_CUSTOMIZE_CONFIG")
+@ApiModel(value="用户定制化配置",description = "用户定制化配置")
+public class SysUserCustomizeConfig extends BaseBean {
+
+    private static final long serialVersionUID = -3757585990009089233L;
+
+    @Column(name="USER_ID")
+    @ApiModelProperty(value ="用户id" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name="CUSTOMIZE_CONFIG_TYPE")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class)
+    private Integer customizeConfigType;
+
+    public String getCustomizeConfigTypeTxt() {
+        return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType);
+    }
+
+    @Column(name="CONFIG_KEY")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    private String configKey;
+
+    @Column(name="CONFIG_VALUE")
+    @ApiModelProperty(value ="配置值" , example = "-1")
+    private String configValue;
+
+    public String getRedisKey(String keyPrefix) {
+        String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey();
+        if (StringUtils.isNotBlank(keyPrefix)) {
+            return keyPrefix + ":" + redisKey;
+        } else {
+            return redisKey;
+        }
+    }
+
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java
new file mode 100644
index 0000000..5093383
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig;
+
+/**
+ * @Description : 用户定制化配置
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:34
+ * @Modify:
+ **/
+public interface SysUserCustomizeConfigRepository extends BaseRepository<SysUserCustomizeConfig, Long> {
+}
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 e00e6e9..0da42ea 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
@@ -1149,4 +1149,24 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+    public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }
\ No newline at end of file
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 85cb2b8..212b746 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
@@ -103,6 +103,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "计划时间")
     private String planTime;
 
+    @Transient
+    @ApiParam(value = "超时时间(单位:分钟)")
+    private Integer timeOut;
+
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")
     private String srcNo;
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 ac5fe1a..ca27941 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
@@ -290,6 +290,11 @@ public class WmsPart extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
     private Integer frequency;
 
+    @Column(name = "LIMIT_QUALITY_DAYS")
+    @ApiParam(value = "卡控周期", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer limitQualityDays;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();