From ff31d592924958958c21fdef1975d499586d964f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 17:41:43 +0800
Subject: [PATCH] BUG修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index c16a671..e14b884 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.service.WarehouseService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -103,18 +104,17 @@
Warehouse warehouse1 = warehouseService.getById(warehouse.getId());
if (!warehouse.getName().equals(warehouse1.getName())) {
- List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse1.getName()));
+ List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
if (!areasList.isEmpty()) {
throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
}
}
if (!warehouse.getCode().equals(warehouse1.getCode())) {
- List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse1.getCode()));
+ List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode()));
if (!areasList.isEmpty()) {
throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
}
}
-
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
@@ -166,12 +166,11 @@
ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response);
}
+ @ApiOperation("鑾峰彇浠撳簱鏍戠姸鍥�")
@PreAuthorize("hasAuthority('manager:warehouse:list')")
- @GetMapping("/warehouse/areas")
- public R getAreasForWarehouse() {
- return R.ok(warehouseService.getAllWarehouseAreas());
+ @PostMapping("/warehouse/areas")
+ public R getAreasForWarehouse(@RequestBody Map<String, Object> param) {
+ return R.ok(warehouseService.getAllWarehouseAreas(param));
}
-
-
}
--
Gitblit v1.9.1