999

zhangc

2025-04-18 98f9980e242e5f4eb104750fd0c173474aa398fe

 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;
            }
@@ -352,7 +352,13 @@
                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                continue;
            } else {
                News.info("{}任务，无提升机处调度小车成功", wrkMast.getWrkNo());
                WrkMast wrkMast1 = wrkMastService.selectByMainWrkNo(wrkMast.getWrkNo());
                if (wrkMast1 == null) {
                    News.info("{}任务，调度小车失败,终于发现了", wrkMast.getWrkNo());
                    continue;
                } else {
                    News.info("{}任务，无提升机处调度小车成功", wrkMast.getWrkNo());
                }
            }

            wrkMast.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN.sts);
@@ -399,22 +405,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 +1070,7 @@
                return false;
            }

            if (!staProtocol.isOutEnable()) {
            if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
                News.info("{}任务，{}站点，没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return false;
            }