From 16f724625149f6c1822785337ada5abe43bf1e2f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 14:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
index 4969c73..7eae4c8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java
@@ -100,6 +100,7 @@
* @param index 绱㈠紩鍦板潃
*/
public String getAddress(int index) {
+ index=this.addressIndex;
String[] stringdatas = this.startAddress.trim().split("\\.");
int addressLength = this.addressLength;
if (addressLength < 2) {
@@ -118,11 +119,6 @@
return stringdatas[0] + "." + wordindex + "-" + newIndex;
}*/
// return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
}
public String getAddress() {
--
Gitblit v1.8.0