#

luxiaotao1123

2024-09-21 bf616f97b4d1a96e0ee89c52178a88e044e52a1d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java

@@ -80,7 +80,14 @@
    @PreAuthorize("hasAuthority('manager:agv:list')")
    @GetMapping("/agv/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(agvService.getById(id));
        Agv agv = agvService.getById(id);
        if (null != agv) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null != agvDetail) {
                agv.setAgvDetail(agvDetail);
            }
        }
        return R.ok().add(agv);
    }

    @PreAuthorize("hasAuthority('manager:agv:save')")