From 03ddbc02f5f0f35354489af3badacccd993457f0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 11:52:09 +0800
Subject: [PATCH] 修改进出片终止功能

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 89f1811..eccf8dc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -56,7 +56,11 @@
 
 //鎬ュ仠鎸夐挳
             List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
+            List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
+            String timeout2 = config.getProperty("Parameter2.timeout");
 
+
+            Long readtimeout = S7control.getinstance().readtime(timeout2);
             List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
 
 
@@ -108,6 +112,7 @@
             jsonObject.append("params", data3);
             jsonObject.append("params", data4);
             jsonObject.append("jiting", anniuparams);
+            jsonObject.append("timeout", readtimeout);
 
 
 //      WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
@@ -139,6 +144,10 @@
                             customS7Control.writeBitToPLC(messageArray, addressList0, 0);
                             //鎬ュ仠
                             customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
+                            //瀛樼墖绛夊緟寤惰繜
+                            customS7Control.Writetime(messageArray, timeout2, 2);
+
+
                             // 娓呯┖娑堟伅鍒楄〃
                             webserver.clearMessages();
                         }

--
Gitblit v1.8.0