diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index d7b077e..4404e8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -31,9 +31,9 @@ public class WmsIbCheckPlan extends BaseBean{ @ApiParam(value ="物料编码") private String partNo; - @Column(name="PART_NAME") + @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") - private String partName; + private String partNameRdd; @Column(name="START_DATE") @ApiParam(value ="开始日期") 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 f73ac3b..53d6880 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 @@ -75,7 +75,7 @@ public class WmsLocate extends BaseBean { private Integer maxPartQty; @Column(name="STOCK_UNIT") - @ApiParam(value ="存放单位", example = "-1") + @ApiParam(value ="存放单位") private String stockUnit; } 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 790e366..d0694ba 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 @@ -17,6 +17,40 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; public class WmsHqlPack { /** + * 库位物料信息 分页查询 + * @param wmsLocatePart + * @return + */ + public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result); + + return result.toString(); + } + + /** + * 库位信息 分页查询 + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocates(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result); + HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result); + HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result); + HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result); + + return result.toString(); + } + + /** * 工厂仓库模糊分页查询 * @param wareHouse * @return