md
This commit is contained in:
parent
e561f1eb03
commit
f66d7dd91c
@ -370,7 +370,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getProductType(),
|
List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getProductType(),
|
||||||
emisWaybill.getSendSiteCode(),emisWaybill.getDispatchSiteCode(),
|
emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(),
|
||||||
emisWaybill.getCalcFeeType());
|
emisWaybill.getCalcFeeType());
|
||||||
|
|
||||||
|
|
||||||
@ -471,8 +471,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType());
|
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType());
|
||||||
String carryType=emisTransProduct.getCarryType();
|
String carryType=emisTransProduct.getCarryType();
|
||||||
|
|
||||||
double setteldWeight = WaybillHelper.calcSettledWeight(maxWeight);
|
double setteldWeight = WaybillHelper.calcSettledWeight(maxWeight,carryType);
|
||||||
emisWaybill.setSettlementWeight(setteldWeight);
|
emisWaybill.setSettlementWeight(BigDecimal.valueOf(setteldWeight));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user