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/LocController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
index 38a0079..dc979f6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
@@ -5,7 +5,9 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.LocDetl;
+import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.service.LocDetlService;
+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;
@@ -32,6 +34,7 @@
@PreAuthorize("hasAuthority('asrs:loc:list')")
@PostMapping("/loc/page")
+ @CacheData(tableName = {"man_loc"})
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
@@ -40,18 +43,21 @@
@PreAuthorize("hasAuthority('asrs:loc:list')")
@PostMapping("/loc/list")
+ @CacheData(tableName = {"man_loc"})
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(locService.list());
}
@PreAuthorize("hasAuthority('asrs:loc:list')")
@GetMapping("/loc/{id}")
+ @CacheData(tableName = {"man_loc"})
public R get(@PathVariable("id") Long id) {
return R.ok().add(locService.getById(id));
}
@PreAuthorize("hasAuthority('asrs:loc:list')")
@PostMapping("/loc/search/locNo")
+ @CacheData(tableName = {"man_loc"})
public R get(@RequestParam("locNo") String locNo) {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo));
if(loc == null) {
@@ -64,6 +70,29 @@
map.put("loc", loc);
map.put("locDetls", locDetls);
return R.ok().add(map);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:loc:list')")
+ @PostMapping("/loc/search/like/locNo")
+ @CacheData(tableName = {"man_loc"})
+ public R search(@RequestParam("locNo") String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.ok().add(new ArrayList<>());
+ }
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().like(LocDetl::getLocNo, locNo));
+ locDetls = locDetlService.parseLocDetl(locDetls);
+ return R.ok().add(locDetls);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:loc:list')")
+ @PostMapping("/loc/search/empty/locNo")
+ @CacheData(tableName = {"man_loc"})
+ public R searchEmpty(@RequestParam("locNo") String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.ok().add(locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.O.val())));
+ }
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.O.val()).like(Loc::getLocNo, locNo));
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('asrs:loc:save')")
@@ -113,7 +142,11 @@
@PreAuthorize("hasAuthority('asrs:loc:list')")
@PostMapping("/loc/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locService.list(), Loc.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
+ List<Loc> data = locService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, Loc.class), response);
}
}
--
Gitblit v1.9.1