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 44f3039..cf02110 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
@@ -4169,7 +4169,7 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
+    /**分类
      * 物流规则 处理单位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -4890,10 +4890,18 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+        public static FIELD_TYPE codeOf(Integer value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value==value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
-     * 推送类型
+     * 推送类型单位
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
index 43e219f..88d4883 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
@@ -31,4 +31,7 @@ public class WmsListSearchModel {
 
     @ApiParam(value = "有效性")
     public Integer isValid;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
 }
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 378144b..0157775 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
@@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class)
     private String partType;
 
     @Column(name = "PART_TYPE_DESC")
@@ -80,7 +80,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "ABC")
     @ApiParam(value = "分类")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
     private String abc;
 
     @Column(name = "BUY_UNIT")
@@ -146,8 +146,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String inLocateNo;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
@@ -162,12 +162,12 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_FLAG")
     private String outCloseFlag = "2";
 
     @Column(name = "OUT_CLOSE_TYPE")
     @ApiParam("结算方式")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_TYPE")
     private String outCloseType;
 
     @Column(name = "OUT_CLOSE_VENDOR")
@@ -222,7 +222,7 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String stockLevelStatus;
 
-    @Column(name="verb_num")
+    @Column(name = "verb_num")
     @ApiParam(value = "单次拆包数")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double verbNum;
@@ -252,11 +252,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double curingTime = 0d;
 
-    public int getIqcVal(){
+    public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 
-    public int getCycleRquestPeriod(){
+    public int getCycleRquestPeriod() {
         return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
     }
 
@@ -264,23 +264,23 @@ public class WmsPart extends BaseBean {
     }
 
     public Double getQty() {
-        return qty == null? 0:qty;
+        return qty == null ? 0 : qty;
     }
 
     public Double getMin() {
-        return min == null? 0: min;
+        return min == null ? 0 : min;
     }
 
     public Double getMax() {
-        return max == null? 0:max;
+        return max == null ? 0 : max;
     }
 
     public Double getCycleRquestQty() {
-        return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
+        return this.cycleRquestQty == null ? 0d : this.cycleRquestQty.doubleValue();
     }
 
     public Double getCuringTime() {
-        return this.curingTime == null? 0d:this.curingTime.doubleValue();
+        return this.curingTime == null ? 0d : this.curingTime.doubleValue();
     }
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
index 0321169..813e15b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
@@ -43,7 +43,7 @@ public class WmsFieldInfo extends BaseBean {
 
     @Column(name = "FIELD_TYPE")
     @ApiParam(value = "字段类型")
-    private String fieldType;
+    private Integer fieldType;
 
     @Column(name = "ENUM_NAME")
     @ApiParam(value = "字段枚举名称")
@@ -77,6 +77,10 @@ public class WmsFieldInfo extends BaseBean {
     @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
     private Integer isWider;
 
+    @Column(name = "IS_QUERY")
+    @ApiParam(value = "是否可选作查询条件:默认1-可选，2-不可选")
+    private Integer isQuery;
+
     @Column(name = "IS_SELECT")
     @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
     private Integer isSelect;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
index 99b223f..7a9cbbb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java
@@ -43,7 +43,7 @@ public class WmsSearchElement extends BaseBean {
 
     @Column(name = "FIELD_TYPE")
     @ApiParam(value = "字段类型")
-    private String fieldType;
+    private Integer fieldType;
 
     @Column(name = "CONDITION_EXPRE")
     @ApiParam(value = "条件表达式:>,<,>=等")