From ec9d3c5d3d12eeeff1b411db98e820d06ce2c086 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 15:29:02 +0800
Subject: [PATCH] 1、大理片笼提供历史任务分页查询接口 2、卧式理片笼提供历史任务分页查询接口 3、原片仓储提供历史任务分页查询接口 4、中空理片笼提供历史任务分页查询接口 5、中空流程卡出片任务提供历史任务分页查询接口 6、中空任务按照任务id查询中控队列信息接口
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index ead39b0..bb5663f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -160,21 +160,23 @@
);
List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
);
jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgOneTasks", edgTwoTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
List<Engineering> engineeringOne = engineeringService.list(
new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getStationCell, 5)
+ .eq(Engineering::getState, 0)
);
List<Engineering> engineeringTow = engineeringService.list(
new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getStationCell, 6)
+ .eq(Engineering::getState, 0)
);
jsonObject.append("engineeringOne", engineeringOne);
- jsonObject.append("engineeringTow", engineeringTow);
+ jsonObject.append("engineeringTwo", engineeringTow);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0