diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java
index 8da01aba6..9e2aac9ec 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java
@@ -115,4 +115,7 @@ public class DeliveTaskDO extends BaseVOEntity {
     @ApiModelProperty("查询类型  1-指派给我的  2-任务")
     @Excel(name = "查询类型  1-指派给我的  2-任务")
     private Long tabType;
+
+    @ApiModelProperty("交接查询类型(taskType=7时生效): 1-列表(未交接) 2-历史(已交接)，不传默认1")
+    private Integer handoverQueryType;
 }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java
index 8f39e5d31..40cacf6bd 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java
@@ -115,4 +115,7 @@ public class DeliveTaskDTO extends BaseVOEntity {
     @ApiModelProperty("查询类型  1-指派给我的  2-任务")
     @Excel(name = "查询类型  1-指派给我的  2-任务")
     private Long tabType;
+
+    @ApiModelProperty("交接查询类型(taskType=7时生效): 1-列表(未交接) 2-历史(已交接)，不传默认1")
+    private Integer handoverQueryType;
 }
diff --git a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
index 729830731..196979e7f 100644
--- a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
@@ -91,6 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="taskType != null and taskType != 0 ">
             and task_type = #{taskType}
         </if>
+        <!-- taskType=7 交接作业单时，按 handoverQueryType 过滤: 1-列表(未交接) 2-历史(已交接)，不传默认1 -->
+        <if test="taskType != null and taskType == 7 and (handoverQueryType == null or handoverQueryType == 1)">
+            and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 1)
+        </if>
+        <if test="taskType != null and taskType == 7 and handoverQueryType == 2">
+            and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 2)
+        </if>
         <if test="taskStatus != null ">
             and task_status = #{taskStatus}
         </if>
@@ -158,6 +165,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskType != null ">
                 and task_type = #{taskType}
             </if>
+            <!-- taskType=7 交接作业单时，按 handoverQueryType 过滤: 1-列表(未交接) 2-历史(已交接)，不传默认1 -->
+            <if test="taskType != null and taskType == 7 and (handoverQueryType == null or handoverQueryType == 1)">
+                and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 1)
+            </if>
+            <if test="taskType != null and taskType == 7 and handoverQueryType == 2">
+                and EXISTS (SELECT 1 FROM handover_task_order hto WHERE hto.task_number = delive_task.tracking_number AND hto.del_flag = 1 AND hto.status = 2)
+            </if>
             <if test="taskStatus != null ">
                 and task_status = #{taskStatus}
             </if>