diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java index 27b77944c..d1fd647db 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java @@ -167,9 +167,10 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm EmisSettleSubBill billItem = getSettleSubBillBySubBillNo(emisWaybillOld.getBillCode()); List feeItemList = billItem.getFeeitemList(); + if (!CollectionUtils.isEmpty(feeItemList)) { for (EmisSettleSubBillFeeitem feeitem : feeItemList) { - feeitem.setBillFee(feeitem.getBillFee().stripTrailingZeros()); + feeitem.setBillFee(new BigDecimal(feeitem.getBillFee().stripTrailingZeros().toPlainString())); if("2004".equals(feeitem.getFeeCode())){ dutyFee=feeitem.getBillFee(); dutyFeeCurrency = feeitem.getCurrency(); diff --git a/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx b/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx index 21804d3d4..768112d36 100644 Binary files a/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx and b/emis-biz/src/main/resources/tpl/cust_bill_tpl.docx differ