对照协议调整

zhangchao

2024-09-02 4b697e4dd36fb63bce7428956593cf7c086773de

对照协议调整

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1396,15 +1396,16 @@
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 堆垛机复位
                        News.warnNoLog("" + mark + " - 2" + " - 修改成功后复位堆垛机 : 堆垛机号={}", crnThread.getCrnProtocol().getCrnNo());
                        Short mode = crnProtocol.getMode();
                        if (mode == 1) {
                        if (statusType == CrnStatusType.WAITING_ONE) {
                            crnThread.setResetFlag(true);
                        } else if (mode == 2) {
                        } else if (statusTypeTwo == CrnStatusType.WAITING_TWO) {
                            crnThread.setResetFlagTwo(true);
                        } else if (mode == 3) {
                        } else {
                            crnThread.setResetFlag(true);
                            crnThread.setResetFlagTwo(true);
                        }
                    } else {
                        News.error("" + mark + " - 2" + " - 修改成功后复位堆垛机 失败！！，堆垛机号={}", crnThread.getCrnProtocol().getCrnNo());
                    }
                }


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

@@ -187,47 +187,41 @@


                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
                if (crnProtocol.getMode() == 1) {
                if (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)) {
                            resetFlag = false;
                        }
                    }
                } else if (crnProtocol.getMode() == 2) {
                } else if (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)) {
                            resetFlagTwo = false;
                        }
                    }
                } else if (crnProtocol.getMode() == 3) {
                } else if (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)) {
                            resetFlag = false;
                            resetFlagTwo = false;
                        }
                    }
                }