zhou zhou
1 天以前 1dcfa3702505f0c431757312b5304531029f90f6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
@@ -45,8 +45,7 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Transfer, BaseParam> pageParam = new PageParam<>(baseParam, Transfer.class);
        PageParam<Transfer, BaseParam> page = transferService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }
    @ApiOperation("获取调拔单关联订单")
@@ -55,7 +54,7 @@
    public R getTransferInfo(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Transfer, BaseParam> pageParam = new PageParam<>(baseParam, Transfer.class);
        return R.ok().add(transferService.transfersPage(pageParam, pageParam.buildWrapper(true)));
        return R.ok().add(buildPageRowsUtils.rowsMap(transferService.transfersPage(pageParam, pageParam.buildWrapper(true))));
    }
    @ApiOperation("调拔单生成出库单")
@@ -71,19 +70,19 @@
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(transferService.list());
        return R.ok().add(buildPageRowsUtils.rowsMap(transferService.list()));
    }
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping({"/transfer/many/{ids}", "/transfers/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(transferService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(transferService.listByIds(Arrays.asList(ids))));
    }
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @GetMapping("/transfer/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(transferService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(transferService.getById(id)));
    }
    @PreAuthorize("hasAuthority('manager:transfer:save')")
@@ -103,7 +102,7 @@
        if (!transferService.save(transfer)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(transfer);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(transfer));
    }
    @PreAuthorize("hasAuthority('manager:transfer:update')")
@@ -115,7 +114,7 @@
        if (!transferService.updateById(transfer)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(transfer);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(transfer));
    }
    @PreAuthorize("hasAuthority('manager:transfer:remove')")
@@ -129,7 +128,7 @@
        if (!transferService.removeTransfer(list)) {
            throw new CoolException("调拔单移除失败!!");
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
    }
    @PreAuthorize("hasAuthority('manager:transfer:list')")
@@ -143,7 +142,7 @@
        transferService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }
    @PostMapping("/transfer/items/save")
@@ -174,7 +173,7 @@
        if (Objects.isNull(params)) {
            return R.error("参数不能为空!!");
        }
        return R.ok().add(transferService.getLocsItems(params, getLoginUserId()));
        return R.ok().add(buildPageRowsUtils.rowsMap(transferService.getLocsItems(params, getLoginUserId())));
    }
    /**
@@ -197,7 +196,7 @@
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(transferService.list(), Transfer.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(transferService.list()), Transfer.class), response);
    }
}