解决动态查询BUG#7674,#7676+

流程导入BUG#7682

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

@@ -28,52 +28,63 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_WAREHOUSE")
+@Table(name = "WMS_WAREHOUSE")
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
     private static final long serialVersionUID = 7914396535326597148L;
-    @Column(name="CODE")
+    @Column(name = "CODE")
     @ApiParam("仓库代码")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
-    @Column(name="NAME")
+    @Column(name = "NAME")
     @ApiParam("仓库名称")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
-    @Column(name="ADDRESS")
+    @Column(name = "ADDRESS")
     @ApiParam("仓库地址")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
-    @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "WH_LENGTH")
-    @ApiParam(value = "长")
+    @ApiParam(value = "长(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whLength;
+    private Integer whLength;
 
-    @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "WH_WIDTH")
-    @ApiParam(value = "宽")
+    @ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whWidth;
+    private Integer whWidth;
 
-    @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "WH_HEIGHT")
-    @ApiParam(value = "高")
+    @ApiParam(value = "高(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whHeight;
+    private Integer whHeight;
+
+    @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "基本单元（米）")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Double baseUnit;
 
     @Transient
-    @ApiParam(value ="存储区列表")
+    @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;
 
-    public double getWhLengthVal() {
+    public Integer getWhLengthVal() {
-        return this.whLength == null ? 0 : this.whLength.doubleValue();
+        return this.whLength == null ? 0 : this.whLength.intValue();
+    }
+
+    public Integer getWhWidthVal() {
+        return this.whWidth == null ? 0 : this.whWidth.intValue();
     }
-    public double getWhWidthVal() {
+
-        return this.whWidth == null ? 0 : this.whWidth.doubleValue();
+    public Integer getWhHeightVal() {
+        return this.whHeight == null ? 0 : this.whHeight.intValue();
     }
-    public double getWhHeightVal() {
+
-        return this.whHeight == null ? 0 : this.whHeight.doubleValue();
+    public Double getBaseUnitVal() {
+        return this.baseUnit == null ? 0 : this.baseUnit.doubleValue();
     }
 }

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

@@ -62,11 +62,6 @@ public class WmsFurniture extends BaseBean {
     @ApiParam(value = "列")
     private Integer fntCol;
 
-
-    public int getIsSaveGoodsVal() {
-        return this.isSaveGoods == null ? 0 : this.isSaveGoods;
-    }
-
     public WmsFurniture() {
     }
 
@@ -81,4 +76,9 @@ public class WmsFurniture extends BaseBean {
         this.storey = storey;
         this.fntCol = fntCol;
     }
+
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods;
+    }
+
 }

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

@@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_LENGTH")
     @ApiParam(value = "长")
-    private Double fntLength;
+    private Integer fntLength;
 
-    @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_WIDTH")
     @ApiParam(value = "宽")
-    private Double fntWidth;
+    private Integer fntWidth;
 
-    @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_HEIGHT")
     @ApiParam(value = "高")
-    private Double fntHeight;
+    private Integer fntHeight;
 
     @Column(name = "STOREY")
     @ApiParam(value = "层")
@@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
-    public Double getFntLengthVal() {
+    public Integer getStoreyVal() {
-        return this.fntLength == null ? 0 : this.fntLength.doubleValue();
+        return this.storey == null ? 0 : this.storey.intValue();
     }
-    public Double getFntWidthVal() {
+
-        return this.fntWidth == null ? 0 : this.fntWidth.doubleValue();
+    public Integer getFntColVal() {
+        return this.fntCol == null ? 0 : this.fntCol.intValue();
+    }
+
+    public Integer getFntLengthVal() {
+        return this.fntLength == null ? 0 : this.fntLength.intValue();
+    }
+
+    public Integer getFntWidthVal() {
+        return this.fntWidth == null ? 0 : this.fntWidth.intValue();
+    }
+
+    public Integer getFntHeightVal() {
+        return this.fntHeight == null ? 0 : this.fntHeight.intValue();
     }
-    public Double getFntHeightVal() {
+
-        return this.fntHeight == null ? 0 : this.fntHeight.doubleValue();
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue();
     }
 
 }

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

@@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
-    @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcLength;
+    private Integer lcLength;
 
-    @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcWidth;
+    private Integer lcWidth;
 
-    @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_HEIGHT")
     @ApiParam(value = "高")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcHeight;
+    private Integer lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
@@ -244,18 +244,18 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Double getLcLengthVal() {
+    public Integer getFrequencyVal() {
-        return this.lcLength == null ? 0 : this.lcLength.doubleValue();
+        return this.frequency == null ? 0 : this.frequency.intValue();
     }
-    public Double getLcWidthVal() {
+
-        return this.lcWidth == null ? 0 : this.lcWidth.doubleValue();
+    public Integer getLcLengthVal() {
+        return this.lcLength == null ? 0 : this.lcLength.intValue();
     }
-    public Double getLcHeightVal() {
+    public Integer getLcWidthVal() {
-        return this.lcHeight == null ? 0 : this.lcHeight.doubleValue();
+        return this.lcWidth == null ? 0 : this.lcWidth.intValue();
     }
-
+    public Integer getLcHeightVal() {
-    public Integer getFrequencyVal() {
+        return this.lcHeight == null ? 0 : this.lcHeight.intValue();
-        return this.frequency == null ? 0 : this.frequency.intValue();
     }
 
     public Integer getXVal() {

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

@@ -103,15 +103,15 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
-    @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneLength;
+    private Integer zoneLength;
 
-    @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneWidth;
+    private Integer zoneWidth;
 
     @Column(name = "POSITION")
     @ApiParam(value = "三维位置")
@@ -133,10 +133,10 @@ public class WmsZones extends BaseBean {
     public WmsZones() {
     }
 
-    public double getZoneLengthVal() {
+    public Integer getZoneLengthVal() {
-        return this.zoneLength == null ? 0 : this.zoneLength.doubleValue();
+        return this.zoneLength == null ? 0 : this.zoneLength.intValue();
     }
-    public double getZoneWidthVal() {
+    public Integer getZoneWidthVal() {
-        return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue();
+        return this.zoneWidth == null ? 0 : this.zoneWidth.intValue();
     }
 }