From 3dcdd6723ec13cf7374ff6a2e8a54be38be4295d Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 29 Apr 2024 14:17:46 +0800 Subject: [PATCH] md --- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 9 +++++---- 1 file changed, 5 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 140ec3a32..6a6356fc7 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 @@ -397,8 +397,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()); feeItem.setQuoteId(quoteItem.getQuoteId()); @@ -423,8 +423,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb else if("2".equals(calcFeeType)){ for (EmisQuoteExpression exprItem: exprList) { - if( exprItem.getStartWeight().doubleValue() >= emisWaybill.getTotalVolume().doubleValue() - && exprItem.getEndWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue() + if( + exprItem.getStartWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue() + && exprItem.getEndWeight().doubleValue() >= emisWaybill.getTotalVolume().doubleValue() ){ feeItem.setFeeCode(quoteItem.getFeeType()); feeItem.setQuoteId(quoteItem.getQuoteId());