From 5de29342a9ec4ac6621fca5af803219a8ac0ce42 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 05 八月 2024 13:46:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 9 +++------
1 files changed, 3 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 17b0050..7ecbf06 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
@@ -129,11 +129,8 @@
jsonObject.append("list", upWorkstations);
//鏄惁寮�濮嬪伐绋�
Engineering engineering = engineeringService.selectInitiate(1);
- if (engineering != null){
- jsonObject.append("engineering", engineering);
- }else {
- jsonObject.append("engineering", "0");
- }
+ jsonObject.append("engineering", engineering);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -156,7 +153,7 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
- //String inkageStatus ="1";
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
--
Gitblit v1.8.0