diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTaskScreen.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTaskScreen.java
new file mode 100644
index 00000000..89b49d50
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTaskScreen.java
@@ -0,0 +1,38 @@
+package org.nl.wms.sb.stat.websocket;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.mnt.websocket.MsgType;
+import org.nl.modules.mnt.websocket.SocketMsg;
+import org.nl.modules.mnt.websocket.WebSocketServer;
+import org.nl.wql.WQL;
+import org.nl.wql.core.bean.WQLObject;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AutoWebSocketTaskScreen {
+
+ public void run() {
+ try {
+ JSONObject param = new JSONObject();
+ JSONArray requestArr = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParam("flag", "2").process().getResultJSONArray(0);
+ JSONArray repaiArr = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParam("flag", "3").process().getResultJSONArray(0);
+
+ param.put("requestArr",requestArr);
+ param.put("repaiArr",repaiArr);
+
+ SocketMsg socketMsg = new SocketMsg(param, MsgType.INFO);
+ WebSocketServer.sendInfo(socketMsg,"21");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
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 83d2cfef..1c9a6505 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
@@ -159,5 +159,62 @@
ENDQUERY
ENDIF
+ IF 输入.flag = "2"
+ QUERY
+ SELECT
+ st.*,
+ file.device_name,
+ class.class_name,
+ dept.name
+ 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 sys_user user ON user.user_id = st.create_id
+ LEFT JOIN sys_dept dept ON user.dept_id = dept.dept_id
+ WHERE
+ st.is_delete = '0'
+ AND st.status = '01'
+ AND ( ISNULL( st.is_passed ) or (st.is_passed = '0'))
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "3"
+ QUERY
+ SELECT
+ st.*,
+ file.device_name,
+ class.class_name,
+ (
+ CASE
+ mst.fault_level
+ WHEN '01' THEN '一级'
+ WHEN '02' THEN '二级'
+ WHEN '03' THEN '三级'
+ END
+ ) AS fault_level_name,
+ mst.real_start_date,
+ mst.update_optname,
+ dept.name
+ FROM
+ EM_BI_DeviceRepairRequest st
+ INNER JOIN EM_BI_DeviceRepairMst mst ON mst.source_bill_id = st.request_id
+ 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 sys_user user ON user.user_id = mst.update_optid
+ LEFT JOIN sys_dept dept ON user.dept_id = dept.dept_id
+ WHERE
+ st.is_delete = '0'
+ AND st.status in (01,02)
+ AND st.is_passed = '1'
+ AND mst.invstatus in (01,02,03,04,05,06)
+ AND mst.is_delete = '0'
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
diff --git a/mes/qd/src/router/routers.js b/mes/qd/src/router/routers.js
index f61e138e..37f2f47c 100644
--- a/mes/qd/src/router/routers.js
+++ b/mes/qd/src/router/routers.js
@@ -23,6 +23,12 @@ export const constantRouterMap = [
hidden: true,
meta: { title: '任务看板' }
},
+ {
+ path: '/taskScreen/stat',
+ component: (resolve) => require(['@/views/wms/sb/stat/taskscreen/taskScreen'], resolve),
+ hidden: true,
+ meta: { title: '任务列表屏' }
+ },
{
path: '/404',
component: (resolve) => require(['@/views/features/404'], resolve),
diff --git a/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue b/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
new file mode 100644
index 00000000..6d9ae7b6
--- /dev/null
+++ b/mes/qd/src/views/wms/sb/stat/taskscreen/taskScreen.vue
@@ -0,0 +1,142 @@
+
+
+
报修任务
+
+
+
+
+
+
+
+
+
+
+
+
在修任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+