From f95afb8ff0588bf12a53b6ff811a192bccd79546 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 六月 2024 14:39:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterInfo.java |    7 +------
 1 files changed, 1 insertions(+), 6 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..313adc2 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
@@ -105,7 +105,7 @@
         if (addressLength < 2) {
             return null;
         }
-        int wordindex = index;
+        int wordindex = Integer.parseInt(stringdatas[1]) + index;
         return stringdatas[0] + "." + wordindex;
       /*  if (addressLength == 2) {
 
@@ -118,11 +118,6 @@
             return stringdatas[0] + "." + wordindex + "-" + newIndex;
         }*/
 //        return null;
-    }
-
-    public int getPlcAddress() {
-
-        return addressIndex;
     }
 
     public String getAddress() {

--
Gitblit v1.8.0