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 ca940ea..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
@@ -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-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/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/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> {
+}