From f43c5acc73d15a6bc60d6a3cb66b6d750b257dc6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十二月 2023 09:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 9ec4c88..6c3299a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -80,7 +80,7 @@
 
             // System.out.println(stt);
             //瀛樼墖鏍�  鍑虹墖鏍艰鍙�
-  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 33);
 //            System.out.println(arraylist);
 //            Short[] 瀛樼墖 = { 1 };
 //            List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
@@ -122,7 +122,7 @@
 
                             // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
                             List<Short> mergedList = new ArrayList<>();
-                            for (int i = 0; i < 5; i++) {
+                            for (int i = 0; i < 7; i++) {
                                 JSONArray sublist = messageArray.getJSONArray(i);
                                 for (int j = 0; j < sublist.size(); j++) {
                                     Object value = sublist.get(j);

--
Gitblit v1.8.0