Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-04-18 e8d3676793d4194485afec7940aaf355af594901

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcParameterObject.java

@@ -68,7 +68,6 @@
    }



    /**
     * 根据参数标识 获取某个参数实例
     * 
@@ -114,10 +113,6 @@
    }






    /**
     * 添加参数实例
     * 
@@ -152,19 +147,16 @@
                }
                if (plcParameterInfo.getAddressLength()==2) { 
                      plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
                }
                else if (plcParameterInfo.getAddressLength()==14) {
                } else if (plcParameterInfo.getAddressLength() == 14) {
                    plcParameterInfo.setValue((byteToHexString(valueList)));
                }

                else
                {
                } else {
                    String valuestr = new String(valueList);
                    plcParameterInfo.setValue(valuestr);
                }
            }
        }
    }

     /**
     * short类型转byte[]
     * 
@@ -178,6 +170,7 @@
        }
        return b;
   }

     /**
     * byte[]类型转short
     *