aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-04-29 14:17:46 +08:00
parent 6cc197dfe1
commit 3dcdd6723e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -397,8 +397,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
for (EmisQuoteExpression exprItem: exprList) { for (EmisQuoteExpression exprItem: exprList) {
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());
@ -423,8 +423,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
else if("2".equals(calcFeeType)){ else if("2".equals(calcFeeType)){
for (EmisQuoteExpression exprItem: exprList) { for (EmisQuoteExpression exprItem: exprList) {
if( exprItem.getStartWeight().doubleValue() >= emisWaybill.getTotalVolume().doubleValue() if(
&& exprItem.getEndWeight().doubleValue() <= emisWaybill.getTotalVolume().doubleValue() exprItem.getStartWeight().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());