From bcc00f6d44985671a41f5c320f842090ebba4bc6 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期四, 09 五月 2024 13:54:18 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 15fa1e7..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,14 +100,16 @@
* @param index 绱㈠紩鍦板潃
*/
public String getAddress(int index) {
+ index=this.addressIndex;
String[] stringdatas = this.startAddress.trim().split("\\.");
int addressLength = this.addressLength;
if (addressLength < 2) {
return null;
}
+ int wordindex = index;
+ return stringdatas[0] + "." + wordindex;
+ /* if (addressLength == 2) {
- if (addressLength == 2) {
- int wordindex = index;
return stringdatas[0] + "." + wordindex;
}
@@ -115,13 +117,8 @@
int wordindex = index;
int newIndex = wordindex + 13;
return stringdatas[0] + "." + wordindex + "-" + newIndex;
- }
- return null;
- }
-
- public int getPlcAddress() {
-
- return addressIndex;
+ }*/
+// return null;
}
public String getAddress() {
--
Gitblit v1.8.0