Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-05 46e131d4388bab568e3078b7beb046c57ba67375

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java

@@ -51,9 +51,10 @@
                e.printStackTrace();
            }

            byte[] getplcvlues = plccontrol.ReadByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
            PlcMesObject.setPlcParameterList(getplcvlues);

            byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
            if(getplcvlues!=null) {
                PlcMesObject.setPlcParameterList(getplcvlues);
            }
        }
    }
}