diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 6377255..e181f09 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -101,7 +101,7 @@ public class WmsPOMasterDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam("状态") - public String itemStatus; + public Integer itemStatus; @Column(name = "SNP") @ApiParam("标准包装") @@ -118,6 +118,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "散件收货输入数量", example = "0") public Double inputRcQty; + @Transient + @ApiParam(value = "供应商批次") + public String dateCode; + public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } } 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 6067af2..0adc360 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 @@ -60,7 +60,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); @@ -166,7 +166,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);