diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
index 18d4ace..26e9d6c 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
@@ -8,10 +8,10 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Lob;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description :APS基类
@@ -26,7 +26,9 @@ import java.util.Map;
 @ExcludeImportExport
 public abstract class BaseAPS extends BaseBean {
     @JsonIgnore
-    private transient Map<String, Object> customFields = new HashMap<>();
+    @Lob
+    @FieldAnnotation(property = false)
+    private HashMap<String, Object> customFields = new HashMap<>();
 
     @Column(name="KEY")
     @ApiParam(value ="主键值")
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java
new file mode 100644
index 0000000..2e2b0a2
--- /dev/null
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.base.annotation;
+
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+
+import java.lang.annotation.*;
+
+/**
+ * 字段类型属性注解
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface FieldAnnotation {
+    // Web前端字段数据类型
+    WmsEnumUtil.FIELD_TYPE webFieldType();
+    // 条件表达式:>,<,>=等
+    String conditionExpre() default "=";
+    // 条件连接符:and/or
+    String conditionConnector() default "and";
+    // 排序序号
+    int seq() default 0;
+    // 字段列宽度
+    double width() default 0d;
+    // 排序规则:默认0-不排序，1-升序2-降序
+    int sort() default 0;
+    // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
+    int isWider() default 2;
+    // 是否勾选:默认1-勾选，2-非勾选
+    int isSelect() default 1;
+    // 是否必选:默认1-必选，2-非必选
+    int isRequire() default 1;
+    // 是否表单字段展示:默认1-显示，2-隐藏
+    int isShow() default 1;
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index f2ef95b..9c10c6c 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -39,6 +41,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     public Long id;
 
     //get单独处理
@@ -61,16 +64,19 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="ORGANIZE_CODE")
     @ApiParam(value ="组织代码")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
 //    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否已删除",example = "2")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
@@ -83,15 +89,18 @@ public abstract class BaseBean implements Serializable {
     @Indexed(direction = IndexDirection.DESCENDING)
     @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
     public String createDatetime;
 
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")
     @ApiParam(value = "修改日期")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
     public String modifyDatetime;
 
     @Transient
@@ -126,6 +135,7 @@ public abstract class BaseBean implements Serializable {
     @Transient
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 0f44cb0..2a7e925 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -187,15 +187,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2620,6 +2611,7 @@ public class MesEnumUtil {
         PUBLIC(10, "公用"),
         JIT(20, "JIT生产"),
         WORK_ORDER(30, "工单生产"),
+        JIS(40, "JIS发运"),
         OTHER(99, "其他");
 
         private int value;
@@ -2888,8 +2880,7 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单"),
-        JIT_ORDER(50, "JIT工单");
+        BH_ORDER(40, "B&H工单");
 
         private int value;
         private String description;
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 5a93fce..5c3308e 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
@@ -238,7 +238,9 @@ public class MesPcnEnumUtil {
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
-        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
+        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
 
         private int value;
         private String code;
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 33d06b5..e618c9d 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
@@ -4792,6 +4792,42 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     *  WEB页面字段类型
+     *  10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        TEXT(10, "text"), NUMBER(20, "number"),
+        SELECT(30, "select"), DATETIME(40, "datetime"),
+        LIST(50, "list");
+
+        private int value;
+        private String description;
+
+        FIELD_TYPE(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;
+        }
+    }
 
     /**
      * 推送类型
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java
index 1859025..78b1e77 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java
@@ -69,9 +69,9 @@ public class MesPart extends BaseBean {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CATEGORY")
-    @ApiParam("产品类型")
-    private String produceCategory;
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java
new file mode 100644
index 0000000..cbb3f3d
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java
@@ -0,0 +1,51 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description :产品配置明细
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_CFG_DETAIL")
+@Api("产品配置明细")
+public class MesProdCfgDetail extends BaseBean {
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "IS_VIRTUAL")
+    @ApiParam("是否虚零件")
+    private Integer isVirtual;
+
+    @Transient
+    @ApiParam("零件名称")
+    private String partName;
+
+    public int getIsVirtualVal() {
+        return this.isVirtual == null ? 0 : this.isVirtual;
+    }
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java
new file mode 100644
index 0000000..131674e
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java
@@ -0,0 +1,38 @@
+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-04-26-10:25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_CATEGORY")
+@Api("系统业务动作")
+public class MesProduceCategory extends BaseBean {
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @Column(name = "PRODUCE_CTGY_NAME")
+    @ApiParam("产品类型名称")
+    private String produceCategoryName;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
index 532ec2a..5bd3895 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java
@@ -9,10 +9,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.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description :生产数据
@@ -102,4 +99,9 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Lob
+    @Column(name = "TEST_DATA")
+    @ApiParam("测试json数据")
+    private String testData;
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java
index 1cd6a17..7a32f8b 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +42,20 @@ public class QueueJisModel implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("明细状态名称")
+    private String detailStatusName;
+
+    public String getStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
+    }
+
+    public String getDetailStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
+    }
+
     public QueueJisModel() {
     }
 
@@ -57,4 +72,5 @@ public class QueueJisModel implements Serializable {
         this.detailStatus = detailStatus;
         this.serialNumber = serialNumber;
     }
+
 }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
index b7f831b..a3f4547 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
@@ -17,6 +17,7 @@ import java.io.Serializable;
 @Data
 @Api("JIT队列列表Model")
 public class QueueOrderModel implements Serializable {
+    private Long id;
     @ApiParam("队列序号")
     public Double queueSeq;
     @ApiParam("队列明细序号")
@@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable {
     public QueueOrderModel() {
     }
 
-    public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
+        this.id = id;
         this.queueSeq = queueSeq;
         this.queDetailSeq = queDetailSeq;
         this.custFlagNo = custFlagNo;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java
new file mode 100644
index 0000000..c93700b
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java
@@ -0,0 +1,16 @@
+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.MesProdCfgDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdCfgDetailRepository extends BaseRepository<MesProdCfgDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java
new file mode 100644
index 0000000..50602d5
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java
@@ -0,0 +1,16 @@
+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.MesProduceCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-26-10:28
+ * @Modify:
+ **/
+@Repository
+public interface MesProduceCategoryRepository extends BaseRepository<MesProduceCategory, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java
similarity index 87%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java
index e4d90a6..93e0ba9 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java
@@ -11,5 +11,5 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented
-public @interface UseMongoDb {
+public @interface ElasticSearch {
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java
new file mode 100644
index 0000000..3921f97
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface Json4Es {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
index 20a1b79..e358ca6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@@ -37,7 +37,7 @@ public class MesPackageDetail extends BaseBean {
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("产品条码")
+    @ApiParam("物料号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
index 34911dd..b7a7b64 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
+    @Lob
     @Column(name = "RULE")
     @ApiParam("规则")
     private String rule;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
index 602bb21..fc86e50 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
+import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
+import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -10,11 +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.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * @Description :生产数据
@@ -34,7 +31,7 @@ import javax.persistence.Transient;
         @Index(columnList = "OBJECT_CODE"),
         @Index(columnList = "MODIFY_DATE_TIME")
 })
-//@UseMongoDb
+@ElasticSearch
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -109,6 +106,12 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Json4Es
+    @Column(name = "TEST_DATA")
+    @ApiParam("测试json数据")
+    private String testData;
+
+    @Lob
     @Transient
     @ApiParam("字段总数")
     private Integer fieldNum;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
index a67a223..d3ab791 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
@@ -23,8 +23,8 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("修改按钮")
     private boolean updateButton;
 
-//    @ApiParam("按配置修改按钮")
-//    private boolean updateButtonConfig;
+    @ApiParam("按配置修改按钮")
+    private boolean updateButtonConfig;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;
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 d2241c4..93083c2 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
@@ -1483,7 +1483,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode);
         if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) {
-            DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
         }
         if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) {
             DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java
new file mode 100644
index 0000000..ecbf355
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-01-08 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class WmsFieldInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646427495L;
+
+    @ApiParam(value = "字段信息列表")
+    public List<WmsFieldInfo> wmsFieldInfoList;
+
+    @ApiParam(value = "新增数据操作类")
+    private String baseRepository;
+
+    public WmsFieldInfoModel (String baseRepository, List<WmsFieldInfo> wmsFieldInfoList) {
+        this.baseRepository = baseRepository;
+        this.wmsFieldInfoList = wmsFieldInfoList;
+    }
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java
new file mode 100644
index 0000000..0a11f26
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : WMS列表菜单model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表菜单model")
+public class WmsListElementModel extends BaseBean {
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否默认配置")
+    private Integer isDefault;
+
+    List<WmsListElement> wmsListElementList;
+
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
new file mode 100644
index 0000000..9ca8e79
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java
@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表搜索model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表搜索model")
+public class WmsSearchElementModel extends BaseBean {
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("标题名称")
+    private String titleName;
+
+    @ApiParam(value = "条件表达式:>,<,>=等")
+    private String conditionExpre;
+
+    @ApiParam(value = "检索值")
+    private String value;
+
+    @ApiParam(value = "条件连接符:and/or")
+    private String conditionConnector;
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "组名称")
+    private String groupName;
+
+    @ApiParam(value = "组条件连接符")
+    private String groupConnector;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否共享")
+    private Integer isShare;
+
+    @ApiParam(value = "搜索名称")
+    private String searchName;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
index 36ce2dc..41e57d1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
@@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isCommitRefMove;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_AUTO_COMMIT", nullable = false)
+    @ApiParam(value = "是否自动提交", example = "1")
+    @AnnoOutputColumn
+    private Integer isAutoCommit;
+
     @Lob
     @Column(name = "POSITION")
     @ApiParam(value = "GOJS位置")
@@ -99,6 +105,11 @@ public class WmsActionGroup extends BaseBean {
     public int getIsCommitRefMoveVal() {
         return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
     }
+
+    public int getIsAutoCommitVal() {
+        return this.isAutoCommit == null ? 0 : this.isAutoCommit.intValue();
+    }
+
     public int getAutoInitVal() {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java
new file mode 100644
index 0000000..9038989
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.wms.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : WMS数据迁移配置表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-08 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DATA_MIGRATION_CONFIG")
+@Api("WMS数据迁移配置表")
+public class WmsDataMigrationConfig extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592777L;
+
+    @Column(name="MIG_NAME")
+    @ApiParam("名称")
+    private String migName;
+
+    @Column(name="REMARK")
+    @ApiParam("描述")
+    private String remark;
+
+    @Column(name="MIGRATION_CYCLE")
+    @ApiParam("迁移周期")
+    private String migrationCycle;
+
+    @Column(name="LAST_EXECUTION_TIME")
+    @ApiParam("末次迁移时间")
+    private String lastExecutionTime;
+
+    @Column(name="LAST_MRGRATION_QTY")
+    @ApiParam(value = "末次迁移记录数", example = "0")
+    private Integer LastmMigrationQty;
+
+    @Column(name="NEXT_EXECUTION_TIME")
+    @ApiParam("下次执行时间")
+    private String nextExecutionTime;
+
+    @Column(name="SRC_TABLE_NAME")
+    @ApiParam("来源表名")
+    private String srcTableName;
+
+    @Column(name="SRC_QUERY_CONDITIONS")
+    @ApiParam("来源表查询条件")
+    private String srcQueryConditions;
+
+    @Column(name="PROCESS_QTY")
+    @ApiParam(value = "每次处理行数", example = "0")
+    private Integer processQty;
+
+    @Column(name="DEST_TABLE_NAME")
+    @ApiParam("目标表名")
+    private String destTableName;
+
+    @Column(name="IS_PHYSICAL_DELETE")
+    @ApiParam(value = "是否物理删除", example = "0")
+    private Integer isPhysicalDelete;
+
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam("执行错误日志")
+    private String errorMessage;
+
+    @Transient
+    @ApiParam(value ="开始时间")
+    private String mcStartTime;
+
+    @Transient
+    @ApiParam(value ="结束时间")
+    private String mcEndTime;
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index 335aac9..a4405ea 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -156,6 +157,10 @@ public class WmsMoveMaster extends BaseBean {
     @Transient
     private Integer isSnapshot;
 
+    @Transient
+    @ApiParam("总行数")
+    private Integer itemQty;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
@@ -220,6 +225,12 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
+    public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){
+        this.itemQty = itemQty;
+        this.transTypeCode = transTypeCode;
+        this.itemStatus = itemStatus;
+    }
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 0f31d20..748e194 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
@@ -34,154 +35,191 @@ public class WmsPart extends BaseBean {
     private static final long serialVersionUID = 4849044986767609346L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "物料名称")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "PART_SPEC")
     @ApiParam(value = "物料规格")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partSpec;
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
     @Column(name = "PART_TYPE_DESC")
     @ApiParam(value = "物料类型描述")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partTypeDesc;
 
     @Column(name = "GRAPHI_NO")
     @ApiParam(value = "图号")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String graphiNo;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String version;
 
     @Column(name = "COLOR")
     @ApiParam(value = "颜色")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String color;
 
     @Column(name = "STOCK_UNIT")
     @ApiParam(value = "库存单位")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String stockUnit;
 
     @Column(name = "ABC")
     @ApiParam(value = "分类")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String abc;
 
     @Column(name = "BUY_UNIT")
     @ApiParam(value = "采购单位")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String buyUnit;
 
     @Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "换算率1", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double bu2su;
 
     @Column(name = "PRICE_UNIT")
     @ApiParam(value = "计价单位")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String priceUnit;
 
     @Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "换算率2", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double pu2su;
 
     @Column(name = "SNP", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "标包", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double snp;
 
     @ColumnDefault("2")
     @Column(name = "IQC")
     @ApiParam(value = "是否免检", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer iqc;
 
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最低库存", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double min;
 
     @Column(name = "MAX", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最高库存", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double max;
 
     @Column(name = "PART_GROUP")
     @ApiParam(value = "物料组")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partGroup;
 
     @Column(name = "LOT_CHECK_RULE")
     @ApiParam(value = "批次校验规则")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String lotCheckRule;
 
     @Column(name = "SN_CONTROL")
     @ApiParam(value = "是否条码管理", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer snControl;
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商代码")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String vendorNo;
 
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String inLocateNo;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String prodCfgTypeCode;
 
     @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String prodCfgTypeName;
 
     @Column(name = "OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String outCloseFlag = "2";
 
     @Column(name = "OUT_CLOSE_TYPE")
     @ApiParam("结算方式")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String outCloseType;
 
     @Column(name = "OUT_CLOSE_VENDOR")
     @ApiParam("结算供应商")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String outCloseVendor;
 
     @Column(name = "QUALITY_DAYS")
     @ApiParam("保质期天数")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer qualityDays;
 
     @Column(name = "IS_REPORT_PARTNO")
     @ApiParam("是否报工零件")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer isReportPartNo;
 
     @Column(name = "REPORT_LOCATE_NO")
     @ApiParam("报工库位")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String reportLocateNo;
 
     @Column(name = "REPORT_ZONE_NO")
     @ApiParam("报工存储区")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String reportZoneNo;
 
     @Column(name = "PRODUCT_LINES")
     @ApiParam("报工产线")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String productLines;
 
     @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
     @ApiParam(value = "待质检比例", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double proportion;
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
     @Transient
     @ApiParam("总数量")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double qty;
 
     @Transient
     @ApiParam("库存水平")
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String stockLevelStatus;
 
     @Column(name="verb_num")
@@ -189,19 +227,23 @@ public class WmsPart extends BaseBean {
     private Double verbNum;
 
     @Column(name = "IS_PROD_LOT")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 
     @Column(name = "CYCLE_RQUEST_PERIOD")
     @ApiParam(value = "循环补货周期", example = "0")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Integer cycleRquestPeriod = 0;
 
     @Column(name = "CYCLE_RQUEST_QTY")
     @ApiParam(value = "循环补货数量", example = "0")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double cycleRquestQty = 0d;
 
     public int getIqcVal(){
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java
new file mode 100644
index 0000000..b1f3e68
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java
@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean.dynamic;
+
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS字段信息表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 09:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_FIELDINFO", indexes = {
+        @Index(columnList = "FIELD_NAME"),
+        @Index(columnList = "ENTITY_NAME")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="WMS字段信息表",description = "WMS字段信息表")
+public class WmsFieldInfo extends BaseBean {
+
+    private static final long serialVersionUID = 3903166651913139064L;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam(value = "字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_DESC")
+    @ApiParam(value = "字段描述")
+    private String fieldDesc;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiParam(value = "字段类型")
+    private String fieldType;
+
+    @Column(name = "ENTITY_NAME")
+    @ApiParam(value = "实体名称")
+    private String entityName;
+
+    @Column(name = "ENTITY_DESC")
+    @ApiParam(value = "实体描述")
+    private String entityDesc;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）")
+    private Integer seq;
+
+    @Column(name = "IS_REQUIRE")
+    @ApiParam(value = "是否必选:默认1-必选，2-非必选")
+    private Integer isRequire;
+
+    @Column(name = "WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽度", example = "0")
+    private Double width;
+
+    @Column(name = "SORT")
+    @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
+    private Integer sort;
+
+    @Column(name = "IS_WIDER")
+    @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
+    private Integer isWider;
+
+    @Column(name = "IS_SELECT")
+    @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
+    private Integer isSelect;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏")
+    private Integer isShow;
+
+    @Column(name = "CONDITION_EXPRE")
+    @ApiParam(value = "条件表达式:>,<,>=等")
+    private String conditionExpre;
+
+    @Column(name = "CONDITION_CONNECTOR")
+    @ApiParam(value = "条件连接符:and/or")
+    private String conditionConnector;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java
new file mode 100644
index 0000000..d654c64
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.wms.bean.dynamic;
+
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS列表元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 09:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_LISTELEMENT", indexes = {
+        @Index(columnList = "FIELD_NAME"),
+        @Index(columnList = "USER_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="WMS列表元素表",description = "WMS列表元素表")
+public class WmsListElement extends BaseBean {
+
+    private static final long serialVersionUID = 3903166651913139060L;
+
+    @Column(name = "FIELD_NAME")
+    @ApiParam(value = "字段名称")
+    private String fieldName;
+
+    @Column(name = "TITLE_NAME")
+    @ApiParam(value = "标题名称")
+    private String titleName;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）")
+    private Integer seq;
+
+    @Column(name = "IS_REQUIRE")
+    @ApiParam(value = "是否必选:默认1-必选，2-非必选")
+    private Integer isRequire;
+
+    @Column(name = "WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽度", example = "0")
+    private Double width;
+
+    @Column(name = "SORT")
+    @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
+    private Integer sort;
+
+    @Column(name = "IS_WIDER")
+    @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
+    private Integer isWider;
+
+    @Column(name = "IS_SELECT")
+    @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
+    private Integer isSelect;
+
+    @Column(name = "ISSHOW")
+    @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏")
+    private Integer isShow;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam(value = "表单字段默认值")
+    private String defaultValue;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号")
+    private String userCode;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java
new file mode 100644
index 0000000..dc94f0a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean.dynamic;
+
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS列表元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 09:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = {
+        @Index(columnList = "FUNCTION_ID"),
+        @Index(columnList = "ELEMENT_ID"),
+        @Index(columnList = "USER_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表")
+public class WmsListElementFunction extends BaseBean {
+
+    private static final long serialVersionUID = 3903166651913139061L;
+    @Column(name = "FUNCTION_ID")
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @Column(name = "ELEMENT_ID")
+    @ApiParam(value = "元素ID")
+    private Long elementId;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @Column(name = "IS_DEFAULT")
+    @ApiParam(value = "是否默认配置")
+    private Integer isDefault;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java
new file mode 100644
index 0000000..de0aaf6
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.bean.dynamic;
+
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS搜索元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 09:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_SEARCHELEMENT", indexes = {
+        @Index(columnList = "FIELD_NAME")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="WMS搜索元素表",description = "WMS搜索元素表")
+public class WmsSearchElement extends BaseBean {
+
+    private static final long serialVersionUID = 3903166651913139062L;
+    @Column(name = "FIELD_NAME")
+    @ApiParam(value = "字段名称")
+    private String fieldName;
+
+    @Column(name = "TITLE_NAME")
+    @ApiParam(value = "标题名称")
+    private String titleName;
+
+    @Column(name = "CONDITION_EXPRE")
+    @ApiParam(value = "条件表达式:>,<,>=等")
+    private String conditionExpre;
+
+    @Column(name = "VALUE")
+    @ApiParam(value = "检索值")
+    private String value;
+
+    @Column(name = "CONDITION_CONNECTOR")
+    @ApiParam(value = "条件连接符:and/or")
+    private String conditionConnector;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
new file mode 100644
index 0000000..54f31aa
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.bean.dynamic;
+
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS搜索元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 09:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
+        @Index(columnList = "FUNCTION_ID"),
+        @Index(columnList = "SEARCH_NAME"),
+        @Index(columnList = "SEARCH_ELEMENT_ID"),
+        @Index(columnList = "IS_SHARE"),
+        @Index(columnList = "USER_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表")
+public class WmsSearchElementFunction extends BaseBean {
+
+    private static final long serialVersionUID = 3903166651913139063L;
+    @Column(name = "FUNCTION_ID")
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam(value = "组名称")
+    private String groupName;
+
+    @Column(name = "SEARCH_NAME")
+    @ApiParam(value = "搜索名称")
+    private String searchName;
+
+    @Column(name = "SEARCH_ELEMENT_ID")
+    @ApiParam(value = "搜索元素ID")
+    private Long searchElementId;
+
+    @Column(name = "GROUP_CONNECTOR")
+    @ApiParam(value = "组条件连接符")
+    private String groupConnector;
+
+    @Column(name = "USER_CODE")
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @Column(name = "IS_SHARE")
+    @ApiParam(value = "是否共享")
+    private Integer isShare;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java
new file mode 100644
index 0000000..080bf9d
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :WMS数据迁移配置实体
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-08 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsDataMigrationConfigRepository extends BaseRepository<WmsDataMigrationConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java
new file mode 100644
index 0000000..f1e59d0
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS字段信息表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsFieldInfoRepository extends BaseRepository<WmsFieldInfo, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java
new file mode 100644
index 0000000..5b724e6
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS列表元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsListElementFunctionRepository extends BaseRepository<WmsListElementFunction, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java
new file mode 100644
index 0000000..9433e7d
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS列表元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsListElementRepository extends BaseRepository<WmsListElement, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java
new file mode 100644
index 0000000..1746d7e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS搜索元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsSearchElementFunctionRepository extends BaseRepository<WmsSearchElementFunction, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java
new file mode 100644
index 0000000..028586d
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS搜索元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsSearchElementRepository extends BaseRepository<WmsSearchElement, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 215fb1b..55724ff 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -2692,4 +2692,25 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 数据迁移配置信息分页查询条件
+     *
+     * @param wmsDataMigrationConfig
+     * @return
+     */
+    public static DdlPackBean packHqlWmsDataMigrationConfig(WmsDataMigrationConfig wmsDataMigrationConfig) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getMigName(), "migName", result);
+        DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getRemark(), "remark", result);
+        DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getSrcTableName(), "srcTableName", result);
+        DdlPreparedPack.getNumEqualPack(wmsDataMigrationConfig.getIsPhysicalDelete(), "isPhysicalDelete", result);
+        DdlPreparedPack.getStringBiggerPack(wmsDataMigrationConfig.getMcStartTime(), "nextExecutionTime", result);
+        DdlPreparedPack.getStringSmallerPack(wmsDataMigrationConfig.getMcEndTime(), "nextExecutionTime", result);
+
+        getStringBuilderPack(wmsDataMigrationConfig, result);
+
+        return result;
+    }
+
 }