From 651b11cd96bdb2ead145fb1dca9695fe533775cb Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 16 Mar 2025 22:33:36 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisSettleSubBillServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 4bb8cc1ad..a5a9c535f 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 @@ -100,9 +100,11 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm } String tplName=""; - // 快递 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; @@ -124,7 +126,6 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm fillMap.put("country", emisWaybillOld.getReceiveCountryName()); fillMap.put("warehouse", emisWaybillOld.getIntoWarehouseName()); 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("sendName", Convert.chineseName(emisWaybillOld.getSendName()));