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 2025-03-16 22:33:36 +08:00
parent cf73dde25a
commit 651b11cd96
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java
View File

@ -100,9 +100,11 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm
} }
String tplName=""; String tplName="";
// 快递
if("1".equals(tplType) ){ if("1".equals(tplType) ){
tplName="tpl/ws_kd_in_tpl.docx"; tplName="tpl/cust_bill_tpl.docx";
}
else if("2".equals(tplType) ){
tplName="tpl/cust_tax_bill_tpl.docx";
} }
BigDecimal totalAllPrice=BigDecimal.ZERO; BigDecimal totalAllPrice=BigDecimal.ZERO;
@ -124,7 +126,6 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm
fillMap.put("country", emisWaybillOld.getReceiveCountryName()); fillMap.put("country", emisWaybillOld.getReceiveCountryName());
fillMap.put("warehouse", emisWaybillOld.getIntoWarehouseName()); fillMap.put("warehouse", emisWaybillOld.getIntoWarehouseName());
fillMap.put("productName", emisWaybillOld.getProductTypeName()); fillMap.put("productName", emisWaybillOld.getProductTypeName());
fillMap.put("estDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, emisWaybillOld.getPickStartDate() == null ? emisWaybillOld.getOrderDate() : emisWaybillOld.getPickStartDate()));
fillMap.put("supplier", ""); fillMap.put("supplier", "");
fillMap.put("sendName", Convert.chineseName(emisWaybillOld.getSendName())); fillMap.put("sendName", Convert.chineseName(emisWaybillOld.getSendName()));