输送线指令优化

zhangchao

2024-09-07 f8416d2e77be90d79814cec0255663c180768cff

输送线指令优化

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

@@ -653,7 +653,7 @@
                                crnThread.setResetFlag(true);
                            } else if (statusTypeTwo == CrnStatusType.WAITING_TWO) {
                                crnThread.setResetFlagTwo(true);
                            } else {
                            } else if (statusTypeTwo == CrnStatusType.WAITING_All){
                                crnThread.setResetFlag(true);
                                crnThread.setResetFlagTwo(true);
                            }

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

@@ -187,7 +187,7 @@


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