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 8cad9db74..140ec3a32 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 @@ -391,13 +391,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb continue; } -// emisWaybill.getTotalVolume(), -// emisWaybill.getSettlementWeight() - EmisWaybillFeeitem feeItem = new EmisWaybillFeeitem(); // 重量计费 if("1".equals(calcFeeType)){ for (EmisQuoteExpression exprItem: exprList) { + log.info("计算项目:"+JSONObject.toJSONString(exprItem)+",重量:"+emisWaybill.getSettlementWeight().doubleValue()); + if( exprItem.getStartWeight().doubleValue() >= emisWaybill.getSettlementWeight().doubleValue() && exprItem.getEndWeight().doubleValue() <= emisWaybill.getSettlementWeight().doubleValue() ){