From f66c565a395e10901fc71abcfa37f4ff5a15be09 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 26 一月 2024 11:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 b488fed..6e6ef8a 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
@@ -50,32 +50,35 @@
String jsonFilePath = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
String jsonFilePath2 = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
- String jsonFilePath3 = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
- System.out.println(jsonFilePath);
+ // String jsonFilePath3 = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
+ // System.out.println(jsonFilePath);
// 璋冪敤initword鏂规硶
PlcParameterObject PlcMesObject= initUtil.initword(jsonFilePath);
// 璋冪敤initbit鏂规硶
- PlcParameterObject PlcReadObject= initUtil.initword(jsonFilePath2);
- // 璋冪敤initbit鏂规硶
- PlcParameterObject PlcframeObject= initUtil.initword(jsonFilePath3);
- readAndUpdateWordValues(PlcframeObject);
- readAndUpdateWordValues(PlcMesObject);
+ PlcParameterObject PlcReadObject= initUtil.initword(jsonFilePath2);
+ // // 璋冪敤initbit鏂规硶
+ // PlcParameterObject PlcframeObject= initUtil.initword(jsonFilePath3);
readAndUpdateWordValues(PlcReadObject);
+ readAndUpdateWordValues(PlcMesObject);
+ // readAndUpdateWordValues(PlcframeObject);
+
+
// readAndUpdateWordValues(plcStateObject);
int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- System.out.println(index);
+ //System.out.println(index);
PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
+ //System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
List<String> addresses = new ArrayList<>();
- addresses.add("FeedCarStatus");
- addresses.add("OutRequest");
- System.out.println(PlcReadObject.getPlcParameterValues(addresses));
+ addresses.add("FeedID");
+ addresses.add("AddStart");
+ //System.out.println(addresses);
+ //System.out.println(PlcMesObject.getPlcParameterValues(addresses));
List<String> addresses2 = new ArrayList<>();
- addresses2.add("conveyorVelocity(AutoSLOW)");
- addresses2.add("D01.SRdec");
+ addresses2.add("FeedID");
+ addresses2.add("FeedCarStatus");
System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
--
Gitblit v1.8.0