From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..e6eaef7 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
@@ -22,19 +22,19 @@
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
+ // 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,15 +65,15 @@
// System.out.println(jsonFilePath);
- // readAndUpdateWordValues(PlcReadObject);
+ // readAndUpdateWordValues(PlcReadObject);
readAndUpdateWordValues(PlcMesObject);
// readAndUpdateWordValues(PlcframeObject);
// readAndUpdateWordValues(PlcframeObject);
// readAndUpdateWordValues(plcStateObject);
- // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
+ // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
// System.out.println(index);
- // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
+ // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
// System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
List<String> addresses = new ArrayList<>();
addresses.add("FeedID");
@@ -84,7 +84,7 @@
addresses2.add("FeedID");
addresses2.add("FeedCarStatus");
- // System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
+ // System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
}
}
--
Gitblit v1.8.0