From 51c27e505842ce3343dfabfb994d2fc28ae0d8a8 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
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