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 888741a48..57bb4755f 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,18 +124,19 @@ 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("productName", emisWaybillOld.getProductTypeName()); fillMap.put("sendDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, emisWaybillOld.getSendDate())); - fillMap.put("sendName", Convert.chineseName(emisWaybillOld.getSendName())); - fillMap.put("sendTel", Convert.mobile(emisWaybillOld.getSendMobile())); - fillMap.put("sendAddress", Convert.address(emisWaybillOld.getSendAddress())); + fillMap.put("sendName",emisWaybillOld.getSendName()); + fillMap.put("sendTel", emisWaybillOld.getSendMobile()); + fillMap.put("sendAddress", emisWaybillOld.getSendAddress()); fillMap.put("sendCompany", emisWaybillOld.getSendCompany()); fillMap.put("sendCountry", emisWaybillOld.getSendCountryName()); - fillMap.put("recvName", Convert.chineseName(emisWaybillOld.getReceiveName())); - fillMap.put("recvTel", Convert.mobile(emisWaybillOld.getReceiveMobile())); - fillMap.put("recvAddress", Convert.address(emisWaybillOld.getReceiveAddress())); + fillMap.put("recvName", emisWaybillOld.getReceiveName()); + fillMap.put("recvTel", emisWaybillOld.getReceiveMobile()); + fillMap.put("recvAddress", emisWaybillOld.getReceiveAddress()); fillMap.put("recvCompany", emisWaybillOld.getReceiveCompany()); fillMap.put("recvCountry", emisWaybillOld.getReceiveCountryName()); 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 cf9a611d8..83d60ffe2 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