From 6623d7e57f58989625388a6e8aea4b176de8c966 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 16 Oct 2024 18:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=87=8D=E5=90=8D=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/controller/WhHouseInfoController.java         | 6 +++++-
 .../warehouse/service/impl/WhHouseInfoServiceImpl.java      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/controller/WhHouseInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/controller/WhHouseInfoController.java
index ddcb9b25..50d1cf1d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/controller/WhHouseInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/controller/WhHouseInfoController.java
@@ -110,7 +110,11 @@ public class WhHouseInfoController extends BaseController {
     @SysLog(title = "仓库管理", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改仓库管理")
     @PutMapping
     public AjaxResult edit(@RequestBody WhHouseInfo whHouseInfo) {
-        return toAjax(whHouseInfoService.updateWhHouseInfo(whHouseInfo));
+        try {
+            return toAjax(whHouseInfoService.updateWhHouseInfo(whHouseInfo));
+        } catch (Exception e) {
+            return error("系统错误, " + e.getMessage());
+        }
     }
 
     /**
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/service/impl/WhHouseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/service/impl/WhHouseInfoServiceImpl.java
index c39e07c8..148d3f0d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/service/impl/WhHouseInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/service/impl/WhHouseInfoServiceImpl.java
@@ -71,7 +71,11 @@ public class WhHouseInfoServiceImpl implements IWhHouseInfoService
     public int updateWhHouseInfo(WhHouseInfo whHouseInfo)
     {
         whHouseInfo.setUpdateTime(DateUtils.getNowDate());
-        return whHouseInfoMapper.updateWhHouseInfo(whHouseInfo);
+        try {
+            return whHouseInfoMapper.updateWhHouseInfo(whHouseInfo);
+        } catch (Exception e) {
+            throw new ServiceException("数据库错误或仓库重名");
+        }
     }
 
     /**