动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解

+
字段无需区分工厂

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -27,4 +27,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "实体类名")
     private String objClassName;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,26 +35,32 @@ public class WareHouse extends BaseBean {
     private static final long serialVersionUID = 7914396535326597148L;
     @Column(name="CODE")
     @ApiParam("仓库代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
     @Column(name="NAME")
     @ApiParam("仓库名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
     @Column(name="ADDRESS")
     @ApiParam("仓库地址")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
     @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "长")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double whLength;
 
     @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "宽")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double whWidth;
 
     @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "高")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double whHeight;
 
     @Transient

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -34,48 +36,59 @@ public class WmsBom extends BaseBean {
     private static final long serialVersionUID = 5555657644784074446L;
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
     @Column(name = "PART_NAME")
     @ApiParam(value = "父物料描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;
 
     @Column(name = "UNIT")
     @ApiParam(value = "计量单位")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String unit;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "数量")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
 
     @Column(name = "ITEM_PART_NO")
     @ApiParam(value = "子物料号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNo;
 
     @Column(name = "ITEM_PART_NAM")
     @ApiParam(value = "子料物料描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String itemPartNam;
 
     @Column(name = "ITEM_UNIT")
     @ApiParam(value = "子计量单位")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String itemUnit;
 
     @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "子用量")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double itemQty;
 
     @Column(name = "BOM_NUM")
     @ApiParam(value = "BOM编号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomNum;
 
     @Column(name = "BOM_VERSION")
     @ApiParam(value = "BOM版本号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomVersion;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_START_TIME")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effStartTime;
 
 
@@ -83,8 +96,19 @@ public class WmsBom extends BaseBean {
     @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_END_TIME")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String effEndTime;
 
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "线边库位代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String locateNo;
+
+    @Column(name = "TERMINAL_NO")
+    @ApiParam(value = "工位代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String terminalNo;
+
     @ApiParam(value = "目标存储区")
     @Transient
     public String destZoneNo;
@@ -97,14 +121,6 @@ public class WmsBom extends BaseBean {
     @Transient
     public String routingCode;
 
-    @Column(name = "LOCATE_NO")
-    @ApiParam(value = "线边库位代码")
-    private String locateNo;
-
-    @Column(name = "TERMINAL_NO")
-    @ApiParam(value = "工位代码")
-    private String terminalNo;
-
     public Double getQty() {
         return this.qty == null ? 0 : this.qty.doubleValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,10 +34,12 @@ public class WmsLocate extends BaseBean {
     private static final long serialVersionUID = -8425904594036746967L;
     @Column(name = "LOCATE_NO")
     @ApiParam(value = "库位代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String locateNo;
 
     @Column(name = "LOCATE_NAME")
     @ApiParam(value = "库位名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String locateName;
 
     /**
@@ -43,76 +47,104 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String zoneNo;
 
     @Column(name = "FURNITURE_NO")
     @ApiParam(value = "家具代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String furnitureNo;
 
     @Column(name = "X")
     @ApiParam(value = "X", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer x;
 
     @Column(name = "Y")
     @ApiParam(value = "Y", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer y;
 
     @Column(name = "Z")
     @ApiParam(value = "Z", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
     @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "长")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double lcLength;
 
     @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "宽")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double lcWidth;
 
     @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "高")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seq;
 
     @Column(name = "STATUS")
     @ApiParam(value = "库位状态", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS")
     private Integer status;
 
     @Column(name = "MAX_PACKAGE_QTY")
     @ApiParam(value = "最大包装数量", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer maxPackageQty;
 
     @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "最大零件数量", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double maxPartQty;
 
     @Column(name = "STOCK_UNIT")
     @ApiParam(value = "存放单位")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String stockUnit;
 
     @Column(name = "LINE_CODE")
     @ApiParam(value = "生产线")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String lineCode;
 
     @Column(name = "BOX_QTY")
     @ApiParam(value = "箱数", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer boxQty;
 
     @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "零件数", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double partQty;
 
+    @Column(name = "ENCRYPTION_NO")
+    @ApiParam(value = "加密编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String encryptionNo;
+
+    @Column(name = "LAST_CS_TIME")
+    @ApiParam(value = "末次盘点时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    private String lastCsTime;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient
@@ -126,14 +158,6 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "错误信息", example = "-1")
     private String errorMsg;
 
-    @Column(name = "ENCRYPTION_NO")
-    @ApiParam(value = "加密编码")
-    private String encryptionNo;
-
-    @Column(name = "LAST_CS_TIME")
-    @ApiParam(value = "末次盘点时间")
-    private String lastCsTime;
-
     @Transient
     @ApiParam(value = "末次盘点开始时间")
     private String lastCsTimeStart ;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,66 +35,82 @@ public class WmsZones extends BaseBean {
     private static final long serialVersionUID = 7759454799191378612L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String whNo;
 
     @Column(name = "AREA_NO")
     @ApiParam(value = "库存地代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String zoneNo;
 
     @Column(name = "ZONE_NAME")
     @ApiParam(value = "存储区名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String zoneName;
 
     @Column(name = "PARENT_ZONE_NO")
     @ApiParam(value = "父级存储区", example = "-1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String parentZoneNo;
 
     @Column(name = "IS_SON_NODE")
     @ApiParam(value = "是否子节点")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE")
     private Integer isSonNode;
 
     @Column(name = "IS_PM")
     @ApiParam(value = "零件级管控", example = "2")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isPm;
 
     @Column(name = "IS_LM")
     @ApiParam(value = "批次级管控", example = "2")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isLm;
 
     @Column(name = "IS_SN")
     @ApiParam(value = "条码级管控", example = "1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isSn;
 
     @Column(name = "IS_MIX")
     @ApiParam(value = "允许混淆", example = "1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isMix;
 
     @Column(name = "IS_SC")
     @ApiParam(value = "库容检查", example = "1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isSc;
 
     @Column(name = "STRATEGY")
     @ApiParam(value = "堆放策略")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String strategy;
 
     @Column(name = "IS_NEGATIVE")
     @ApiParam(value = "允许负库存", example = "1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isNegative;
 
     @Column(name = "CHECK_FIFO")
     @ApiParam(value = "校验先进先出", example = "1")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
     @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "长")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double zoneLength;
 
     @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "宽")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double zoneWidth;
 
     @Transient