Showing
1 changed file
with
2 additions
and
2 deletions
| @@ -290,7 +290,7 @@ public class BusinessDataExportHandler implements ExportHandler { | @@ -290,7 +290,7 @@ public class BusinessDataExportHandler implements ExportHandler { | ||
| 290 | File pdfFile = ExcelUtil.convertExcelToPdf(tempExcel, "/usr/bin/libreoffice --headless --convert-to pdf --outdir %s %s"); | 290 | File pdfFile = ExcelUtil.convertExcelToPdf(tempExcel, "/usr/bin/libreoffice --headless --convert-to pdf --outdir %s %s"); |
| 291 | try (InputStream pdfIn = new FileInputStream(pdfFile)) { | 291 | try (InputStream pdfIn = new FileInputStream(pdfFile)) { |
| 292 | ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-" | 292 | ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-" |
| 293 | - + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印" + ".pdf"); | 293 | + + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印-" + createTime + ".pdf"); |
| 294 | zos.putNextEntry(entry); | 294 | zos.putNextEntry(entry); |
| 295 | byte[] buffer = new byte[8192]; | 295 | byte[] buffer = new byte[8192]; |
| 296 | int len; | 296 | int len; |
| @@ -310,7 +310,7 @@ public class BusinessDataExportHandler implements ExportHandler { | @@ -310,7 +310,7 @@ public class BusinessDataExportHandler implements ExportHandler { | ||
| 310 | ByteArrayOutputStream baos = new ByteArrayOutputStream(); | 310 | ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
| 311 | workbook.write(baos); | 311 | workbook.write(baos); |
| 312 | ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-" | 312 | ZipEntry entry = new ZipEntry(orderInfo.getOrderNo() + "-" |
| 313 | - + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印" + ".xlsx"); | 313 | + + orderInfo.getOrderingUnitName() + "-" + orderInfo.getWorkshopName() + "-订货单打印-" + createTime + ".xlsx"); |
| 314 | zos.putNextEntry(entry); | 314 | zos.putNextEntry(entry); |
| 315 | zos.write(baos.toByteArray()); | 315 | zos.write(baos.toByteArray()); |
| 316 | zos.closeEntry(); | 316 | zos.closeEntry(); |