From ad9930c5cf8624b8056bb9fda164fa65e66ef9cd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 13:30:11 +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/WarehouseController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 418763b..c16a671 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
@@ -101,13 +101,20 @@
}
warehouse.setUpdateBy(getLoginUserId());
- List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
- if (!warehouses.isEmpty()) {
- throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ 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()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ }
}
- if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
- throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ if (!warehouse.getCode().equals(warehouse1.getCode())) {
+ List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse1.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
}
+
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
@@ -159,4 +166,12 @@
ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response);
}
+ @PreAuthorize("hasAuthority('manager:warehouse:list')")
+ @GetMapping("/warehouse/areas")
+ public R getAreasForWarehouse() {
+ return R.ok(warehouseService.getAllWarehouseAreas());
+ }
+
+
+
}
--
Gitblit v1.9.1