From bc4a9c7700fbda51a57207fd445a02ad21e85911 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 25 一月 2024 08:08:13 +0800
Subject: [PATCH] 自动确认状态下改为从后台直接发送进片任务
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 6247785..fa3faf1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -108,6 +108,20 @@
List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));
+ // 鏁呴殰鍦板潃
+ List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
+
+
+ // 澶嶄綅鍦板潃
+ List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
+ List<Boolean> readreast = S7control.getinstance().readBits(waddresses6);
+ short[] reast6 = PLCBooleanConverter.convertListsToBinaryShortArray(readreast);
+
+ // 鍥為浂鍦板潃
+ List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
+ List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses7);
+ short[] huiling7 = PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
+
List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
@@ -163,6 +177,8 @@
jsonObject.append("guzhang", params2);
jsonObject.append("weihuiling", params3);
jsonObject.append("qidong", combinedBinaryShortArray);
+ jsonObject.append("fuwei", reast6);
+ jsonObject.append("huiling", huiling7);
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
// if (sendwServer != null) {
@@ -179,16 +195,6 @@
List<String> messages = webserver.getMessages();
- // 鏁呴殰鍦板潃
- List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
-
-
- // 澶嶄綅鍦板潃
- List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
-
-
- // 鍥為浂鍦板潃
- List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
--
Gitblit v1.8.0