From d1758c1be9863a10d03928bf93a42ca1bf31d07b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 13:09:43 +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 |   13 +++++++------
 1 files changed, 7 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 17e0010..4af6e13 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,8 +79,9 @@
 //            Integer Plccount = this.count;
 
             // System.out.println(stt);
-  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 20);
-
+            //瀛樼墖鏍�  鍑虹墖鏍艰鍙�
+  List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+//            System.out.println(arraylist);
 //            Short[] 瀛樼墖 = { 1 };
 //            List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
 //            Short[] 鎺ョ墖 = { 1 };
@@ -105,8 +106,8 @@
             WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
             if (webSocketServer != null) {
                 List<String> messages = webSocketServer.getMessages();
-
-                String addressList3 = "DB100.12";
+                //瀛樼墖鏍�  鍑虹墖鏍煎湴鍧�
+                String addressList3 = "DB100.42";
 
                 if (!messages.isEmpty()) {
                     // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
@@ -134,9 +135,9 @@
                     }
 
 
-                    // 鍐欏叆绗瑈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