diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
index f7fc675..05c9462 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
@@ -126,6 +126,8 @@ public class AndonHqlPack {
     public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
@@ -399,4 +401,59 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 安灯类型查询条件封装
+     * @param andonAlarmType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonAlarmType, result);
+
+        return result;
+    }
+
+    /**
+     * 安灯状态查询条件封装
+     * @param andonStatus
+     * @return
+     */
+    public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonStatus, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON通知方式查询条件封装
+     * @param andonResponse
+     * @return
+     */
+    public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(andonResponse, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON通知对象查询条件封装
+     * @param andonResponseObject
+     * @return
+     */
+    public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
+        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
+
+        getStringBuilderPack(andonResponseObject, result);
+
+        return result;
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 1c0f803..389a797 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -56,7 +56,7 @@ public class AndonEnumUtil {
         SECOND_APPROVAL("20","二级审批"),
         THIRD_APPROVAL("30","三级审批"),
         FOUTH_APPROVAL("40","四级审批"),
-        FINISH("100","已审批");
+        FINISH("60","已审批");
 
         private String value;
         private String description;
@@ -200,18 +200,18 @@ public class AndonEnumUtil {
 
     /**
      * 按灯动作标志
-     * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批
+     * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_FLAG{
 
         CALL_ACTION("10","呼叫动作"),
         SIGN_ACTION("20","签到动作"),
-        CANCEL_ACTION("30", "撤销动作"),
-        RESOLVE_ACTION("40", "解决动作"),
-        SHIFG_CALL_ACTION("50", "转呼动作"),
-        COMMIT_ACTION("60","提交动作"),
-        PASS_ACTION("70","审批动作");
+        RESOLVE_ACTION("30", "解决动作"),
+        CANCEL_ACTION("40", "撤销动作"),
+        COMMIT_ACTION("50","提交动作"),
+        PASS_ACTION("60","审批动作"),
+        SHIFG_CALL_ACTION("70", "转呼动作");
 
         private String value;
         private String description;
@@ -269,6 +269,46 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 通知级别
+     * 10 - 一级，20 - 二级，30 - 三级，40 - 四级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_LEVEL{
+
+        FIRST(10,"一级"),
+        SECOND(20,"二级"),
+        THIRD(30,"三级"),
+        FOUTH(40,"四级");
+
+        private int value;
+        private String description;
+
+        NOTICE_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index c928c56..e620424 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -16,8 +16,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FORM_TABLE_TYPE {
-        TABLE(1, "table", "表"),
-        VIEW(2, "view", "视图");
+        TABLE(1, "TABLE", "表"),
+        VIEW(2, "VIEW", "视图");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
index 4e27e99..01c97de 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean {
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="虚拟属性名称")
+    @ApiParam(value ="显示名称")
     private String propertyName;
 
+    @Lob
+    @Column(name="PROPERTY_CODES")
+    @ApiParam(value ="属性代码")
+    private String propertyCodes;
+
     @Column(name="PROPERTY_TYPE")
     @ApiParam(value ="属性类型")
     private Integer propertyType;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
new file mode 100644
index 0000000..b8830ef
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CONFIG")
+@Api("mes配置表")
+public class MesConfig extends BaseBean {
+    @Column(name="CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name="CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name="CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name="CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgkey;
+
+    @Column(name="CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name="CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
index b8a308c..8a7fdfc 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean {
     public int getPrintStatusVal() {
         return this.printStatus == null ? 0 : this.printStatus;
     }
+
+    @Override
+    public String toString() {
+        return "MesProduceSn{" +
+                "serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", qty=" + qty +
+                ", qcStatus=" + qcStatus +
+                ", snStatus=" + snStatus +
+                ", printCount=" + printCount +
+                ", printStatus=" + printStatus +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", nextProcessCode='" + nextProcessCode + '\'' +
+                ", inWorkCenterTime='" + inWorkCenterTime + '\'' +
+                ", outWorkCenterTime='" + outWorkCenterTime + '\'' +
+                ", shippingTime='" + shippingTime + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", custSn='" + custSn + '\'' +
+                ", custPartNo='" + custPartNo + '\'' +
+                ", packageSn='" + packageSn + '\'' +
+                ", resultMsg='" + resultMsg + '\'' +
+                '}';
+    }
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
index 71e5b98..e5b4ee2 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
@@ -27,5 +27,108 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_PRODUCE_SN_TRAVEL")
 @Api("产品条码履历表")
-public class MesProduceSnTravel extends MesProduceSn {
+public class MesProduceSnTravel extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name="SN_STATUS")
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Column(name="PRINT_COUNT")
+    @ApiParam("打印次数")
+    private Integer printCount;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="NEXT_PROCESS_CODE")
+    @ApiParam("下一工序代码")
+    private String nextProcessCode;
+
+    @Column(name="IN_WC_TIME")
+    @ApiParam("进产线时间")
+    private String inWorkCenterTime;
+
+    @Column(name="OUT_WC_TIME")
+    @ApiParam("出产线时间")
+    private String outWorkCenterTime;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    private String shippingTime;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="CUST_SN")
+    @ApiParam("客户条码")
+    private String custSn;
+
+    @Column(name="CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name="PACKAGE_SN")
+    @ApiParam("包装条码")
+    private String packageSn;
+
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getQcStatusVal() {
+        return this.qcStatus == null ? 0 : this.qcStatus;
+    }
+
+    public int getSnStatusVal() {
+        return this.snStatus == null ? 0 : this.snStatus;
+    }
+
+    public int getPrintCountVal() {
+        return this.printCount == null ? 0 : this.printCount;
+    }
+
+    public int getPrintStatusVal() {
+        return this.printStatus == null ? 0 : this.printStatus;
+    }
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
index d329bba..455c6be 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@@ -87,4 +87,13 @@ public class MesQueueOrderDetail extends BaseBean {
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }
+
+    public MesQueueOrderDetail() {
+    }
+
+    public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) {
+        this.queueSeq = queueSeq;
+        this.seq = seq;
+        this.serialNumber = serialNumber;
+    }
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
index 0b2bdb3..dd2c7da 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
@@ -33,9 +33,17 @@ public class MesWorkCellPoint extends BaseBean {
 
     @Column(name = "QUEUE_SEQ")
     @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;
 
     @Column(name = "QUEUE_DETAIL_SEQ")
     @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java
new file mode 100644
index 0000000..ad0541e
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java
@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-06-03-11:44
+ * @Modify:
+ **/
+
+public class TorqueModel {
+    private Long id;
+
+    private Double upperLimit;
+
+    private Double lowerLimit;
+
+    private Double torqueValue;
+
+    private boolean ok;
+
+    private String color;
+
+    public boolean isOk() {
+        return ok;
+    }
+
+    public void setOk(boolean ok) {
+        this.ok = ok;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getUpperLimit() {
+        return upperLimit;
+    }
+
+    public void setUpperLimit(Double upperLimit) {
+        this.upperLimit = (upperLimit == null ? 0 : upperLimit);
+    }
+
+    public Double getLowerLimit() {
+        return lowerLimit;
+    }
+
+    public void setLowerLimit(Double lowerLimit) {
+        this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit);
+    }
+
+    public Double getTorqueValue() {
+        return torqueValue;
+    }
+
+    public void setTorqueValue(Double torqueValue) {
+        this.torqueValue = (torqueValue == null ? 0 : torqueValue);
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java
new file mode 100644
index 0000000..6b43fa6
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Repository
+public interface MesConfigRepository extends BaseRepository<MesConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java
new file mode 100644
index 0000000..6162bc0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CONFIG")
+@Api("mes配置表")
+public class MesConfig extends BaseBean {
+    @Column(name="CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name="CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name="CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name="CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgkey;
+
+    @Column(name="CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name="CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
index 7b4ac33..1ada426 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.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;
 
 /**
  * @Description:
@@ -51,6 +52,14 @@ public class MesKpData extends BaseBean {
     @ApiParam("数据下限")
     private Double lowerLimit;
 
+    @Transient
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Transient
+    @ApiParam("是否在范围之内")
+    private Boolean ok;
+
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
index 603ff15..7343feb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
@@ -37,9 +37,17 @@ public class MesWorkCellPoint extends BaseBean {
 
     @Column(name = "QUEUE_SEQ")
     @ApiParam("队列主表序号")
-    private String queueSeq;
+    private Double queueSeq;
 
     @Column(name = "QUEUE_DETAIL_SEQ")
     @ApiParam("队列明细表序号")
-    private String queueDetailSeq;
+    private Double queueDetailSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0 : this.queueSeq;
+    }
+
+    public double getQueueDetailSeqVal() {
+        return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesConfigRepository.java
new file mode 100644
index 0000000..136be80
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesConfigRepository.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.MesConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Repository
+public interface MesConfigRepository extends BaseRepository<MesConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
index 895d0e0..3e8eb11 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
@@ -92,7 +92,7 @@ public class SwebPurchaseOrderSn extends BaseBean {
     private String checkCode;
 
     @Column(name = "STOVE_NO")
-    @ApiParam(value = "炉批号")
+    @ApiParam(value = "特殊批号")
     private String stoveNo;
 
     @Column(name = "BATCH_NO")
@@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
     private Double weight;
 
     @Transient
+    @ApiParam(value = "合同号")
+    private String refNo;
+
+    @Transient
     @ApiParam(value = "是否可编辑（前端使用）")
     private boolean isSet = false;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
index ccbbfea..13b8429 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
@@ -11,6 +11,8 @@ 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 : 工厂仓库
@@ -40,4 +42,8 @@ public class WareHouse extends BaseBean {
     @ApiParam("仓库地址")
     public String address;
 
+    @Transient
+    @ApiParam(value ="存储区列表")
+    private List<WmsZones> zoneList;
+
 }
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 28ddb48..cf9215a 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
@@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
+    @Column(name="CSN")
+    @ApiParam("客户条码")
+    public String csn;
+
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
index 0704421..a7f3b48 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@@ -11,6 +11,8 @@ 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 :存储区
@@ -44,6 +46,14 @@ public class WmsZones extends BaseBean {
     @ApiParam(value = "存储区名称")
     private String zoneName;
 
+    @Column(name = "PARENT_ZONE_NO")
+    @ApiParam(value = "父级存储区", example ="1")
+    private String parentZoneNo;
+
+    @Column(name = "IS_SON_NODE")
+    @ApiParam(value = "是否子节点")
+    private Integer isSonNode;
+
     @Column(name = "IS_PM")
     @ApiParam(value = "零件级管控" , example = "2")
     private Integer isPm;
@@ -76,4 +86,7 @@ public class WmsZones extends BaseBean {
     @ApiParam(value = "校验先进先出" , example = "1")
     private Integer checkFifo;
 
+    @Transient
+    @ApiParam(value ="子存储区列表")
+    private List<WmsZones> childList;
 }