999
zhangc
2025-04-18 855ae16895a43bf56ecb22436204c18fbe466980
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -339,7 +339,7 @@
                News.info("{}任务,{}站点,不在自动状态", wrkMast.getWrkNo(), staProtocol.getSiteId());
                continue;
            }
            if (!staProtocol.isOutEnable()) {
            if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
                News.info("{}任务,{}站点,没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());
                continue;
            }
@@ -399,22 +399,23 @@
                        }
                        String sourceLocNo = "1200305";
                        String locNo = "1100105";
                        String locNo = "1300105";
                        if (wrkMast.getStaNo() == 1013) {
                            sourceLocNo = "1200301";
                            locNo = "1100101";
                            locNo = "1300101";
                            if (loc.contains(locNo)) {
                                locNo = "1000101";
                                locNo = "1100101";
                            }
                        } else {
                            if (loc.contains(locNo)) {
                                locNo = "1000105";
                                locNo = "1100105";
                            }
                        }
                        boolean dispatchShuttle = shuttleDispatchUtils.shuttleMoveGenerate(wrkMast.getWrkNo(), sourceLocNo, locNo, wrkMast.getShuttleNo(), null, false);
                        if (!dispatchShuttle) {
                            News.taskInfo(wrkMast.getWrkNo(), "{}小车,挪车调度至取货点失败", wrkMast.getShuttleNo());
                            continue;
                        }
                        staProtocol.setWorkNo(Short.parseShort(String.valueOf(wrkMast.getWrkNo())));
@@ -1063,7 +1064,7 @@
                return false;
            }
            if (!staProtocol.isOutEnable()) {
            if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
                News.info("{}任务,{}站点,没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return false;
            }