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 07be86f3a..40a62c86a 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 @@ -124,7 +124,7 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm Configure config = Configure.builder().bind("feeList", policy).build(); Map fillMap = new HashMap<>(); - fillMap.put("billCode", billCode); + fillMap.put("billCode", emisWaybillOld.getBillCode()); fillMap.put("productName", emisWaybillOld.getProductTypeName()); fillMap.put("sendDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, emisWaybillOld.getSendDate())); @@ -141,8 +141,8 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm fillMap.put("recvCountry", emisWaybillOld.getReceiveCountryName()); fillMap.put("goodsInfo", emisWaybillOld.getGoodsInfo()); - fillMap.put("parcelQty", emisWaybillOld.getParcelQty()); - fillMap.put("settlementWeight", emisWaybillOld.getSettlementWeight()); + fillMap.put("parcelQty", emisWaybillOld.getParcelQty().toString()); + fillMap.put("settlementWeight", emisWaybillOld.getSettlementWeight().stripTrailingZeros().toPlainString()); fillMap.put("productTypeName", emisWaybillOld.getProductTypeName()); fillMap.put("salesmen", emisWaybillOld.getSalesmen()); 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 b604f8704..0819a2256 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