|
|
@ -59,7 +59,7 @@ public class SwebHqlPack {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(purchaseOrder, result);
|
|
|
|
return buildHql(purchaseOrder, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -81,11 +81,10 @@ public class SwebHqlPack {
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
|
|
|
|
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
|
|
|
|
//poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue());
|
|
|
|
|
|
|
|
DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
|
|
|
|
DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
|
|
|
|
|
|
|
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(purchaseOrder, result);
|
|
|
|
return buildHql(purchaseOrder, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -94,7 +93,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(swebPackage, result);
|
|
|
|
return buildHql(swebPackage, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -102,7 +101,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(swebConfig, result);
|
|
|
|
return buildHql(swebConfig, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -121,7 +120,7 @@ public class SwebHqlPack {
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
|
|
|
|
HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
|
|
|
|
HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
|
|
|
|
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return result.toString();
|
|
|
|
return result.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -134,7 +133,7 @@ public class SwebHqlPack {
|
|
|
|
// 封装有效状态和删除状态
|
|
|
|
// 封装有效状态和删除状态
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(model, result);
|
|
|
|
return buildHql(model, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -142,7 +141,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(swebProcurementPlanOrder, result);
|
|
|
|
return buildHql(swebProcurementPlanOrder, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -151,7 +150,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(swebProcurementPlanOrderDetails, result);
|
|
|
|
return buildHql(swebProcurementPlanOrderDetails, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -159,7 +158,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(vendorRel, result);
|
|
|
|
return buildHql(vendorRel, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -208,22 +207,13 @@ public class SwebHqlPack {
|
|
|
|
return buildHql(details, result);
|
|
|
|
return buildHql(details, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
|
|
|
|
|
|
|
|
// DdlPackBean result = new DdlPackBean();
|
|
|
|
|
|
|
|
// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
|
|
|
|
|
|
|
|
// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
|
|
|
|
|
|
|
|
// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
|
|
|
|
|
|
|
|
// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
|
|
|
|
// return buildHql(master, result);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
|
|
|
|
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPackBean result = new DdlPackBean();
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
|
|
|
|
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(details, result);
|
|
|
|
return buildHql(details, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -242,7 +232,7 @@ public class SwebHqlPack {
|
|
|
|
if (!StringUtil.isEmpty(capcity.getDateEnd())) {
|
|
|
|
if (!StringUtil.isEmpty(capcity.getDateEnd())) {
|
|
|
|
DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result);
|
|
|
|
DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(capcity, result);
|
|
|
|
return buildHql(capcity, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -260,7 +250,7 @@ public class SwebHqlPack {
|
|
|
|
if (!StringUtil.isEmpty(alarm.getDateEnd())) {
|
|
|
|
if (!StringUtil.isEmpty(alarm.getDateEnd())) {
|
|
|
|
DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
|
|
|
|
DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(alarm, result);
|
|
|
|
return buildHql(alarm, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -272,7 +262,7 @@ public class SwebHqlPack {
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(stock, result);
|
|
|
|
return buildHql(stock, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -285,7 +275,7 @@ public class SwebHqlPack {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
|
|
|
|
return buildHql(alarm, result);
|
|
|
|
return buildHql(alarm, result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|