From 0b66b6df1df5118d1e31a3d9d33de344b2a6fafc Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 17 二月 2025 15:32:28 +0800
Subject: [PATCH] 更改暂停数据更改逻辑，更改预览工程条件逻辑,增加新拿走破损方法
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 74e0e71..adcf7cb 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -123,20 +123,18 @@
if(upPattenUsages!=null){
jsonObject.append("prioritylist", upPattenUsages);
}
- //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
jsonObject.append("loadTask1", upPattenUsages1);
- //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
+ //鏌ヨ2鍙风嚎鐨勪换鍔�
List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
jsonObject.append("loadTask2", upPattenUsages2);
-
+ //鏌ヨ宸ヤ綅浠诲姟
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- jsonObject.append("engineering", engineering);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
--
Gitblit v1.8.0