From 8653859d508072511842aa32ed73ad92bdc3a229 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 14 Sep 2022 17:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sb/stat/websocket/AutoWebSocketTask.java | 5 +- .../wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql | 166 ++++++++++++++++++ .../src/views/wms/sb/stat/task/bigScreen.vue | 30 ++-- 3 files changed, 188 insertions(+), 13 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java index c75f0de8..f03f8adc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java @@ -20,11 +20,14 @@ import java.util.HashMap; @RequiredArgsConstructor public class AutoWebSocketTask { + /** + * 任务看板 + */ public void run() { try { String today = DateUtil.today(); HashMap map = new HashMap<>(); - map.put("flag", "1"); + map.put("flag", "4"); map.put("today", "%"+today+"%"); JSONArray resultJSONArray = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParamMap(map).process().getResultJSONArray(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql index d7751962..3158c35f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql @@ -257,5 +257,171 @@ ENDQUERY ENDIF + IF 输入.flag = "4" + QUERY + SELECT + mst.input_time AS input_time, + mst.repair_code AS repair_code, + ( + CASE + mst.maintenancecycle + WHEN '01' THEN '计划维修' + WHEN '02' THEN '临时维修' + END + ) AS maintenancecycle, + file.device_code, + file.device_name, + ( + CASE + mst.invstatus + WHEN '01' THEN '生成' + WHEN '02' THEN '提交' + WHEN '03' THEN '开始' + WHEN '04' THEN '委外维修' + WHEN '05' THEN '委外验收' + WHEN '06' THEN '结束' + WHEN '07' THEN '确认' + WHEN '99' THEN '审核' + END + ) AS invstatus, + mst.real_start_date, + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + mst.fault_level + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optname AS user_name, + mst.fault_desc AS fault_desc, + mst.invstatus AS status + FROM + EM_BI_DeviceRepairMst mst + LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid + WHERE + mst.is_delete = '0' + AND (mst.invstatus <> '99') + AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' ) + + UNION + + SELECT + st.create_time AS input_time, + st.request_code AS repair_code, + class.class_name AS maintenancecycle, + file.device_code, + file.device_name, + ( + CASE + st.is_passed + WHEN '0' THEN + ( + CASE st.is_passed + WHEN '0' THEN '不通过' + WHEN '1' THEN '通过' + END + ) + WHEN '1' THEN + ( + CASE mst.invstatus + WHEN '01' THEN '生成' + WHEN '02' THEN '提交' + WHEN '03' THEN '开始' + WHEN '04' THEN '委外维修' + WHEN '05' THEN '委外验收' + WHEN '06' THEN '结束' + WHEN '07' THEN '确认' + WHEN '99' THEN '审核' + END + ) + END + ) AS invstatus, + mst.real_start_date, + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + st.fault_level + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optname AS user_name, + mst.fault_desc AS fault_desc, + mst.invstatus AS status + FROM + EM_BI_DeviceRepairRequest st + LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id + LEFT JOIN md_pb_classstandard class ON class.class_id = st.device_faultclass_id + LEFT JOIN EM_BI_DeviceRepairMst mst ON mst.source_bill_id = st.request_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid + WHERE + st.is_delete = '0' + AND (st.status <> '99') + AND mst.source_bill_type = 'BXD' + + UNION + + SELECT + mst.input_time AS input_time, + mst.maint_code AS repair_code, + ( + CASE + mst.maintenancecycle + WHEN '01' THEN '计划保养' + WHEN '02' THEN '临时保养' + END + ) AS maintenancecycle, + file.device_code, + file.device_name, + ( + CASE + mst.invstatus + WHEN '01' THEN '生成' + WHEN '02' THEN '提交' + WHEN '03' THEN '开始' + WHEN '04' THEN '结束' + WHEN '05' THEN '确认' + WHEN '99' THEN '审核' + END + ) AS invstatus, + mst.real_start_date, + mst.real_end_date, + + dept.name AS dept_name, + file.extend_code AS extend_code, + ( + CASE + mst.plan_start_date + WHEN '01' THEN '紧急' + WHEN '02' THEN '一般' + WHEN '03' THEN '不紧急' + END + ) AS fault_level, + mst.update_optid AS user_name, + '' AS fault_desc, + mst.invstatus AS status + FROM + EM_BI_DeviceMaintenanceMst mst + LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id + LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid + WHERE + mst.is_delete = '0' + AND (mst.invstatus <> '99') + + order by input_time DESC + + ENDSELECT + ENDQUERY + ENDIF diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue index 5bfaa3a8..3eac81e1 100644 --- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue +++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue @@ -2,20 +2,20 @@