From f66d7dd91c9c9f154f41ed2dd43375c8f141c2b3 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 29 Apr 2024 13:46:33 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 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)); }