From 6a8a09a887d08b9505e39e6a69c5ef5db9ebf2f1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 二月 2026 09:06:37 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
index dc00520..a206dfa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
@@ -88,8 +88,7 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)) {
sou = task.getOrgSite();
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
end = loc.getAreaId().toString();
@@ -101,6 +100,15 @@
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
sou = loc.getAreaId().toString();
end = task.getTargSite();
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)){
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ sou = loc.getAreaId().toString();
+ end = loc.getAreaId().toString();
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)){
+ Loc loc1 = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ end = loc1.getAreaId().toString();
+ Loc loc2 = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ sou = loc2.getAreaId().toString();
}
List<TaskPathTemplateMerge> taskPathTemplateMergeList = taskPathTemplateMergeService.list(new LambdaQueryWrapper<TaskPathTemplateMerge>().eq(TaskPathTemplateMerge::getSourceType, sou).eq(TaskPathTemplateMerge::getTargetType, end));
if (Objects.isNull(taskPathTemplateMergeList) || taskPathTemplateMergeList.isEmpty()) {
@@ -156,7 +164,7 @@
}
List<TaskPathTemplateNode> taskPathTemplateNodeList = taskPathTemplateNodeService.list(
new LambdaQueryWrapper<TaskPathTemplateNode>()
- .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()));
+ .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()).orderByAsc(TaskPathTemplateNode::getNodeOrder));
for (TaskPathTemplateNode taskPathTemplateNode : taskPathTemplateNodeList) {
List<SubsystemFlowTemplate> subsystemFlowTemplateList = subsystemFlowTemplateService.list(
@@ -167,7 +175,7 @@
for (SubsystemFlowTemplate subsystemFlowTemplate : subsystemFlowTemplateList) {
List<FlowStepTemplate> flowStepTemplateList = flowStepTemplateService.list(
new LambdaQueryWrapper<FlowStepTemplate>()
- .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()));
+ .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()).orderByAsc(FlowStepTemplate::getStepOrder));
allFlowStepTemplates.addAll(flowStepTemplateList);
}
@@ -190,7 +198,7 @@
}
List<TaskPathTemplateNode> taskPathTemplateNodeList = taskPathTemplateNodeService.list(
new LambdaQueryWrapper<TaskPathTemplateNode>()
- .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()));
+ .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()).orderByAsc(TaskPathTemplateNode::getNodeOrder));
for (TaskPathTemplateNode taskPathTemplateNode : taskPathTemplateNodeList) {
TaskInstanceNode taskInstanceNode = new TaskInstanceNode(taskPathTemplateNode);
@@ -217,7 +225,7 @@
List<FlowStepTemplate> flowStepTemplateList = flowStepTemplateService.list(
new LambdaQueryWrapper<FlowStepTemplate>()
- .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()));
+ .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()).orderByAsc(FlowStepTemplate::getStepOrder));
for (FlowStepTemplate flowStepTemplate : flowStepTemplateList) {
j++;
@@ -227,7 +235,7 @@
flowStepInstance.setStepOrder(j);
flowStepInstance.setStepCode(String.valueOf(snowflakeIdWorker.nextId()));
flowStepInstance.setWmsNowTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
- flowStepInstance.setTaskNo(taskInstance.getTaskNo());
+ flowStepInstance.setTaskNo(task.getTaskCode());
// 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
if (globalIndex < allFlowStepTemplates.size() - 1) {
--
Gitblit v1.9.1