From dc7114ad69937f768089c62dbcc9b9d5a627c9b7 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 29 May 2024 18:18:26 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 a909cb0c4..8e9cee2cd 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 @@ -672,8 +672,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb 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() + if( exprItem.getStartWeight().doubleValue() < emisWaybill.getSettlementWeight().doubleValue() + && exprItem.getEndWeight().doubleValue() >= emisWaybill.getSettlementWeight().doubleValue() ){ feeItem.setFeeCode(quoteItem.getFeeType()); String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType()); @@ -722,8 +722,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb for (EmisQuoteExpression exprItem: exprList) { if( - exprItem.getStartWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue() - && exprItem.getEndWeight().doubleValue() > emisWaybill.getTotalVolume().doubleValue() + exprItem.getStartWeight().doubleValue() < emisWaybill.getTotalVolume().doubleValue() + && exprItem.getEndWeight().doubleValue() >= emisWaybill.getTotalVolume().doubleValue() ){ feeItem.setFeeCode(quoteItem.getFeeType()); String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType());