Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

zjj

2024-01-10 473bc88e44ad3e60b207012130507824cb32f04a

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -191,9 +191,9 @@
                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
//                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));