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("数据库错误或仓库重名");
+        }
     }
 
     /**