From e8d3676793d4194485afec7940aaf355af594901 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 四月 2024 14:24:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
index 06efda5..a97b2c6 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
@@ -2,8 +2,6 @@
 
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import static com.mes.common.InitUtil.readAndUpdateWordValues;
 
@@ -26,11 +24,11 @@
     // private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
     // private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
     // private static String PlcParameter = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcParameter.json").getPath();
-            
+
     // private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json").getPath();
-            
+
     // private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json").getPath();
-            
+
     // private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
     // private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
 
@@ -44,7 +42,7 @@
     public static PlcParameterObject PlcMesObject = InitUtil.initword(PlcAlbania);
     // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
     // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-  
+
     // 绉佹湁鏋勯�犲嚱鏁�
     public PLCAutoMes() throws IOException {
         //config = new Configuration("config.properties");

--
Gitblit v1.8.0