From 10776dd6f7f9ef9e47419427fcb1b692ed73d54d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 03 二月 2026 14:34:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 d33430a..f096f84 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
@@ -101,6 +101,10 @@
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();
}
List<TaskPathTemplateMerge> taskPathTemplateMergeList = taskPathTemplateMergeService.list(new LambdaQueryWrapper<TaskPathTemplateMerge>().eq(TaskPathTemplateMerge::getSourceType, sou).eq(TaskPathTemplateMerge::getTargetType, end));
if (Objects.isNull(taskPathTemplateMergeList) || taskPathTemplateMergeList.isEmpty()) {
@@ -156,7 +160,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 +171,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 +194,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 +221,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,21 +231,21 @@
flowStepInstance.setStepOrder(j);
flowStepInstance.setStepCode(String.valueOf(snowflakeIdWorker.nextId()));
flowStepInstance.setWmsNowTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
+ flowStepInstance.setTaskNo(taskInstance.getTaskNo());
// 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
if (globalIndex < allFlowStepTemplates.size() - 1) {
// 涓嶆槸鏈�鍚庝竴涓紝鍙栦笅涓�涓殑WmsNowTaskStatus
FlowStepTemplate nextFlowStep = allFlowStepTemplates.get(globalIndex + 1);
flowStepInstance.setWmsNextTaskStatus(nextFlowStep.getWmsNowTaskStatus());
- if (globalIndex == 0){
- task.setTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
- flowStepInstance.setStatus((short)1);
- }
} else {
// 鏄渶鍚庝竴涓紝璁剧疆涓�9999
flowStepInstance.setWmsNextTaskStatus(9999);
}
-
+ if (globalIndex == 0){
+ task.setTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
+ flowStepInstance.setStatus((short)1);
+ }
flowStepInstanceService.save(flowStepInstance);
globalIndex++; // 鏇存柊鍏ㄥ眬绱㈠紩
}
--
Gitblit v1.9.1