|
|
|
@ -1230,4 +1230,25 @@ public class MesHqlPack {
|
|
|
|
|
packBean.setOrderByStr(buttonStatus.orderBy());
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 工单审批查询
|
|
|
|
|
* @param mesWorkOrder
|
|
|
|
|
* @param organizeCode
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) {
|
|
|
|
|
DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
|
|
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean);
|
|
|
|
|
}
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_STATUS.CREATE.getValue(), "workOrderStatus", packBean);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean);
|
|
|
|
|
return packBean;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|