999

zhangc

2025-04-18 23a2e30f0f70c1f526a04bffda38fd124ed47630

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

@@ -139,12 +139,12 @@
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线无物", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                return false;
            }
            //TODO
//            if (!staProtocol.getFinishWorkNo().equals(wrkMast.getWrkNo())) {
//                            log.info( "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
//                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
//                return false;
//            }

            if (!staProtocol.getFinishWorkNo().equals(wrkMast.getWrkNo())) {
                            log.info( "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
                return false;
            }
            //小车处于空闲状态
            if (!shuttleThread.isIdle()) {
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}小车，小车忙碌中", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
@@ -841,12 +841,11 @@
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线无物", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
                return false;
            }
            //TODO
//            if (!staProtocol.getFinishWorkNo().equals(wrkMast.getWrkNo())) {
//                log.error("{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
//                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
//                return false;
//            }
            if (!staProtocol.getFinishWorkNo().equals(wrkMast.getWrkNo())) {
                log.error("{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
                News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号输送线的工作号和工作档不匹配", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
                return false;
            }

            if (!shuttleProtocol.getCurrentLocNo().equals(wrkMast.getSourceLocNo())) {
                return false;