diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e18520b..90a1736 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; import java.util.List; /** @@ -66,6 +67,32 @@ public class SwebHqlPack { return buildHql(purchaseOrder, result); } + public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + } else { + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + } + if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { + DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), + purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); + } + + List poStatus = new ArrayList<>(); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); + //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); + DdlPreparedPack.getInPackList(poStatus, "poStatus", result); + + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(purchaseOrder, result); + } + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);