朱园亮 / xingyun-erp · Commits

Commit 6ba461946ab6bddb6390697c8c00577444ce8cce

Authored by 房远帅
1 parent 9315b68a

订货单批量打印：名称唯一处理

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