From e5a20d47339d5dca7c4cb971f39c360b389e5d9b Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 24 Sep 2019 13:17:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 7fc2765..9b9d0e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -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; + } }