Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

zhangyong

2024-05-09 bcc00f6d44985671a41f5c320f842090ebba4bc6

 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() {