From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
index a21fed9..e3218e1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
@@ -8,7 +8,7 @@
import java.util.ArrayList;
import java.util.List;
-import static com.mes.tools.InitUtil.readAndUpdateWordValues;
+//import static com.mes.tools.InitUtil.readAndUpdateWordValues;
public class PLCAutoMes extends Thread {
@@ -22,19 +22,14 @@
private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
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();
+ // private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
// 璋冪敤initword鏂规硶
-//
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
+ //
+ // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
public static PlcParameterObject PlcMesObject = initUtil.initword(PlcMes);
public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
@@ -65,26 +60,18 @@
// System.out.println(jsonFilePath);
- // readAndUpdateWordValues(PlcReadObject);
- readAndUpdateWordValues(PlcMesObject);
-// readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(PlcframeObject);
+ // readAndUpdateWordValues(PlcReadObject);
+ //readAndUpdateWordValues(PlcMesObject);
- // readAndUpdateWordValues(plcStateObject);
- // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- // System.out.println(index);
- // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
List<String> addresses = new ArrayList<>();
addresses.add("FeedID");
addresses.add("AddStart");
- // System.out.println(addresses);
- // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
+
List<String> addresses2 = new ArrayList<>();
addresses2.add("FeedID");
addresses2.add("FeedCarStatus");
- // System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
+ // System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
}
}
--
Gitblit v1.8.0