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 1d6ffe73f..b17f1cd4f 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 @@ -243,9 +243,9 @@ public class EmisSettleBillController extends BaseController voMap.put("paymentType", DictUtils.getDictLabel("emis_payment_type",billItem.getWaybillDetail().getPaymentType())); voMap.put("productTypeName", billItem.getWaybillDetail().getProductTypeName()); voMap.put("parcelQty", billItem.getWaybillDetail().getParcelQty().toString()); - voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight()); - voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().toString()); - voMap.put("freight", billItem.getWaybillDetail().getFreight().toString()); + voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight().stripTrailingZeros().toPlainString()); + voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().stripTrailingZeros().toPlainString()); + voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark()); //计算分项数据 @@ -279,11 +279,12 @@ public class EmisSettleBillController extends BaseController } } - voMap.put("transFee", transFee.toString()); - voMap.put("cebFee",cebFee.toString()); - voMap.put("declareFee", declareFee.toString()); - voMap.put("otherFee", otherFee.toString()); - + voMap.put("transFee",transFee.compareTo(BigDecimal.ZERO)==0?"0":transFee.stripTrailingZeros().toPlainString()); + voMap.put("cebFee",cebFee.compareTo(BigDecimal.ZERO)==0?"0":cebFee.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()); + }else{ + voMap.put("transFee",billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString()); } // {.transFee} {.cebFee} {.declareFee} {.otherFee} diff --git a/emis-biz/src/main/resources/tpl/bill_tpl.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl.xlsx index 3b7e7a090..cd8dc1209 100644 Binary files a/emis-biz/src/main/resources/tpl/bill_tpl.xlsx and b/emis-biz/src/main/resources/tpl/bill_tpl.xlsx differ diff --git a/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx b/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx index b68c69e21..33c3a3ea8 100644 Binary files a/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx and b/emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx differ