diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index bc7071b..57e0a76 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index f902a7c..5730ec1 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
index 3a8b8ff..b22eb80 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
@@ -109,6 +109,8 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer delayTime;
 
+    private transient Date lastBegin;
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
index 6a96b97..a4091af 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
@@ -49,8 +49,16 @@ public class HeuristicRule extends BaseRule {
     @FieldAnnotation(defaultValue = "true")
     private Boolean insertIdle;
 
+    @Column(name="WAITING_TIME")
+    @ApiParam(value ="最大等待时间")
+    private String waitingTime;
+
     @Column(name="BATCH_PERIOD")
     @ApiParam(value ="组炉区间")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
+
+    @Column(name="REVER_FLUSH_PLAN")
+    @ApiParam(value ="逆向刷新计划")
+    private Boolean reverFlushPlan = false;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java
index 8368fd4..87d59be 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java
@@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS {
     private static final long serialVersionUID = -1869359887027950540L;
 
     @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="工作编码")
     @FieldAnnotation(relation = "Work")
     private Long workId;
 
@@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS {
     }
 
     @JsonBackReference
-    public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
+    public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
index 28e424e..eb2a239 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
+import cn.estsh.i3plus.pojo.aps.model.RuleDetailModel;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -44,6 +46,9 @@ public class RuleGroup extends BaseAPS {
     @ApiParam(value ="当前执行的规则名称")
     private transient String curDetailName;
 
+    @FieldAnnotation(property = false)
+    private transient RuleDetailModel model;
+
     @JsonBackReference
     public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
index be15e07..7fce6f7 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
@@ -63,6 +63,11 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="分割余数")
     private Double remainder;
 
+    @Column(name="MIN_SPACE_TIME")
+    @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String minSpaceTime;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index c7693dd..866ebe5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -164,6 +166,9 @@ public class Work extends BaseAPS {
     @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
+    @ApiParam(value ="工作排序顺序")
+    private  Integer workSeqNumber;
+
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
 
@@ -264,4 +269,7 @@ public class Work extends BaseAPS {
         this.originWorkId = work != null ? work.getId() : 0;
         BeanRelation.set(this, EWork.OriginWork, work);
     }
+
+    @JsonBackReference
+    public List<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index decabfa..4125b4d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -19,6 +19,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作计划
@@ -119,6 +120,12 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="打印时间")
     private Date printTime;
 
+    @ApiParam(value ="生产结束时间")
+    @FieldAnnotation(display = false)
+    @Transient
+    @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
+    private Date resProduceEnd;
+
     @Transient
     @FieldAnnotation(property = false)
     private boolean hasCominbed = false;
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
index a5caf9e..35f5add 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
@@ -25,12 +25,12 @@ public class DateDuration {
 
     public static final double PRECISION = 0.00001;
     private String value;
-    private int time = 0;
+    private long time = 0;
     private double rate = 0.0;
     private boolean bValid = false;
     private int unit = 0;
 
-    public DateDuration(int value) {
+    public DateDuration(long value) {
         this.time = value;
     }
 
@@ -65,7 +65,7 @@ public class DateDuration {
      * 对于无效的时间区间，返回0。单位为秒。
      * @return
      */
-    public int getTime() {
+    public long getTime() {
         return this.time;
     }
 
@@ -73,7 +73,7 @@ public class DateDuration {
      * 设置新的时间区间。
      * @return
      */
-    public void setTime(int time) {
+    public void setTime(long time) {
         this.time = time;
     }
 
@@ -144,7 +144,7 @@ public class DateDuration {
      * @param amount
      * @return
      */
-    public int getTime(double amount) {
+    public long getTime(double amount) {
         if (amount < PRECISION)
             return getTime();
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
index 70d265e..25c90c3 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
@@ -15,4 +15,5 @@ public enum EWork {
     SpecifyResource, // 指定资源
     DynSplitWorks, // 动态拆分后的工作
     OriginWork, // 动态拆分前的工作
+    EvaluateResult, // 资源评估结果
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
new file mode 100644
index 0000000..6c0b455
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class RuleDetailModel {
+    @ApiParam(value ="主执行进度")
+    private Integer mainProcess = 0;
+
+    @ApiParam(value ="总规则数")
+    private Integer mainSize = 0;
+
+    @ApiParam(value ="当前执行进度")
+    private Integer curProcess = 0;
+
+    @ApiParam(value ="总行数")
+    private Integer totalSize = 0;
+
+    @ApiParam(value ="进度消息")
+    private String processMsg = "";
+
+    @ApiParam(value ="进度消息明细")
+    private String subMsg = "";
+
+    private Boolean finish = false;
+
+    @ApiParam(value ="异常消息")
+    private String exception = "";
+
+    public void addProcess() {
+        this.curProcess += 1;
+    }
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
index 7344176..f3df9c1 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
@@ -11,6 +11,7 @@ import lombok.Data;
  **/
 @Data
 public class RuleGroupProgress {
+    private Integer mainProgress;
     private String message;
     private Integer progress;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java
index 6c4e2ba..f7736e5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java
@@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool;
 
 public class APSDoubleTool {
     public static boolean isZero(Double value) {
-        return (value == null) || (value > -0.000001 && value < 0.000001);
+        return (value == null) || (value > -0.0000001 && value < 0.0000001);
     }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml
index 6b7a99d..87c0210 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="InterMediateResult">
-    <Relation field="Work" name="Work" type="MULTI_TO_ONE">
-    </Relation>
     <Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
     </Relation>
     <Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
index da892ce..5663143 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
@@ -22,4 +22,6 @@
     </Relation>
     <Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
     </Relation>
+    <Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 0272934..77a43d2 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 0d7160b..ec2bba5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -444,6 +444,7 @@ public class ApsEnumUtil {
         PRODUCE_TIME("PRODUCE_TIME", "生产时间"),
         POST_SET_TIME("POST_SET_TIME", "后设置时间"),
         WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"),
+        WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"),
         RES_BALANCE("RES_BALANCE", "资源均衡度"),
         SAME_MATERIAL("SAME_MATERIAL", "相同物料"),
         SAME_ORDER("SAME_ORDER", "相同订单"),
@@ -1291,7 +1292,9 @@ public class ApsEnumUtil {
     public enum SANLUX_OPERATION_TYPE {
         NORMAL("NORMAL", "正常工序"),
         FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"),
-        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱");
+        FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"),
+        FOUR_COATING("FOUR_COATING", "四车间覆胶"),
+        FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布");
 
         private String value;
         private String description;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 09a9a27..ce8d025 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1838,7 +1838,9 @@ public class WmsEnumUtil {
         FINISH(20, "处理中"),
         FAIL(30, "已完成"),
         CLOSE(40, "已关闭"),
-        CANCEL(50, "已取消");
+        CANCEL(50, "已取消"),
+        REJECT(60, "全部退货"),
+        SPECIAL(70, "全部特采");
 
         private int value;
         private String description;
@@ -1873,7 +1875,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_ITEM_STATUS {
         NORMAL(10, "正常"),
-        CANCELLATION(20, "已处理");
+        CANCELLATION(20, "已处理"),
+        SPECIAL(30, "部分特采");
 
         private int value;
         private String description;
@@ -3399,7 +3402,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
         RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"),
-        UTENSIL(50, "器具");
+        UTENSIL(50, "器具"),
+        TRADE_PRODUCT(60,"贸易品");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index b948580..096b9c8 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,6 +13,7 @@
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
 
+
     <dependencies>
 
         <dependency>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index cf1a42a..80590a1 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 c338f71..11ad913 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 1674a47..c169cc4 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 7637865..e3f1dc9 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 d98b7d8..46db302 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
index b549407..c24359e 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
@@ -34,10 +34,9 @@ public abstract class BaseMdmBean extends BaseBean {
     public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
 
     @Column(name = "MDM_VERSION")
-    @ApiParam("mdm数据版本")
+    @ApiParam("当前版本")
     @JsonSerialize(using = ToStringSerializer.class)
-    @AnnoOutputColumn(hidden = true)
-    private Long mdmVersion;
+    public Long mdmVersion;
 
     public long getMdmVersionVal() {
         return mdmVersion == null ? 0 : mdmVersion;
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
index a35e1f0..2b968fb 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
@@ -24,7 +24,7 @@ import javax.persistence.Transient;
 @ApiModel("MDM业务基础bean")
 public class BaseMdmBusiExtdBean extends BaseMdmBean {
 
-    private static final long serialVersionUID = 4267453020130810967L;
+    private static final long serialVersionUID = 4267453020130811234L;
 
     @Transient
     @ApiParam("是否主数据")
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java
new file mode 100644
index 0000000..443e6b5
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import io.swagger.annotations.ApiModel;
+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 : pantianhu
+ * @CreateDate : 2021-05-26 17:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_FIELD")
+@ApiModel("表字段")
+public class MdmField extends BaseMdmBean {
+
+    @Column(name="TABLE_NAME")
+    @ApiParam(value ="表名")
+    private String tableName;
+
+    @Column(name="TABLE_DESCRIPTION")
+    @ApiParam(value ="表描述")
+    private String tableDescription;
+
+    @Column(name="FIELD_NAME")
+    @ApiParam(value ="字段名称")
+    private String fieldName;
+
+    @Column(name="FIELD_DESCRIPTION")
+    @ApiParam(value ="字段描述")
+    private String fieldDescription;
+
+    @Column(name="SERVICE_NAME")
+    @ApiParam(value ="服务名称")
+    private String serviceName;
+
+    @Column(name="SERVICE_CODE")
+    @ApiParam(value ="服务代码")
+    private String serviceCode;
+
+    @Column(name="IS_SELECT")
+    @ApiParam(value ="是否选中")
+    private Integer isSelect;
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java
new file mode 100644
index 0000000..24b1806
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import io.swagger.annotations.ApiModel;
+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 : pantianhu
+ * @CreateDate : 2021-05-29 15:17
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_MAIL")
+@ApiModel("邮件配置")
+public class MdmMail extends BaseMdmBean{
+    @Column(name = "MESSAGE_SENDER_NAME_RDD")
+    @ApiParam(value = "发送者名称")
+    private String messageSenderNameRdd;
+
+    @Column(name = "MESSAGE_RECEIVERS_NAME_RDD")
+    @ApiParam(value = "接受者名称")
+    private String messageReceiversNameRdd;
+
+    @Column(name = "IS_SEND")
+    @ApiParam(value = "是否发送")
+    private Integer isSend;
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
index 0fe465f..0deccf1 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
@@ -3,10 +3,17 @@ package cn.estsh.i3plus.pojo.mdm.bean.base;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import java.io.Serializable;
 import java.util.List;
 
@@ -19,7 +26,7 @@ import java.util.List;
  **/
 @Data
 @ApiModel("数据中心同步数据")
-public class MdmSyncData implements Serializable {
+public class MdmSyncData<T> implements Serializable {
 
     private static final long serialVersionUID = -1642626000860074060L;
 
@@ -93,4 +100,8 @@ public class MdmSyncData implements Serializable {
 
     @ApiParam("同步失败信息")
     private String syncFailMessage;
+    
+    @ApiParam("同步数据值")
+    private List<T> syncData;
+
 }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java
index b9cb717..e3eee60 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java
@@ -8,10 +8,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.ArrayList;
 import java.util.List;
 
@@ -41,6 +38,31 @@ public class MdmDataSubscribe extends BaseBean {
     @ApiParam("主数据名称")
     private String mdmName;
 
+
+    @Column(name = "MDM_SUBSCRIBE")
+    @ApiParam("订阅对象")
+    private String mdmSubscribe;
+
+    @Column(name = "MDM_SUBSCRIBE_TYPE")
+    @ApiParam("订阅类型")
+    private Integer mdmSubscribeType;
+
+    @Column(name = "MDM_SUBSCRIBE_PERMISSIONS")
+    @ApiParam("订阅权限")
+    private String mdmSubscribePermissions;
+
+    @Column(name = "MDM_SUBSCRIBE_FIELD")
+    @ApiParam("订阅字段")
+    @Lob
+    private String mdmSubscribeField;
+
+    @Transient
+    @ApiParam("订阅字段保存List")
+    private List<String> mdmSubscribeFields;
+
+
+
+
     @Column(name = "INTERNAL_APP_NUM")
     @ApiParam("内部订阅应用数量")
     private Integer internalAppNum;
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java
index 8a05c07..5da00ee 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java
@@ -31,19 +31,32 @@ public class MdmExternalApp extends BaseBean {
     private static final long serialVersionUID = -5344361274535836969L;
 
     @Column(name = "APP_NAME")
-    @ApiParam("应用名称")
+    @ApiParam("服务名称")
     private String appName;
 
     @Column(name = "APP_CODE")
-    @ApiParam("应用代码")
+    @ApiParam("服务代码")
     private String appCode;
 
     @Column(name = "CALL_TOKEN")
     @ApiParam("调用令牌")
     private String callToken;
 
+    @Column(name = "APP_BRIEF")
+    @ApiParam("服务简介")
+    private String appBrief;
+
     @Column(name = "CALLBACK_URL")
-    @ApiParam("回调地址")
+    @ApiParam("回调接口")
     private String callbackUrl;
 
+
+    @Column(name = "EMAIL")
+    @ApiParam("通知邮箱")
+    private String email;
+
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private String operateType;
+
 }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java
new file mode 100644
index 0000000..a1fd2c2
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java
@@ -0,0 +1,111 @@
+package cn.estsh.i3plus.pojo.mdm.bean.master;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
+import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 主数据齿轮
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_SYNC_DATA_THROUGH")
+@ApiModel("处理以通过中心同步数据")
+public class MdmSyncDataThrough extends BaseMdmBean {
+
+    private static final long serialVersionUID = -1642626000861174060L;
+
+    @ApiParam("同步数据类型")
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class)
+    private Integer syncType;
+
+    public int getSyncTypeVal() {
+        return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
+    }
+
+    public String getSyncTypeTxt() {
+        return syncType == null ? "无" : MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
+    }
+
+    @ApiParam("同步模块")
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_APP_TYPE.class)
+    private Integer syncAppType;
+
+    public int getSyncAppTypeVal() {
+        return syncAppType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : syncAppType;
+    }
+
+    public String getSyncAppTypeTxt() {
+        return syncAppType == null ? "无" : MdmEnumUtil.MDM_SYNC_APP_TYPE.valueOfDescription(syncAppType);
+    }
+
+    @ApiParam("同步模块")
+    private Long syncSoftType;
+
+    @ApiParam("同步模块名称")
+    private String syncSoftTypeName;
+
+    @ApiParam("是否是主数据")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isMasterData;
+
+    public int getIsMasterDataVal() {
+        return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
+    }
+
+    public String getIsMasterDataTxt() {
+        return isMasterData == null ? "无" : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
+    }
+
+    @ApiParam("同步数据class")
+    private String syncDataClass;
+
+    public String getSyncDataClassSimpleName() {
+        if (syncDataClass == null) {
+            return null;
+        }
+
+        return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1);
+    }
+
+    @ApiParam("同步数据id")
+    @AnnoOutputColumn(hidden = true)
+    private String syncDataId;
+
+    @ApiParam("同步数据用户名")
+    private String syncDateUserName;
+
+    @ApiParam("同步时间")
+    private String syncDateTime;
+
+    @ApiParam("同步失败键")
+    private String syncFailKey;
+
+    @ApiParam("同步失败时间")
+    private String syncFailDateTime;
+
+    @ApiParam("同步失败信息")
+    private String syncFailMessage;
+
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
index 874d299..91cad4f 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
@@ -21,7 +21,7 @@ public class MdmHqlPack {
     public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
 
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(mdmBean.getIsMdmPublished(), "isMdmPublished", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean);
         return ddlPackBean;
     }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java
index 7d89f14..264f9ca 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java
@@ -1,9 +1,14 @@
 package cn.estsh.i3plus.pojo.mdm.repository.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * @Description :
  * @Reference :
@@ -13,4 +18,5 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface MdmExternalAppRepository extends BaseRepository<MdmExternalApp, Long> {
+
 }
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java
new file mode 100644
index 0000000..12c5d04
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.base.MdmMail;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-15 16:26
+ * @Modify:
+ **/
+@Repository
+public interface MdmMailRepository extends BaseRepository<MdmMail, Long> {
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java
new file mode 100644
index 0000000..1189a8d
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmSyncDataThrough;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-15 16:26
+ * @Modify:
+ **/
+@Repository
+public interface MdmSyncDataThroughRepository extends BaseRepository<MdmSyncDataThrough, Long> {
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java
new file mode 100644
index 0000000..3ed4cc5
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mdm.repository.master;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2021-05-26 20:33
+ * @Modify:
+ **/
+@Repository
+public interface MdmfieldRepository extends BaseRepository<MdmField, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index bf96e57..07a7f33 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 a758a6a..28577a8 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 4988104..3199116 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 dba12cc..7535ff6 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 81670b2..1d2c5be 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 26a7311..699688c 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 48930f8..fcf61d0 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index eaf2544..616952a 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 0f615b6..7e5e95d 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</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 183a03c..d96d6ec 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 37f3706..6ee40bf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -54,7 +54,6 @@ import java.util.List;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "库存条码信息", description = "库存条码信息")
 public class WmsStockSn extends BaseBean {
-
     private static final long serialVersionUID = 4869307400585363697L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
@@ -1025,6 +1024,10 @@ public class WmsStockSn extends BaseBean {
         this.zoneNo = zoneNo;
         this.vendorNo = vendorNo;
     }
+
+
+
+
     public WmsStockSn(String partNo, Double qty) {
         this.partNo = partNo;
         this.qty = qty;
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 0fea52b..8f94fc0 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-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index f8d2d25..a38361a 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-TEST-SNAPSHOT</version>
+    <version>1.0.0.1</version>
 
     <modules>
         <module>modules/i3plus-pojo-base</module>
diff --git a/sonar-project.properties b/sonar-project.properties
index 37d8ae0..a232d36 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 sonar.projectName=i3plus-pojo
 
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0.0.1
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./