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 60044b8..d09ff84 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 @@ -57,8 +57,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); @@ -2159,4 +2159,40 @@ public class WmsHqlPack { return result; } + + /** + * 库存条码管理查询条件 + * + * @param wmsStockSn + * @return + */ + public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + + // 物料编码支持多选 + DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + // 存储区 + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + // 库位不为空 + DdlPreparedPack.getStringNotNullPack( "locateNo", result); + // 排除创建及出库状态条码 + if(wmsStockSn.getSnStatus() != null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + } + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + + //数量大于0 + DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + getStringBuilderPack(wmsStockSn, result); + return result; + } }