diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 0735192..6db8d9e 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -329,7 +329,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { Long saleContractId = generateSaleContract(saleOrder,entrys); String htmlContent = generateHtmlContent(saleContractId); - String fileName = StrUtil.format(pdfPath+"/销售合约_{}", + String fileName = StrUtil.format(pdfPath+"/SaleContract_{}", new Date().getTime()); String templatePath = fileName + ".html"; @@ -487,7 +487,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { List saleContractEntrys = BeanUtils.toBean(saleContractVO.getSaleContractEntrys(), SaleContractEntryDO.class); String htmlContent = generateHtmlContent(saleContract,saleContractEntrys); String pdfPath2 = System.getProperty("user.dir") + "/pdffile"; - String fileName = StrUtil.format(pdfPath2+"/{}", saleOrder.getBillno()); + String fileName = StrUtil.format(pdfPath2+"/SaleContract_{}", saleOrder.getBillno()); String templatePath = fileName + ".html"; String pdfPath = fileName + ".pdf"; @@ -495,7 +495,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { log.info("已生成HTML文件:"+templatePath); //请求wkapp JSONObject params = new JSONObject(); - String fileName2 = StrUtil.format(pdfPath+"/", saleOrder.getBillno()); + String fileName2 = StrUtil.format(pdfPath+"/SaleContract_{}", saleOrder.getBillno()); String input_html_path = fileName2 + ".html"; params.put("input_html_path",input_html_path); params.put("output_pdf_path",pdfPath); @@ -507,7 +507,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { delFiles.add(pdfPath); delFiles.add(templatePath); } - String zipFileName = StrUtil.format(pdfPath + "/销售合约_{}", new Date().getTime()); + String zipFileName = StrUtil.format(pdfPath + "/SaleContract_{}", new Date().getTime()); // 压缩到的位置 File zipFile = new File(zipFileName+".zip");