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-08-27 07:04:05 +08:00
parent 9fb8b5a808
commit 393b1ded5e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -458,7 +458,6 @@ public class EmisSettleBillController extends BaseController
voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
String feeRemark=""; String feeRemark="";
if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){ if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){
feeRemark=billItem.getWaybillDetail().getRemark(); feeRemark=billItem.getWaybillDetail().getRemark();
} }
@ -469,8 +468,6 @@ public class EmisSettleBillController extends BaseController
voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark());
BigDecimal otherFee = BigDecimal.ZERO; BigDecimal otherFee = BigDecimal.ZERO;
BigDecimal transFee = BigDecimal.ZERO; BigDecimal transFee = BigDecimal.ZERO;
BigDecimal cebFee = BigDecimal.ZERO; BigDecimal cebFee = BigDecimal.ZERO;
@ -480,6 +477,8 @@ public class EmisSettleBillController extends BaseController
String declareFeeStr = ""; String declareFeeStr = "";
String otherFeeStr = ""; String otherFeeStr = "";
String feeItemRemark="";
//计算分项数据 //计算分项数据
List<EmisSettleSubBillFeeitem> feeItemList=billItem.getFeeitemList(); List<EmisSettleSubBillFeeitem> feeItemList=billItem.getFeeitemList();
if( !CollectionUtils.isEmpty(feeItemList)){ if( !CollectionUtils.isEmpty(feeItemList)){
@ -514,6 +513,7 @@ public class EmisSettleBillController extends BaseController
otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+","; otherFeeStr= otherFeeStr+""+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+",";
} }
if( if(
cebFee.compareTo(BigDecimal.ZERO)>0 cebFee.compareTo(BigDecimal.ZERO)>0
|| declareFee.compareTo(BigDecimal.ZERO)>0 || declareFee.compareTo(BigDecimal.ZERO)>0
@ -522,6 +522,12 @@ public class EmisSettleBillController extends BaseController
isNeedComplexTpl=true; isNeedComplexTpl=true;
} }
if(!StringUtils.isEmpty(feeitem.getRemark())){
if(!feeitem.getRemark().contains("w")){
feeItemRemark=feeItemRemark+"["+feeitem.getFeeName()+":"+feeitem.getBillFee().stripTrailingZeros().toPlainString()+currencyStr+"],";
}
}
} }
}else{ }else{
transFeeStr=billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString(); transFeeStr=billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString();
@ -548,6 +554,8 @@ public class EmisSettleBillController extends BaseController
voMap.put("declareFee",declareFeeStr); voMap.put("declareFee",declareFeeStr);
voMap.put("otherFee",otherFeeStr); voMap.put("otherFee",otherFeeStr);
voMap.put("feeRemark", feeRemark+","+feeItemRemark);
listMap.add(voMap); listMap.add(voMap);
} }