From 1de52d82ec5c3fb56e095a36571ab32bfdb15ca4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:25:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

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

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
index cced744..67add15 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
@@ -13,7 +13,7 @@
 public class PLCAutoMes extends Thread {
 
     // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
-    private Configuration config;
+    
     private static InitUtil initUtil;
     // public static PlcParameterObject PlcMesObject;
     // public static PlcParameterObject PlcReadObject;
@@ -50,7 +50,7 @@
   
     // 绉佹湁鏋勯�犲嚱鏁�
     public PLCAutoMes() throws IOException {
-        config = new Configuration("config.properties");
+        //config = new Configuration("config.properties");
         initUtil = new InitUtil();
     }
 
@@ -75,10 +75,11 @@
             // System.out.println(jsonFilePath);
 
             //readAndUpdateWordValues(PlcReadObject);
+            List<Short> ss=S7control.getinstance().ReadWord("DB14.0", 1);
             readAndUpdateWordValues(PlcMesObject);
             //readAndUpdateWordValues(PlcframeObject);
             // readAndUpdateWordValues(PlcframeObject);
-
+            
             // readAndUpdateWordValues(plcStateObject);
             // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
             // // System.out.println(index);

--
Gitblit v1.8.0