#
Junjie
16 小时以前 63a8366af4391d1717d7555ab6c01f984f501f7b
#
4个文件已修改
18 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/StationController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/StationController.java
@@ -70,6 +70,9 @@
        }
        StationCommand command = stationThread.getCommand(StationCommandType.MOVE, taskNo, stationId, targetStationId, 0);
        if (command == null) {
            return R.error("生成输送命令失败,路径为空或不可达");
        }
        MessageQueue.offer(SlaveType.Devp, devpNo, new Task(2, command));
        return R.ok();
    }
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
@@ -219,6 +219,11 @@
        if (commandType == StationCommandType.MOVE) {
            if (!stationId.equals(targetStationId)) {
                List<Integer> path = calcPathStationIds(stationId, targetStationId);
                if (path == null || path.isEmpty()) {
                    log.warn("输送线命令生成失败,路径为空,taskNo={}, stationId={}, targetStationId={}",
                            taskNo, stationId, targetStationId);
                    return null;
                }
                stationCommand.setNavigatePath(path);
            }
        }
src/main/java/com/zy/core/thread/impl/ZyStationV4Thread.java
@@ -240,6 +240,11 @@
                        liftTransferPath.add(stationNo);
                    }
                }
                if (path.isEmpty()) {
                    log.warn("输送线命令生成失败,路径为空,taskNo={}, stationId={}, targetStationId={}",
                            taskNo, stationId, targetStationId);
                    return null;
                }
                stationCommand.setNavigatePath(path);
                stationCommand.setLiftTransferPath(liftTransferPath);
            }
src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java
@@ -245,6 +245,11 @@
                    liftTransferPath.add(stationNo);
                }
            }
            if (path.isEmpty()) {
                log.warn("输送线命令生成失败,路径为空,taskNo={}, stationId={}, targetStationId={}",
                        taskNo, stationId, targetStationId);
                return null;
            }
            stationCommand.setNavigatePath(path);
            stationCommand.setLiftTransferPath(liftTransferPath);
        }