diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index 0890c54..cc86295 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -63,4 +63,7 @@ public class WmsCheckFactRecord extends BaseBean { @Column(name="CHECK_QTY") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; + + @ApiParam(value ="供应商全称") + private transient String vendorDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index b68e949..2bba402 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -53,11 +53,11 @@ public class WmsShopping extends BaseBean { public String sn; /** - * 状态:0=新建,10=已处理,20=处理出错 + * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") @@ -74,4 +74,7 @@ public class WmsShopping extends BaseBean { @Column(name="SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; + + @ApiParam(value ="客户简称") + private transient String custName; } 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 98aca6c..c2e314d 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 @@ -453,7 +453,30 @@ public class WmsHqlPack { //条码 HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); + HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + return result.toString(); + } + + /** + * 产品发运信息 查询条件封装 + * + * @param wmsCheckFactRecord + * @return + */ + public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result); + //采购单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + //ASN单号 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + //条码 + HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result); + //物料编码 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + //供应商编号 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); return result.toString(); } }