From 67a2c5fb41efcbcc028c8f4da0783c45f6b90f41 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 16 三月 2026 16:37:35 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index bdfb1e4..0e7b477 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -455,7 +455,10 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
task.setTaskStatus(TaskStsType.COMPLETE_IN.id);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)){
- if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
+ if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
+ ){
task.setTaskStatus(TaskStsType.AWAIT.id);
} else {
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
@@ -467,16 +470,20 @@
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
- if ((!Cools.isEmpty(task.getResource()) && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val))
- // 鐩樼偣鍑哄簱鍏堝埌 196(闈炴尝娆�)
- ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ if ((!Cools.isEmpty(task.getResource())
+ && (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
+ )
+ )// 鐩樼偣鍑哄簱鍏堝埌 196(闈炴尝娆�)
+ ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
) {
task.setTaskStatus(TaskStsType.AWAIT.id);
} else {
task.setTaskStatus(TaskStsType.WAVE_SEED.id);
}
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)){//澶囪揣
- task.setTaskStatus(TaskStsType.AWAIT.id);
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)){
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
--
Gitblit v1.9.1