md
This commit is contained in:
parent
3dcdd6723e
commit
5c99d45c0b
@ -398,7 +398,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
log.info("计算项目:"+JSONObject.toJSONString(exprItem)+",重量:"+emisWaybill.getSettlementWeight().doubleValue());
|
log.info("计算项目:"+JSONObject.toJSONString(exprItem)+",重量:"+emisWaybill.getSettlementWeight().doubleValue());
|
||||||
|
|
||||||
if( exprItem.getStartWeight().doubleValue() <= 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.setFeeCode(quoteItem.getFeeType());
|
||||||
feeItem.setQuoteId(quoteItem.getQuoteId());
|
feeItem.setQuoteId(quoteItem.getQuoteId());
|
||||||
@ -425,7 +425,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
for (EmisQuoteExpression exprItem: exprList) {
|
for (EmisQuoteExpression exprItem: exprList) {
|
||||||
if(
|
if(
|
||||||
exprItem.getStartWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue()
|
exprItem.getStartWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue()
|
||||||
&& exprItem.getEndWeight().doubleValue() >= emisWaybill.getTotalVolume().doubleValue()
|
&& exprItem.getEndWeight().doubleValue() > emisWaybill.getTotalVolume().doubleValue()
|
||||||
){
|
){
|
||||||
feeItem.setFeeCode(quoteItem.getFeeType());
|
feeItem.setFeeCode(quoteItem.getFeeType());
|
||||||
feeItem.setQuoteId(quoteItem.getQuoteId());
|
feeItem.setQuoteId(quoteItem.getQuoteId());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user