From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 二月 2025 10:08:32 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 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 3549007..984a684 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 @@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; +import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.*; import com.zy.asrs.wms.asrs.entity.enums.LocStsType; -import com.zy.asrs.wms.asrs.mapper.LocDetlMapper; +import com.zy.asrs.wms.asrs.entity.param.LocDetlFreezeParam; import com.zy.asrs.wms.asrs.service.LocDetlFieldService; import com.zy.asrs.wms.asrs.service.LocService; import com.zy.asrs.wms.asrs.service.MatFieldService; +import com.zy.asrs.wms.common.annotation.CacheData; import com.zy.asrs.wms.common.annotation.OperationLog; import com.zy.asrs.wms.common.domain.BaseParam; import com.zy.asrs.wms.common.domain.KeyValVo; @@ -42,6 +44,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/page") + @CacheData(tableName = {"man_loc_detl"}) public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class); @@ -51,6 +54,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/outPage") + @CacheData(tableName = {"man_loc_detl"}) public R outPage(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class); @@ -67,6 +71,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/list") + @CacheData(tableName = {"man_loc_detl"}) public R list(@RequestBody Map<String, Object> map) { List<LocDetl> list = locDetlService.getLocDetlList(map); return R.ok().add(list); @@ -74,6 +79,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/listByIds") + @CacheData(tableName = {"man_loc_detl"}) public R listByIds(@RequestBody List<Long> ids) { List<LocDetl> list = locDetlService.listByIds(ids); List<LocDetl> locDetls = locDetlService.parseLocDetl(list); @@ -82,6 +88,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @GetMapping("/locDetl/locId/{locId}") + @CacheData(tableName = {"man_loc_detl"}) 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); @@ -90,6 +97,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @GetMapping("/locDetl/locNo/{locNo}") + @CacheData(tableName = {"man_loc_detl"}) public R list(@PathVariable("locNo") String locNo) { Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo)); if (loc == null) { @@ -102,6 +110,7 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @GetMapping("/locDetl/{id}") + @CacheData(tableName = {"man_loc_detl"}) public R get(@PathVariable("id") Long id) { return R.ok().add(locDetlService.getById(id)); } @@ -131,7 +140,6 @@ locDetlField.setName(matField.getName()); locDetlFieldService.save(locDetlField); } - return R.ok("娣诲姞鎴愬姛"); } @@ -176,7 +184,11 @@ @PreAuthorize("hasAuthority('asrs:locDetl:list')") @PostMapping("/locDetl/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { - List<LocDetl> locDetls = locDetlService.parseLocDetl(locDetlService.list()); + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<LocDetl, BaseParam> pageParam = new PageParam<>(baseParam, LocDetl.class); + List<LocDetl> data = locDetlService.list(pageParam.buildWrapper(true)); + + List<LocDetl> locDetls = locDetlService.parseLocDetl(data); List<MatField> locFields = matFieldService.getLocFields(); ExcelUtil.build(ExcelUtil.create(locDetls, LocDetl.class, locFields), response); } @@ -204,4 +216,12 @@ } } + @PreAuthorize("hasAuthority('asrs:locDetl:update')") + @OperationLog("搴撳瓨鍐荤粨") + @PostMapping("/locDetl/freeze") + public R freeze(@RequestBody LocDetlFreezeParam param) { + locDetlService.locDetlFreeze(param); + return R.ok(); + } + } -- Gitblit v1.9.1