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:19:08 +08:00
parent c1d3d34940
commit f8a1f67f7c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,9 +243,9 @@ public class EmisSettleBillController extends BaseController
voMap.put("paymentType", DictUtils.getDictLabel("emis_payment_type",billItem.getWaybillDetail().getPaymentType())); voMap.put("paymentType", DictUtils.getDictLabel("emis_payment_type",billItem.getWaybillDetail().getPaymentType()));
voMap.put("productTypeName", billItem.getWaybillDetail().getProductTypeName()); voMap.put("productTypeName", billItem.getWaybillDetail().getProductTypeName());
voMap.put("parcelQty", billItem.getWaybillDetail().getParcelQty().toString()); voMap.put("parcelQty", billItem.getWaybillDetail().getParcelQty().toString());
voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight()); voMap.put("settlementWeight", billItem.getWaybillDetail().getSettlementWeight().stripTrailingZeros().toPlainString());
voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().toString()); voMap.put("totalVolume", billItem.getWaybillDetail().getTotalVolume().stripTrailingZeros().toPlainString());
voMap.put("freight", billItem.getWaybillDetail().getFreight().toString()); voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark()); voMap.put("feeRemark", billItem.getWaybillDetail().getFeeRemark());
//计算分项数据 //计算分项数据
@ -279,11 +279,12 @@ public class EmisSettleBillController extends BaseController
} }
} }
voMap.put("transFee", transFee.toString()); voMap.put("transFee",transFee.compareTo(BigDecimal.ZERO)==0?"0":transFee.stripTrailingZeros().toPlainString());
voMap.put("cebFee",cebFee.toString()); voMap.put("cebFee",cebFee.compareTo(BigDecimal.ZERO)==0?"0":cebFee.stripTrailingZeros().toPlainString());
voMap.put("declareFee", declareFee.toString()); voMap.put("declareFee",declareFee.compareTo(BigDecimal.ZERO)==0?"0": declareFee.stripTrailingZeros().toPlainString());
voMap.put("otherFee", otherFee.toString()); 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} // {.transFee} {.cebFee} {.declareFee} {.otherFee}

BIN
emis-biz/src/main/resources/tpl/bill_tpl.xlsx
View File

Binary file not shown.

BIN
emis-biz/src/main/resources/tpl/bill_tpl_simple.xlsx
View File

Binary file not shown.