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 1700e41..68a8d3f 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -515,9 +516,11 @@ public class WmsHqlPack { //条码 HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //是否删除 - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result); return result.toString(); } @@ -542,7 +545,9 @@ public class WmsHqlPack { //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); //是否删除 - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result); return result.toString(); }