1
2026-03-12 b69d8253dbf8b29bca1ac5f6cf1f305e5e188f0a
lsh#
3个文件已修改
20 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/WaitPakinParam.java
@@ -28,7 +28,7 @@
    @ApiModelProperty("AGV站点")
    private String staNo = "";
    @ApiModelProperty("AGV站点")
    @ApiModelProperty("目标库区")
    private String area = "";
    @ApiModelProperty("AGV呼叫标记")
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
@@ -234,7 +234,6 @@
    public boolean generateActualPath(Task task,TaskPathTemplateMerge taskPathTemplateMerge,boolean endSignUp) {
        boolean actualPath = false;
        List<Integer> conditionExpression = taskPathTemplateMerge.getConditionExpression();
        Integer i = 0;//it顺序
        Integer j = 0;//suT顺序
@@ -355,12 +354,7 @@
                basStationService.updateById(basStation);
            }
        }
        taskService.updateById(task);
        return actualPath;
        return true;
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -122,7 +122,7 @@
    public synchronized void missionTaskEXECUTE() {
        try{
            List<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
                    .eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
                    .eq(FlowStepInstance::getStatus,  (short) 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
            for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
                FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
                if (Cools.isEmpty(flowInstance)) { continue;}
@@ -201,7 +201,7 @@
                                    flowStepInstanceService.updateById(flowStepInstance);
                                    log.error("任务下发失败,源点未查询到目标点未查询到,等待重试....");
                                }
                                return;
                                continue;
                            } else {
                                missionTaskIssueParam.setSourceCode(basStation.getStationName());
                            }
@@ -226,7 +226,7 @@
                                flowStepInstanceService.updateById(flowStepInstance);
                                log.error("任务下发失败,源点未查询到目标点未查询到,等待重试....");
                            }
                            return;
                            continue;
                        } else {
                            missionTaskIssueParam.setSourceCode(basStation.getStationName());
                        }
@@ -252,7 +252,7 @@
                                    flowStepInstanceService.updateById(flowStepInstance);
                                    log.error("任务下发失败,目标点未查询到,等待重试....");
                                }
                                return;
                                continue;
                            } else {
                                missionTaskIssueParam.setTargetCode(basStation.getStationName());
                            }
@@ -278,7 +278,7 @@
                                flowStepInstanceService.updateById(flowStepInstance);
                                log.error("任务下发失败,目标点未查询到,等待重试....");
                            }
                            return;
                            continue;
                        } else {
                            missionTaskIssueParam.setTargetCode(basStation.getStationName());
                        }