123

ZY

2025-05-14 ce641926a957d238b202aa0d9dac3b8f15aff153

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

@@ -285,7 +285,6 @@
            News.error("SiemensCrn" + " - 6" + " - 堆垛机写入命令为空");
            return false;
        }
        System.out.println(" 堆垛机写入命令：" + command);
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[16];
@@ -343,11 +342,14 @@
                    one.setDestinationPosXTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 22));
                    one.setDestinationPosYTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 24));
                    one.setDestinationPosZTwo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 26));
                    one.setCommand(siemensNet.getByteTransform().TransInt16(resultRead.Content, 28));
                    one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 30));
                    if (command.getTaskMode() != 2) {
                        if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
                                || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
                                || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                                || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                                || !command.getCommand().equals(one.getCommand()) || !command.getAckFinish().equals(one.getAckFinish())
                        ) {
                            try {
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
@@ -376,6 +378,7 @@
                                || !command.getSourcePosXTwo().equals(one.getSourcePosXTwo()) || !command.getSourcePosYTwo().equals(one.getSourcePosYTwo())
                                || !command.getSourcePosZTwo().equals(one.getSourcePosZTwo()) || !command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo())
                                || !command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()) || !command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo())
                                || !command.getCommand().equals(one.getCommand()) || !command.getAckFinish().equals(one.getAckFinish())
                        ) {
                            try {
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));