From 9a0dd8244282d90b08b16d2c239683bbac62fab2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 一月 2024 15:02:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index bfddeba..c2a8bac 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -29,7 +29,7 @@
         // \\ TODO Auto-generated catch block
         e.printStackTrace();
       }
-      if (S7control.getinstance().CheckConnected() == true) {
+      if (S7control.getinstance().CheckConnected() == false) {
         spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
         spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
         jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
@@ -41,7 +41,7 @@
         // // TODO Auto-generated catch block
         // e.printStackTrace();
         // }
-        // spianService.selectAll("X12345610402GV");
+         spianService.selectAll("X21942610402GV");
         // 鍑虹墖浠诲姟////////////////////////////////
         List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
         List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩

--
Gitblit v1.8.0