diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java index 2fce03175..438e44c52 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java @@ -48,10 +48,11 @@ public class DeliveTaskApplicationService { applyPdaOrganizationScope(deliveTaskDO, loginUser); applyPdaWarehouseScope(deliveTaskDO, loginUser); Long tabType = deliveTaskDO.getTabType(); + boolean handoverList = deliveTaskDO.getTaskType() != null && deliveTaskDO.getTaskType() == 7; if (tabType != null && tabType == 1L) { // 指派给我的:已接收(operators_by = 当前用户) deliveTaskDO.setOperatorsBy(loginUser.getUserid()); - } else if (tabType == null || tabType == 2L) { + } else if (!handoverList && (tabType == null || tabType == 2L)) { // 任务大厅:未领取任务池(含入库审核收货、出库生成拣货单等自动下发的任务),不按下发人过滤 if (tabType == null) { deliveTaskDO.setTabType(2L); 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 40cacf6bd..03827752f 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 @@ -112,7 +112,7 @@ public class DeliveTaskDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; - @ApiModelProperty("查询类型 1-指派给我的 2-任务") + @ApiModelProperty("查询类型 1-指派给我的 2-任务大厅;taskType=7 出库交接可不传 tabType,不会按未领取过滤") @Excel(name = "查询类型 1-指派给我的 2-任务") private Long tabType; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java index 57559f546..9b9268a4d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java @@ -33,7 +33,8 @@ public class DeliveTaskAppApi extends BaseController { /** * 分页查询下发任务列表。条件:del_flag=1、当前用户 organization_id、绑定仓库(未传 warehouseId 时取用户仓库绑定)、 * {@code tabType=2} 任务大厅(operators_name 为空,含收货/上架/拣货等自动下发任务)、 - * {@code tabType=1} 指派给我的(operators_by=当前用户);不按 task_status 默认过滤。 + * {@code tabType=1} 指派给我的(operators_by=当前用户); + * {@code taskType=7} 出库交接列表(按 handoverQueryType 过滤,不限制 operators_name 为空);不按 task_status 默认过滤。 */ @ApiOperation("查询下发任务列表") @GetMapping("/list") diff --git a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml index c3caa7abe..4037ce746 100644 --- a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml +++ b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml @@ -210,8 +210,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and operators_by = #{operatorsBy} + - + + + and operators_name like concat('%', #{operatorsName}, '%')