From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
index f9d4673..e6cd17b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocPreviewController.java
@@ -10,7 +10,6 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.enums.LocStsType;
@@ -25,7 +24,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
@@ -38,7 +36,7 @@
private LocService locService;
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/page")
+ @PostMapping("/locPreview/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
@@ -50,13 +48,13 @@
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/list")
+ @PostMapping("/locPreview/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(locService.list());
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/areaNoUse/list")
+ @PostMapping("/locPreview/areaNoUse/list")
public R areaNoUselist(@RequestBody Map<String, Object> map) {
String locCode = map.get("locCode").toString();
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
@@ -70,20 +68,20 @@
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping({"/loc/preview/many/{ids}", "/loc/preview/many/{ids}"})
+ @PostMapping({"/locPreview/many/{ids}", "/locPreview/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(locService.listByIds(Arrays.asList(ids)));
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @GetMapping("/loc/preview/{id}")
+ @GetMapping("/locPreview/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(locService.getById(id));
}
@PreAuthorize("hasAuthority('manager:locPreview:save')")
@OperationLog("Create 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/save")
+ @PostMapping("/locPreview/save")
public R save(@RequestBody Loc loc) {
if (Objects.isNull(loc.getWarehouseId())) {
throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
@@ -110,7 +108,7 @@
@PreAuthorize("hasAuthority('manager:locPreview:update')")
@OperationLog("Update 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/update")
+ @PostMapping("/locPreview/update")
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
@@ -130,7 +128,7 @@
@PreAuthorize("hasAuthority('manager:locPreview:remove')")
@OperationLog("Delete 搴撲綅淇℃伅琛�")
- @PostMapping("/loc/preview/remove/{ids}")
+ @PostMapping("/locPreview/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!locService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
@@ -139,7 +137,7 @@
}
@PreAuthorize("hasAuthority('manager:locPreview:list')")
- @PostMapping("/loc/preview/query")
+ @PostMapping("/locPreview/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<>();
@@ -154,7 +152,7 @@
@PreAuthorize("hasAuthority('manager:locPreview:list')")
@ApiOperation("搴撲綅瀵煎嚭")
- @PostMapping("/loc/preview/export")
+ @PostMapping("/locPreview/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
List<Loc> locs = new ArrayList<>();
if (Objects.isNull(map.get("ids"))) {
@@ -167,7 +165,7 @@
@PreAuthorize("hasAuthority('manager:locPreview:update')")
@ApiOperation("搴撲綅鎵归噺淇敼")
- @PostMapping("/loc/preview/modify")
+ @PostMapping("/locPreview/modify")
public R batchUpdate(@RequestBody LocModifyParams locs) {
if (Objects.isNull(locs)) {
throw new CoolException("鍙備负涓嶈兘涓虹┖锛侊紒");
--
Gitblit v1.9.1