|
|
|
@ -156,10 +156,10 @@ public class MesHqlPack {
|
|
|
|
|
public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = getAllBaseData(organizeCode);
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
|
|
|
|
@ -177,10 +177,10 @@ public class MesHqlPack {
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) {
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
|
|
|
|
@ -208,7 +208,7 @@ public class MesHqlPack {
|
|
|
|
|
mesWorkOrder.getCreateDateTimeEnd(),
|
|
|
|
|
"createDatetime", packBean, true);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean);
|
|
|
|
|
DdlPreparedPack.getOrderDefault(mesWorkOrder);
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|