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 da057fe8f..1597a7707 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
@@ -370,7 +370,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getProductType(),
-                emisWaybill.getSendSiteCode(),emisWaybill.getDispatchSiteCode(),
+                emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(),
                 emisWaybill.getCalcFeeType());
 
 
@@ -471,8 +471,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType());
         String carryType=emisTransProduct.getCarryType();
 
-        double setteldWeight = WaybillHelper.calcSettledWeight(maxWeight);
-        emisWaybill.setSettlementWeight(setteldWeight);
+        double setteldWeight = WaybillHelper.calcSettledWeight(maxWeight,carryType);
+        emisWaybill.setSettlementWeight(BigDecimal.valueOf(setteldWeight));
 
     }