diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index d2c52cd37..1249be954 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -37,6 +37,7 @@ import com.xdadan.erp.system.service.ISysFileInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
@@ -137,6 +138,10 @@ public class EmisWaybillController extends BaseController
             ex.printStackTrace();
             return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage());
         }
+        catch (DuplicateKeyException e) {
+            e.printStackTrace();
+            return AjaxResult.error("运单号重复!");
+        }
         catch (Exception ex){
             ex.printStackTrace();
             // 返回子定义异常