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-07-24 06:28:09 +08:00
parent 2e677d84c0
commit 29a6eb26a4
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,8 +253,6 @@ public class EmisSettleBillController extends BaseController
if( !CollectionUtils.isEmpty(feeItemList) ){ if( !CollectionUtils.isEmpty(feeItemList) ){
if(feeItemList.size()>1) { if(feeItemList.size()>1) {
tplName = "tpl/bill_tpl.xlsx"; tplName = "tpl/bill_tpl.xlsx";
}
BigDecimal otherFee = BigDecimal.ZERO; BigDecimal otherFee = BigDecimal.ZERO;
BigDecimal transFee = BigDecimal.ZERO; BigDecimal transFee = BigDecimal.ZERO;
BigDecimal cebFee = BigDecimal.ZERO; BigDecimal cebFee = BigDecimal.ZERO;
@ -274,8 +272,6 @@ public class EmisSettleBillController extends BaseController
} else { } else {
otherFee = otherFee.add(feeitem.getBillFee()); otherFee = otherFee.add(feeitem.getBillFee());
} }
}else{
} }
} }
@ -284,16 +280,16 @@ public class EmisSettleBillController extends BaseController
voMap.put("declareFee", declareFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : declareFee.stripTrailingZeros().toPlainString()); voMap.put("declareFee", declareFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : declareFee.stripTrailingZeros().toPlainString());
voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString()); voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO) == 0 ? "0" : otherFee.stripTrailingZeros().toPlainString());
}else{ }else{
tplName = "tpl/bill_tpl_simple.xlsx";
}
// {.transFee} {.cebFee} {.declareFee} {.otherFee}
listMap.add(voMap);
}else{
voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
} }
}else{
tplName = "tpl/bill_tpl_simple.xlsx";
voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
}
listMap.add(voMap);
}
ServletOutputStream outputStream = response.getOutputStream(); ServletOutputStream outputStream = response.getOutputStream();