对照协议调整

zhangchao

2024-09-02 7225bce9f6e79f4c6ac4ea592b644a6447f81c2e

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

@@ -189,7 +189,7 @@
                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
                if (crnProtocol.getMode() == 1) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_ONE)) {
                        if (resetFlag) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
@@ -203,7 +203,7 @@
                    }
                } else if (crnProtocol.getMode() == 2) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
                    if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING_TWO)) {
                        if (resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
@@ -211,13 +211,13 @@
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                                resetFlagTwo = false;
                            }
                        }
                    }
                } else if (crnProtocol.getMode() == 3) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && !Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_All)) {
                        if (resetFlag && resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
@@ -226,6 +226,7 @@
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                                resetFlagTwo = false;
                            }
                        }
                    }
@@ -337,14 +338,6 @@
                                || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
                                || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
                        ) {
                            System.out.println(command.getTaskNo().equals(one.getTaskNo()));
                            System.out.println(command.getTaskMode().equals(one.getTaskMode()));
                            System.out.println(command.getDestinationPosX().equals(one.getDestinationPosX()));
                            System.out.println(command.getDestinationPosY().equals(one.getDestinationPosY()));
                            System.out.println(command.getDestinationPosZ().equals(one.getDestinationPosZ()));
                            System.out.println(command.getSourcePosZ().equals(one.getSourcePosZ()));
                            System.out.println(command.getSourcePosY().equals(one.getSourcePosY()));
                            System.out.println(command.getSourcePosX().equals(one.getSourcePosX()));
                            try {
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            } catch (Exception e) {
@@ -373,14 +366,6 @@
                                || !command.getSourcePosZTwo().equals(one.getSourcePosZTwo()) || !command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo())
                                || !command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()) || !command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo())
                        ) {
                            System.out.println(command.getTaskNo().equals(one.getTaskNo()));
                            System.out.println(command.getTaskMode().equals(one.getTaskMode()));
                            System.out.println(command.getSourcePosXTwo().equals(one.getSourcePosXTwo()));
                            System.out.println(command.getDestinationPosYTwo().equals(one.getDestinationPosYTwo()));
                            System.out.println(command.getDestinationPosZTwo().equals(one.getDestinationPosZTwo()));
                            System.out.println(command.getSourcePosZTwo().equals(one.getSourcePosZTwo()));
                            System.out.println(command.getSourcePosYTwo().equals(one.getSourcePosYTwo()));
                            System.out.println(command.getDestinationPosXTwo().equals(one.getDestinationPosXTwo()));
                            try {
                                log.error("堆垛机命令地址写入后回读失败==>不一致[id:{}] >>>>> 写入[{}],===>>回读[{}]", slave.getId(), JSON.toJSONString(command), JSON.toJSONString(one));
                            } catch (Exception e) {