diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index 929b274..f64bf33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean { public WmsFurniture() { } - public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo, + public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo, Integer isSaveGoods, String position, Integer storey, Integer fntCol) { + this.id = id; + this.organizeCode = organizeCode; this.whNo = whNo; this.zoneNo = zoneNo; this.typeCode = typeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a5b6221..ee6babb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean { @Transient @ApiParam(value = "移动频次") - private Integer frequency; + private Long frequency; @Transient @ApiParam(value = "库龄") @@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean { this.partQty=partQty; this.locateNo=locateNo; } - public WmsLocate(String locateNo,Integer frequency,String organizeCode, + //3D仓库-库位移动频率热力图 + public WmsLocate(String locateNo,Long frequency,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ this.locateNo=locateNo; @@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean { this.y=y; this.z=z; } + //3D仓库-库龄热力图 public WmsLocate(String locateNo,String age,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ @@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean { return this.locateType== null ? 0 : this.locateType.intValue(); } - public Integer getFrequencyVal() { - return this.frequency == null ? 0 : this.frequency.intValue(); + public Long getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.longValue(); } public Integer getLcLengthVal() { 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 abff614..551d6d6 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 @@ -545,7 +545,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { - DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result); + DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result); } // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);