From 7a2174d6260320946c98a8edf8d1103faca289a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 27 May 2026 17:11:10 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E5=A4=A7=E5=8E=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveTaskApplicationService.java | 27 ++++++++++------ .../persistence/DeliveTaskImpl.java | 6 ++++ .../deliveTask/DeliveTaskAppApi.java | 4 +-- .../mapper/deliveTask/DeliveTaskMapper.xml | 32 ++++++++++++------- 4 files changed, 46 insertions(+), 23 deletions(-) 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 1f8ababa4..2fce03175 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 @@ -45,10 +45,7 @@ public class DeliveTaskApplicationService { public List queryListApp(DeliveTaskDO deliveTaskDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null){ - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1){ - deliveTaskDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); - } + applyPdaOrganizationScope(deliveTaskDO, loginUser); applyPdaWarehouseScope(deliveTaskDO, loginUser); Long tabType = deliveTaskDO.getTabType(); if (tabType != null && tabType == 1L) { @@ -113,16 +110,28 @@ public class DeliveTaskApplicationService { public DeliveTaskPO querySum(DeliveTaskDO deliveTaskDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null){ - Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); - if (topOrganizationId != null && topOrganizationId != 1){ - deliveTaskDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); - deliveTaskDO.setOperatorsBy(loginUser.getUserid()); - } + applyPdaOrganizationScope(deliveTaskDO, loginUser); + deliveTaskDO.setOperatorsBy(loginUser.getUserid()); applyPdaWarehouseScope(deliveTaskDO, loginUser); } return deliveTaskDomainService.querySum(deliveTaskDO); } + /** + * PDA：按当前用户 organization_id 过滤（与 delive_task.organization_id 一致）； + * 平台超管(topOrganizationId=1) 不按组织过滤。 + */ + private static void applyPdaOrganizationScope(DeliveTaskDO deliveTaskDO, LoginUser loginUser) { + if (loginUser.getUserPo() == null) { + return; + } + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1) { + deliveTaskDO.setTopOrganizationId(null); + deliveTaskDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + } + } + /** PDA：按用户绑定仓库过滤任务（与收货/上架等 App 列表一致） */ private static void applyPdaWarehouseScope(DeliveTaskDO deliveTaskDO, LoginUser loginUser) { if (deliveTaskDO.getWarehouseId() != null) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java index db1a1463a..9eee09437 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java @@ -183,6 +183,12 @@ public class DeliveTaskImpl extends ServiceImpl im for (DeliveTaskDO deliveTaskDO : deliveTaskDOList){ DeliveTask deliveTask = new DeliveTask(); BeanUtils.copyProperties(deliveTaskDO,deliveTask); + if (deliveTask.getTaskStatus() == null) { + deliveTask.setTaskStatus(0); + } + if (deliveTask.getDelFlag() == null) { + deliveTask.setDelFlag(1); + } deliveTaskList.add(deliveTask); NoticeMessageLoggingDto noticeMessageLoggingDto = new NoticeMessageLoggingDto(); noticeMessageLoggingDto.setUserId(deliveTaskDO.getOperatorsBy()); 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 84fab7514..57559f546 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 @@ -31,8 +31,8 @@ public class DeliveTaskAppApi extends BaseController { private DeliveTaskAssembler deliveTaskAssembler; /** - * 分页查询下发任务列表。条件：del_flag=1、当前一级组织、绑定仓库（未传 warehouseId 时取用户仓库绑定）、 - * {@code tabType=2} 任务大厅（operators_by 为空，含收货/上架/拣货等自动下发任务）、 + * 分页查询下发任务列表。条件：del_flag=1、当前用户 organization_id、绑定仓库（未传 warehouseId 时取用户仓库绑定）、 + * {@code tabType=2} 任务大厅（operators_name 为空，含收货/上架/拣货等自动下发任务）、 * {@code tabType=1} 指派给我的（operators_by=当前用户）；不按 task_status 默认过滤。 */ @ApiOperation("查询下发任务列表") diff --git a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml index d9f570e32..c3caa7abe 100644 --- a/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml +++ b/mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml @@ -54,6 +54,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select deliver_task_id, task_number, tracking_number, organization_id, organization_name, top_organization_id, warehouse_id, warehouse_code, warehouse_name, task_type, task_status, task_distribution, task_distribution_time, task_distribution_id, task_distribution_name, operators_by, operators_name, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, reassign_time, reassign_by_id, reassign_by_name from delive_task + + + + and (task_status = 0 OR task_status IS NULL) + + + and task_status = #{taskStatus} + + + + + + and (operators_name IS NULL OR operators_name = '') + + del_flag = 1 @@ -99,9 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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) - - and task_status = #{taskStatus} - + and task_distribution = #{taskDistribution} @@ -181,9 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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) - - and task_status = #{taskStatus} - + and task_distribution = #{taskDistribution} @@ -200,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and operators_by = #{operatorsBy} - and operators_by IS NULL + and operators_name like concat('%', #{operatorsName}, '%') @@ -254,9 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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) - - and task_status = #{taskStatus} - + and task_distribution = #{taskDistribution} @@ -386,8 +395,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delive_task WHERE del_flag = 1 - AND (operators_by = '' - OR operators_by IS NULL) + ) taskSum