From 6212655d5e574ed473a7670f918c0fcd7f00d003 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 三月 2026 14:55:50 +0800
Subject: [PATCH] 任务管理完结功能

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 9e8ca7d..f31aa37 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -856,10 +856,10 @@
                 || TaskType.TASK_TYPE_MERGE_IN.type.equals(task.getTaskType())
                 || TaskType.TASK_TYPE_LOC_MOVE.type.equals(task.getTaskType())) {
             task.setTaskStatus(TaskStsType.COMPLETE_IN.id);
-        } else if (TaskType.TASK_TYPE_OUT.type.equals(task.getTaskType())) {
+        } else if (TaskType.TASK_TYPE_OUT.type.equals(task.getTaskType())
+                || TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.equals(task.getTaskType())) {
             task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
-        } else if (TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.equals(task.getTaskType())
-                || TaskType.TASK_TYPE_CHECK_OUT.type.equals(task.getTaskType())) {
+        } else if (TaskType.TASK_TYPE_CHECK_OUT.type.equals(task.getTaskType())) {
             task.setTaskStatus(TaskStsType.AWAIT.id);
         } else if (TaskType.TASK_TYPE_MERGE_OUT.type.equals(task.getTaskType())) {
             task.setTaskStatus(TaskStsType.MISSION_TRANSFER.id);

--
Gitblit v1.9.1