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 6d16ffefe..40da474f5 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
@@ -150,7 +150,7 @@ public class EmisWaybillController extends BaseController
             return AjaxResult.success("计算成功", jObjRst);
         }catch (Exception ex){
             ex.printStackTrace();
-            return AjaxResult.error("服务器异常，联系客服");
+            return AjaxResult.error(ex.getMessage());
         }
 
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 1597a7707..8cad9db74 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -362,7 +362,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         if(StringUtils.isAnyEmpty(emisWaybill.getProductType(),
                 emisWaybill.getSendSiteCode(),
-                emisWaybill.getDispatchSiteCode(),
+                emisWaybill.getDispatchUnderlingSiteCode(),
                 emisWaybill.getCalcFeeType()
             )
         ){