输送线指令优化

zhangchao

2024-09-07 4f364f6601955d68b07c318d51f7db3f435effde

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

@@ -187,47 +187,57 @@


                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
                if (crnProtocol.getMode() == 1) {
                if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusType() == CrnStatusType.WAITING_ONE) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_ONE)) {
                        if (resetFlag) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                            }
                    if (resetFlag) {
                        if (crnProtocol.getTaskNo() == 9999) {
                            backHpFlag = false;
                        }
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short) 1);
                        if (write(crnCommand)) {
                            News.info("---第二步、[堆垛机号：{}, 工作号：{}]==>> 一工位复位resetFlag标记成功{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                            resetFlag = false;
                        } else {
                            News.error("---第二步、[堆垛机号：{}, 工作号：{}]==>> 一工位复位resetFlag标记失败{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                        }
                    }
                } else if (crnProtocol.getMode() == 2) {
                } else if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_TWO) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING_TWO)) {
                        if (resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlagTwo = false;
                            }
                    if (resetFlagTwo) {
                        if (crnProtocol.getTaskNo() == 9999) {
                            backHpFlag = false;
                        }
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short) 1);
                        if (write(crnCommand)) {
                            News.info("---第二步、[堆垛机号：{}, 工作号：{}]==>> 二工位复位resetFlag标记成功{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                            resetFlagTwo = false;
                        } else {
                            News.error("---第二步、[堆垛机号：{}, 工作号：{}]==>> 二工位复位resetFlag标记失败{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                        }

                    }
                } else if (crnProtocol.getMode() == 3) {
                } else if (!Cools.isEmpty(crnProtocol.getTaskNo()) && crnProtocol.getStatusType() == CrnStatusType.WAITING_All && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_All) {
                    // 复位信号
                    if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_All)) {
                        if (resetFlag && resetFlagTwo) {
                            if (crnProtocol.getTaskNo() == 9999) {
                                backHpFlag = false;
                            }
                            CrnCommand crnCommand = new CrnCommand();
                            crnCommand.setAckFinish((short) 1);
                            if (write(crnCommand)) {
                                resetFlag = false;
                                resetFlagTwo = false;
                            }
                    if (resetFlag && resetFlagTwo) {
                        if (crnProtocol.getTaskNo() == 9999) {
                            backHpFlag = false;
                        }
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short) 1);
                        if (write(crnCommand)) {
                            News.info("---第二步、[堆垛机号：{}, 工作号：{}]==>> 双工位复位resetFlag标记成功{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                            resetFlag = false;
                            resetFlagTwo = false;
                        } else {
                            News.error("---第二步、[堆垛机号：{}, 工作号：{}]==>> 双工位复位resetFlag标记失败{}！！",
                                    slave.getId(), crnProtocol.getTaskNo(), resetFlag);
                        }
                    }
                }
@@ -275,6 +285,7 @@
            News.error("SiemensCrn" + " - 6" + " - 堆垛机写入命令为空");
            return false;
        }
        System.out.println(" 堆垛机写入命令：" + command);
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[16];