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 40a62c86a..43f35fa19 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 @@ -159,6 +159,9 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm fillMap.put("recvProvinceName", emisWaybillOld.getReceiveProvinceName()); fillMap.put("recvCityName", emisWaybillOld.getReceiveCityName()); + fillMap.put("sendSiteName", emisWaybillOld.getSendSiteName()); + fillMap.put("dispatchUnderlingSiteName", emisWaybillOld.getDispatchUnderlingSiteName()); + BigDecimal dutyFee = BigDecimal.ZERO; String dutyFeeCurrency = "CNY"; 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 6fa18428c..14bcfa114 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 diff --git a/emis-biz/src/main/resources/tpl/cust_tax_bill_tpl.docx b/emis-biz/src/main/resources/tpl/cust_tax_bill_tpl.docx index 4964140c2..1b18c02f4 100644 Binary files a/emis-biz/src/main/resources/tpl/cust_tax_bill_tpl.docx and b/emis-biz/src/main/resources/tpl/cust_tax_bill_tpl.docx differ