From 5c99d45c0bc8915c7421b38eb6e84f9d671605cb Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 29 Apr 2024 14:18:15 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 6a6356fc7..040efe61c 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 @@ -398,7 +398,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb log.info("计算项目:"+JSONObject.toJSONString(exprItem)+",重量:"+emisWaybill.getSettlementWeight().doubleValue()); if( exprItem.getStartWeight().doubleValue() <= emisWaybill.getSettlementWeight().doubleValue() - && exprItem.getEndWeight().doubleValue() >= emisWaybill.getSettlementWeight().doubleValue() + && exprItem.getEndWeight().doubleValue() > emisWaybill.getSettlementWeight().doubleValue() ){ feeItem.setFeeCode(quoteItem.getFeeType()); feeItem.setQuoteId(quoteItem.getQuoteId()); @@ -425,7 +425,7 @@ 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.getEndWeight().doubleValue() > emisWaybill.getTotalVolume().doubleValue() ){ feeItem.setFeeCode(quoteItem.getFeeType()); feeItem.setQuoteId(quoteItem.getQuoteId());