From ac84757be7543e3094f0c4fb882c0ffcbbc2e378 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 07 五月 2024 21:53:22 +0800
Subject: [PATCH] 联调修改

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
index c65d8a6..0b206d5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java
@@ -273,21 +273,18 @@
 
         return result;
     }
+
     //璇诲彇瀛楃涓�
     public String readString(String address) {
         if (s7PLC == null) {
             return null;
         }
         try {
-            byte[] bytes = s7PLC.readByte(address, 14);
-            if (bytes != null) {
-                return new String(bytes, StandardCharsets.UTF_8);
-            }
+            return s7PLC.readString(address);
         } catch (Exception e) {
             System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
             return null;
         }
-        return null;
     }
 
 
@@ -346,6 +343,21 @@
         return data;
     }
 
+    //璇诲彇鍗曚釜word
+    public Short readWord(String address) {
+        if (s7PLC == null) {
+            return null;
+        }
+        try {
+            // 鍗曚釜鍦板潃
+            return s7PLC.readInt16(address);
+        } catch (Exception e) {
+            System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+
+        }
+        return -1;
+    }
+
     //璇诲彇鏃堕棿
     public Long readtime(String address) {
         if (s7PLC == null) {

--
Gitblit v1.8.0