Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

2 天以前 51c27e505842ce3343dfabfb994d2fc28ae0d8a8

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -37,29 +37,26 @@

    @Autowired
    private TaskService taskService;
    @Autowired
    private TaskItemService taskItemService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private LocService locService;
    @Autowired
    private ConfigServiceImpl configService;


    /** 分页查询任务列表，并根据 mission_flow_step_instance 判断每条是否可点完成（canComplete），供前端展示完成按钮 */
    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        QueryWrapper<Task> queryWrapper = pageParam.buildWrapper(true);
        return R.ok().add(taskService.page(pageParam, queryWrapper));
        Page<Task> pageResult = taskService.page(pageParam, queryWrapper);
        taskService.fillCanComplete(pageResult.getRecords());
        return R.ok().add(pageResult);
    }

    /** 查询任务列表，同样根据 flowStepInstance 填充 canComplete */
    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskService.list());
        List<Task> list = taskService.list();
        taskService.fillCanComplete(list);
        return R.ok().add(list);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -101,15 +98,13 @@
    }

    @PreAuthorize("hasAuthority('manager:task:remove')")
    @OperationLog("取消/删除工作极档")
    @ApiOperation("取消/删除工作极档")
    @ApiOperation("取消/删除工作档")
    @PostMapping("/task/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (Objects.isNull(ids) || ids.length < 1) {
            return R.error("参数不能为空！！");
        }
        return taskService.removeTask(ids, getLoginUserId());
//        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
@@ -141,7 +136,6 @@
        }
        return R.ok("完成任务成功").add(taskService.operateComplete(id, getLoginUserId()));
    }


    /**
     * 拣料出库（用于测试拣料出库）