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-05-29 18:18:26 +08:00
parent aba6997ebf
commit dc7114ad69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,8 +672,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());
String feeName=DictUtils.getDictLabel("emis_fee_type",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) { 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());
String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType()); String feeName=DictUtils.getDictLabel("emis_fee_type",quoteItem.getFeeType());