From cb05506d38ecd000d8e2664da1e3d462c8cf13da Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 30 七月 2024 16:19:28 +0800
Subject: [PATCH] 增加磨边线状态推送
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 ff4e20c..5e73260 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
@@ -120,7 +120,10 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- jsonObject.append("prioritylist", upPattenUsages);
+ if(upPattenUsages!=null){
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
@@ -145,8 +148,8 @@
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus = plcParameterObject.getPlcParameter("MesToPlc").getValue();
- //String inkageStatus ="1";
+ String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
--
Gitblit v1.8.0