From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 03e2193..418763b 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,15 @@
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
warehouse.setUpdateBy(getLoginUserId());
+
+ 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("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1