diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index b17f1cd4f..e937b6375 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -228,7 +228,7 @@ public class EmisSettleBillController extends BaseController Map textMap = MapUtils.newHashMap(); textMap.put("title", bill.getSettleBillName()); - textMap.put("total", bill.getRecMoney().toString()); + textMap.put("total", bill.getRecMoney().stripTrailingZeros().toPlainString()); String tplName="tpl/bill_tpl_simple.xlsx"; @@ -284,14 +284,18 @@ public class EmisSettleBillController extends BaseController voMap.put("declareFee",declareFee.compareTo(BigDecimal.ZERO)==0?"0": declareFee.stripTrailingZeros().toPlainString()); voMap.put("otherFee", otherFee.compareTo(BigDecimal.ZERO)==0?"0":otherFee.stripTrailingZeros().toPlainString()); }else{ - voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); + } // {.transFee} {.cebFee} {.declareFee} {.otherFee} listMap.add(voMap); + }else{ + voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); } + + ServletOutputStream outputStream = response.getOutputStream(); //账单主数据填充