From 4c70d9f0656bbec48fa619f2ec9aa0ee12fca2c1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 04 十二月 2023 09:04:51 +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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 a53ded8..8c2ef38 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
@@ -79,16 +79,16 @@
 //            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);
+  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+//            System.out.println(arraylist);
 //            Short[] 瀛樼墖 = { 1 };
 //            List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
 //            Short[] 鎺ョ墖 = { 1 };
 //            List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
 //            Short[] 闂磋窛 = { 1 };
 //            List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
-            Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };
-            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+//            Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };
+//            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
 
 
             JSONObject jsonObject = new JSONObject();
@@ -106,7 +106,7 @@
             if (webSocketServer != null) {
                 List<String> messages = webSocketServer.getMessages();
 
-                String addressList3 = "DB100.12";
+                String addressList3 = "DB100.42";
 
                 if (!messages.isEmpty()) {
                     // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
@@ -136,7 +136,7 @@
 
                     // 鍐欏叆绗瑈i涓湴鍧�
                     if (!mergedList.isEmpty()) {
-//            S7control.getinstance().WriteWord(addressList3, mergedList);
+          S7control.getinstance().WriteWord(addressList3, mergedList);
                         System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
                     }
 

--
Gitblit v1.8.0