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

PDA任务大厅修改

Browse Source
This commit is contained in:
秦鸿展
2026-05-27 17:11:10 +08:00
parent 1280bdd67d
commit 7a2174d626
4 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java
+18 -9
View File
@@ -45,10 +45,7 @@ public class DeliveTaskApplicationService {
public List<DeliveTaskPO> 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) {
mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java
+6
View File
@@ -183,6 +183,12 @@ public class DeliveTaskImpl extends ServiceImpl<DeliveTaskMapper, DeliveTask> 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());
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java
+2 -2
View File
@@ -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("查询下发任务列表")