zhangchao
2024-08-28 7bd81eba64232379e6623c595b57574df1e5446b
配置
2个文件已修改
16 ■■■■ 已修改文件
src/main/java/com/zy/core/model/protocol/CrnProtocol.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -194,6 +194,10 @@
     * Z行走线速度m/min
     */
    private Float zSpeed;
    /**
     * Z行走线速度m/min
     */
    private Float zSpeedTwo;
    /**
     * 堆垛机累计走行距离km
@@ -290,7 +294,9 @@
    public void setzSpeed(Short zSpeed) {
        this.zSpeed = Float.valueOf(zSpeed);
    }
    public void setzSpeedTwo(Short zSpeedTwo) {
        this.zSpeedTwo = Float.valueOf(zSpeedTwo);
    }
    public void setxDistance(Short xDistance) {
        this.xDistance = Float.valueOf(xDistance);
    }
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -174,11 +174,13 @@
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
                crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 52));
                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
                crnProtocol.setzSpeedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 46));
                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));