|
|
|
@ -52,7 +52,7 @@ public class SwebHqlPack {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
|
|
|
|
|
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
|
|
|
|
|
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
|
|
|
|
@ -67,10 +67,10 @@ public class SwebHqlPack {
|
|
|
|
|
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);
|
|
|
|
|
if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) {
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
} else {
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
|
|
|
|
|
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
|
|
|
|
@ -113,7 +113,7 @@ public class SwebHqlPack {
|
|
|
|
|
HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
|
|
|
|
|
|
|
|
|
|
HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
|
|
|
|
|
HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
|
|
|
|
|
HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
|
|
|
|
|
HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result);
|
|
|
|
|
HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result);
|
|
|
|
|
// 封装有效状态和删除状态
|
|
|
|
@ -127,7 +127,7 @@ public class SwebHqlPack {
|
|
|
|
|
public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
|
|
|
|
|
// 封装有效状态和删除状态
|
|
|
|
@ -139,7 +139,7 @@ public class SwebHqlPack {
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
|
return buildHql(swebProcurementPlanOrder, result);
|
|
|
|
@ -156,7 +156,7 @@ public class SwebHqlPack {
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
|
return buildHql(vendorRel, result);
|
|
|
|
@ -165,19 +165,17 @@ public class SwebHqlPack {
|
|
|
|
|
public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
|
|
|
|
|
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
|
|
|
|
|
return buildHql(details, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
|
|
|
|
|
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
|
|
|
|
|
return buildHql(details, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -189,9 +187,7 @@ public class SwebHqlPack {
|
|
|
|
|
public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
|
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
|
|
|
|
|
// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
|
|
|
|
|
return buildHql(details, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -212,17 +208,17 @@ public class SwebHqlPack {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
|
return buildHql(details, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorCodes) {
|
|
|
|
|
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorNos) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
if (vendorCodes.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
|
|
|
|
|
} else if (vendorCodes.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
|
if (vendorNos.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
|
|
|
|
|
} else if (vendorNos.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
|
|
|
|
@ -236,12 +232,12 @@ public class SwebHqlPack {
|
|
|
|
|
return buildHql(capcity, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorCodes) {
|
|
|
|
|
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorNos) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
if (vendorCodes.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
|
|
|
|
|
} else if (vendorCodes.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
|
if (vendorNos.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
|
|
|
|
|
} else if (vendorNos.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
|
|
|
|
|
if (!StringUtil.isEmpty(alarm.getDateStart())) {
|
|
|
|
@ -254,24 +250,24 @@ public class SwebHqlPack {
|
|
|
|
|
return buildHql(alarm, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorCodes) {
|
|
|
|
|
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorNos) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
if (vendorCodes.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
|
|
|
|
|
} else if (vendorCodes.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
|
if (vendorNos.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
|
|
|
|
|
} else if (vendorNos.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
|
return buildHql(stock, result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorCodes) {
|
|
|
|
|
public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorNos) {
|
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
|
if (vendorCodes.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
|
|
|
|
|
} else if (vendorCodes.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
|
if (vendorNos.size() == 1) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
|
|
|
|
|
} else if (vendorNos.size() > 1){
|
|
|
|
|
DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
|
|
|
|
|