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 a92c19b8..ddcb9b25 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
@@ -94,7 +94,11 @@ public class WhHouseInfoController extends BaseController {
     @SysLog(title = "仓库管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增仓库管理")
     @PostMapping
     public AjaxResult add(@RequestBody WhHouseInfo whHouseInfo) {
-        return toAjax(whHouseInfoService.insertWhHouseInfo(whHouseInfo));
+        try {
+            return toAjax(whHouseInfoService.insertWhHouseInfo(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 09eebf28..c39e07c8 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
@@ -1,6 +1,7 @@
 package com.bonus.material.warehouse.service.impl;
 
 import java.util.List;
+import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,7 +54,11 @@ public class WhHouseInfoServiceImpl implements IWhHouseInfoService
     public int insertWhHouseInfo(WhHouseInfo whHouseInfo)
     {
         whHouseInfo.setCreateTime(DateUtils.getNowDate());
-        return whHouseInfoMapper.insertWhHouseInfo(whHouseInfo);
+        try {
+            return whHouseInfoMapper.insertWhHouseInfo(whHouseInfo);
+        } catch (Exception e) {
+            throw new ServiceException("数据库错误或仓库重名");
+        }
     }
 
     /**