From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
index 31c5ad8..608bb76 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
@@ -72,10 +72,10 @@
 //            Integer Plccount = this.count;
 
             // System.out.println(stt);
-            // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
-            // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
-            Short[] values1 = { 1,2, 3, 4, 5 , 11, 12,13,14,15};
-            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+            List<Short> arraylist = S7control.getinstance().ReadWord("DB100.88", 10);
+
+//            Short[] values1 = { 1,2, 3, 4, 5 , 11, 12,13,14,15};
+//            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
 
 
             JSONObject jsonObject = new JSONObject();
@@ -94,7 +94,7 @@
             if (webSocketServer != null) {
                 List<String> messages = webSocketServer.getMessages();
 
-                String addressList3 = "DB100.12";
+                String addressList3 = "DB100.88";
 
                 if (!messages.isEmpty()) {
                     // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�

--
Gitblit v1.8.0