weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-15 14:15:12 +08:00
parent 099667fd5d 3a8740d57f
commit 984270cb53
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/todo/DeliveTaskDO.java
+3
View File
@@ -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;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java
+3
View File
@@ -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;
}
mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
+14
View File
@@ -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>