From 34150a16ef56b933c59838da129d5b35b9dc09d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 13:29:21 +0800
Subject: [PATCH] 添加仓库，库区树状接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 7c3c51f..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
@@ -73,6 +73,14 @@
if (Objects.isNull(warehouse.getName())) {
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+
warehouse.setCreateBy(getLoginUserId());
warehouse.setUpdateBy(getLoginUserId());
if (!warehouseService.save(warehouse)) {
@@ -92,6 +100,22 @@
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
warehouse.setUpdateBy(getLoginUserId());
+
+ 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 (!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");
}
@@ -105,7 +129,8 @@
if (ids.length < 1) {
throw new CoolException("鏌ヨid涓嶈兘涓虹┖锛侊紒");
}
- List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().in(WarehouseAreas::getWareId, ids));
+ List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .in(WarehouseAreas::getWarehouseId, ids));
if (!warehouseAreas.isEmpty()) {
throw new CoolException("褰撳墠浠撳簱涓嬫湁鏈垹闄ゅ簱鍖猴紝 涓嶅彲鎿嶄綔鍒犻櫎锛侊紒");
}
@@ -141,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