From b591d3396c94e0ca3496d2bac280d106438c75e9 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期六, 17 八月 2024 09:37:35 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java index 8f84135..c9b7b0a 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java @@ -64,6 +64,14 @@ } @PreAuthorize("hasAuthority('asrs:locDetl:list')") + @GetMapping("/locDetl/locId/{locId}") + public R list(@PathVariable("locId") Long locId) { + List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, locId)); + List<LocDetl> locDetls = locDetlService.parseLocDetl(list); + return R.ok().add(locDetls); + } + + @PreAuthorize("hasAuthority('asrs:locDetl:list')") @GetMapping("/locDetl/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(locDetlService.getById(id)); @@ -139,7 +147,9 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { - ExcelUtil.build(ExcelUtil.create(locDetlService.list(), LocDetl.class), response); + List<LocDetl> locDetls = locDetlService.parseLocDetl(locDetlService.list()); + List<MatField> locFields = matFieldService.getLocFields(); + ExcelUtil.build(ExcelUtil.create(locDetls, LocDetl.class, locFields), response); } private void setLocDetlField(HashMap<String, Object> param, LocDetl locDetl) { -- Gitblit v1.9.1