From 4bf1353c8d46bb3dc1947a250123ae7153599e0b Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 23 Jun 2026 11:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/springblade/desk/logistics/pojo/dto/TaskDto.java | 3 +++
 .../desk/logistics/controller/OrderBoxController.java         | 2 +-
 .../java/org/springblade/desk/logistics/mapper/TaskMapper.xml | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/TaskDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/TaskDto.java
index 98d98708b..e1d1d9445 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/TaskDto.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/TaskDto.java
@@ -64,4 +64,7 @@ public class TaskDto extends BaseEntity {
 
     @Schema(description = "终点站点")
     private String endStationCode;
+
+    @Schema(description = "任务状态")
+    private String taskStatus;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java
index 37de9fe74..a895bdbc8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java
@@ -119,7 +119,7 @@ public class OrderBoxController extends BladeController {
             @Parameter(name = "taskStatus", description = "当前状态 0:退回(超重) 1:站点 2:库位 3:等待 4:回库 5:结束", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
             @Parameter(name = "startTime", description = "开始时间", in = ParameterIn.QUERY, schema = @Schema(type = "Date")),
             @Parameter(name = "endTime", description = "结束时间", in = ParameterIn.QUERY, schema = @Schema(type = "Date")),
-            @Parameter(name = "status", description = "任务状态", in = ParameterIn.QUERY, schema = @Schema(type = "String"))
+            @Parameter(name = "taskStatus", description = "任务状态", in = ParameterIn.QUERY, schema = @Schema(type = "String"))
 
     })
     public R<IPage<TaskVO>> page(@Parameter(hidden = true) TaskDto taskDto, Query query) {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml
index 980e3ec04..2f12e4a2d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml
@@ -70,8 +70,8 @@
         <if test="taskDto.endStationCode != null and taskDto.endStationCode != ''">
             AND ls.STATION_CODE LIKE '%' || #{taskDto.endStationCode} || '%'
         </if>
-        <if test="taskDto.status != null and taskDto.status != ''">
-            AND l.STATUS = #{taskDto.status}
+        <if test="taskDto.taskStatus != null and taskDto.taskStatus != ''">
+            AND l.TASK_STATUS = #{taskDto.taskStatus}
         </if>
         ORDER BY l.UPDATE_TIME DESC
     </select>