diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 004fb69..bc7071b 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
index 4c78ea1..c4e77a0 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
@@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 import java.io.Serializable;
 
 /**
@@ -29,57 +25,57 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name="ANDON_BROADCAST")
+@Table(name = "ANDON_BROADCAST")
 @Api("安灯广播")
 public class AndonBroadCast extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -5383684820100076411L;
 
-    @Column(name="DEVICE_NUM")
+    @Column(name = "DEVICE_NUM")
     @ApiParam("广播设备编号")
     private String targetIds;
 
-    @Column(name="GROUP_NO")
+    @Column(name = "GROUP_NO")
     @ApiParam("分组号")
     private String groupNo;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
-    @Column(name="DEVICE_DEC")
+    @Column(name = "DEVICE_DEC")
     @ApiParam("广播设备名称")
     private String deviceDec;
 
-    @Column(name="DEVICE_IP")
+    @Column(name = "DEVICE_IP")
     @ApiParam("广播设备ip")
     private String deviceIp;
 
-    @Column(name="PLAY_INTERVAL")
+    @Column(name = "PLAY_INTERVAL")
     @ApiParam("播放间隔")
     private Integer playInterval = 0;
 
-    @Column(name="PLAY_PRIORITY")
+    @Column(name = "PLAY_PRIORITY")
     @ApiParam("播放优先级")
     private Integer playPriority = 500;
 
-    @Column(name="VOLUME")
+    @Column(name = "VOLUME")
     @ApiParam("播放音量")
     private Integer volume;
 
-    @Column(name="TTS_NAME")
+    @Column(name = "TTS_NAME")
     @ApiParam("广播语音引擎")
     private String voiceEngine;
 
-    @Column(name="TEXT_ENCODE")
+    @Column(name = "TEXT_ENCODE")
     @ApiParam("广播内容编码格式")
     private String textEncode = "UTF-8";
 
-    @Column(name="PLAY_SPEED")
+    @Column(name = "PLAY_SPEED", columnDefinition = "decimal(18,8)")
     @ApiParam("播放语速")
-    private Integer playSpeed = 0;
+    private Double playSpeed = 0d;
 
-    @Column(name="PLAY_TIME")
+    @Column(name = "PLAY_TIME")
     @ApiParam("播放循环次数")
     private Integer playTime = 1;
 }
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 650ee5b..f902a7c 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 1e17935..d2521de 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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 aeaa624..f41a6f6 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
@@ -1978,6 +1978,21 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public String getJDBCUrlToMysql(String database, String host, Integer port) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQLBy8x(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                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;
+        }
+
         public String getJDBCUrl(String database, String host, Integer port, String instanceName) {
             if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
                 return getJDBCUrlMySQL(database, host, port);
@@ -2020,6 +2035,16 @@ public class CommonEnumUtil {
                     "&serverTimezone=CST";
         }
 
+        //MySQL8.x时区设置
+        private String getJDBCUrlMySQLBy8x(String database, String host, Integer port) {
+            return "jdbc:mysql://" + host + ":" + port + "/" + database +
+                    "?autoReconnect=true" +
+                    "&useSSL=false" +
+                    "&characterEncoding=utf-8" +
+                    "&allowPublicKeyRetrieval=true" +
+                    "&serverTimezone=Asia/Shanghai";
+        }
+
         private String getJDBCUrlOracle(String database, String host, Integer port) {
             return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database;
         }
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 f175d1f..d4d2787 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
@@ -3747,7 +3747,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_REQUEST_BEAN_CMD {
         JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
-        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"),
+        FORCE_JUMP_PROCESS(30, "FORCE_JUMP_PROCESS", "通过DOSCAN强制跳过工序");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 37b8a51..b599490 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index dc13374..9f5788e 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 6df1cc2..ae38208 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 123fdc9..1674a47 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index fdcf6e3..04b40d4 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index d266163..6854e65 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 54c8306..bbe0ff9 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java
new file mode 100644
index 0000000..67326d7
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java
@@ -0,0 +1,37 @@
+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.*;
+
+/**
+ * @Description : 物料校验客户标签关系
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 13:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL")
+@Api("IF_物料校验客户标签关系")
+public class IfPartCheckCustomerLabel extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否校验")
+    private Integer isCheck;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java
new file mode 100644
index 0000000..fdb6abf
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java
@@ -0,0 +1,37 @@
+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.*;
+
+/**
+ * @Description : 物料校验客户标签明细
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 13:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL_DETAIL")
+@Api("IF_物料校验客户标签明细")
+public class IfPartCheckCustomerLabelDetail extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("托条码")
+    private String packageNo;
+
+    @Column(name = "CUSTOMER_LABEL")
+    @ApiParam("客户标签")
+    private String customerLabel;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
index 66b686c..99331e1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
@@ -43,7 +43,7 @@ public class MesEquTaskNotifyCfg extends BaseBean implements Serializable {
     private Integer notifyType;
 
     @Column(name="NOTIFY_CONDITION")
-    @ApiParam("通知条件（小时）")
+    @ApiParam("通知条件（分钟）")
     private Integer notifyCondition;
 
     @Column(name="NOTIFY_OBJECT_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java
new file mode 100644
index 0000000..9e8a774
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java
@@ -0,0 +1,114 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description :物料关键数据关系记录
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_KP_DATA_RECORD")
+@Api("物料关键数据关系记录")
+public class MesKpDataRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8243089140216459544L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name = "KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name = "KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TORQUE_GROUP")
+    @ApiParam("扭矩组")
+    private String torqueGroup;
+
+    @Column(name = "TORQUE_GROUP_SEQ")
+    @ApiParam("扭矩组顺序")
+    private Integer torqueGroupSeq;
+
+    @Column(name = "TORQUE")
+    @ApiParam("扭矩项")
+    private String torque;
+
+    @Column(name = "TORQUE_SEQ")
+    @ApiParam("扭矩项顺序")
+    private Integer torqueSeq;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("JOB_ID")
+    private Integer jobId;
+
+    @Column(name = "LAST_TIGHTENING_ID")
+    @ApiParam("最后一次扭矩id")
+    private Long lastTighteningId;
+
+    @Column(name = "TORQUE_VALUE")
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Column(name = "RESULT")
+    @ApiParam("采集结果")
+    private Integer result;
+
+    @Column(name = "ACTUAL_NUM")
+    @ApiParam("实采个数")
+    private Integer actualNum;;
+
+    public double getKeyDataCountVal() {
+        return this.keyDataCount == null ? 0 : this.keyDataCount;
+    }
+
+    public double getUpperLimitVal() {
+        return this.upperLimit == null ? 0.0d : this.upperLimit;
+    }
+
+    public double getLowerLimitVal() {
+        return this.lowerLimit == null ? 0.0d : this.lowerLimit;
+    }
+}
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 0b930bf..235efb2 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
@@ -146,6 +146,14 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("版本号")
     private String versionNo;
 
+    @Column(name = "VARIANT")
+    @ApiParam("variant")
+    private String variant;
+
+    @Column(name = "PACK_MOTH")
+    @ApiParam("packmoth")
+    private String packMoth;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java
new file mode 100644
index 0000000..ca4c442
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java
@@ -0,0 +1,52 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description: 特殊物料
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:10 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PART_CAR_MODEL")
+@Api("车型零件关系表")
+public class MesPartCarModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4039513102671811231L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam("车型流水号")
+    private String serialNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java
new file mode 100644
index 0000000..cc61e36
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSpecific.java
@@ -0,0 +1,60 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description: 特殊物料
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:10 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PART_SPECIFIC")
+@Api("特殊物料关系信息")
+public class MesPartSpecific extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4039513102671816031L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("父零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("父零件名称")
+    private String partName;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子零件名称")
+    private String itemPartName;
+
+    @Column(name = "TORQUE_SN")
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}
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 32ce910..00a3cce 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
@@ -170,6 +170,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Transient
+    @ApiParam("配方项")
+    private String recipeItem;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
index 4852d46..de042b5 100644
--- 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
@@ -27,13 +27,13 @@ public class MgnBoardListModel {
      * 开班时间到当前时间按小时累计计划数量
      */
     @ApiParam("每小时计划产量")
-    private Double minPlanYield;
+    private Double minPlanYield;//
 
     /**
      * 开班时间到当前时间按小时累计实际数量
      */
     @ApiParam("每小时实际产量")
-    private Double minActualYield;
+    private Double minActualYield;//
 
     @ApiParam("计划完成率")
     private String planCompleteRate;
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 dcfc6b9..06aec88 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
@@ -91,6 +91,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
+    @ApiParam("强制跳过工序")
+    private Boolean forceJumpProcess = false;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.java
new file mode 100644
index 0000000..b374e18
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.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.IfPartCheckCustomerLabelDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 15:41
+ * @Modify:
+ **/
+@Repository
+public interface IfPartCheckCustomerLabelDetailRepository extends BaseRepository<IfPartCheckCustomerLabelDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.java
new file mode 100644
index 0000000..0011080
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.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.IfPartCheckCustomerLabel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 15:39
+ * @Modify:
+ **/
+@Repository
+public interface IfPartCheckCustomerLabelRepository extends BaseRepository<IfPartCheckCustomerLabel, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java
new file mode 100644
index 0000000..78426ac
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRecordRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKpDataRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/25 2:00 PM
+ * @Modify:
+ */
+public interface MesKpDataRecordRepository extends BaseRepository<MesKpDataRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java
new file mode 100644
index 0000000..d9f15f2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCarModelRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartCarModel;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:13 PM
+ * @Modify:
+ */
+public interface MesPartCarModelRepository extends BaseRepository<MesPartCarModel, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java
new file mode 100644
index 0000000..6770e91
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSpecificRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartSpecific;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:13 PM
+ * @Modify:
+ */
+public interface MesPartSpecificRepository extends BaseRepository<MesPartSpecific, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java
index 9413a87..423e06c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description:
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
  * @CreateDate:2019\10\9 0009 11:16
  * @Modify:
  **/
+@Repository
 public interface MesPlcRepository extends BaseRepository<MesPlc, 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 508ef73..5ac24b1 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
@@ -3791,4 +3791,21 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPartCarModel(MesPartCarModel mesPartCarModel) {
+        DdlPackBean packBean = getAllBaseData(mesPartCarModel.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPartCarModel.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartCarModel.getVehicleCode(), "vehicleCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartCarModel.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesPartSpecific(MesPartSpecific mesPartSpecific) {
+        DdlPackBean packBean = getAllBaseData(mesPartSpecific.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPartSpecific.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesPartSpecific.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartSpecific.getSpecificSn(), "specificSn", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 190efa7..be533a6 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 5896851..14e8567 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index aa3dd42..102ab0e 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 80498fc..864c56a 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml
index 7f46931..071fe58 100644
--- a/modules/i3plus-pojo-screen/pom.xml
+++ b/modules/i3plus-pojo-screen/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 076f15a..e755225 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 1351ed3..194f0cb 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 67b0bff..60543fe 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 15d36cd..bdc4cab 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 48cbd48..e57347e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>