diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index b37e9b67..d4c10a61 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -2101,7 +2101,7 @@ public class StructuralPackageOrderController extends BaseController { * @param ids 托盘id列表 */ @PostMapping("exportPdfByTrayIds") - public ApiResult exportPdfByTrayIds(@RequestBody @NotEmpty List ids) throws Exception { + public void exportPdfByTrayIds(HttpServletResponse response,@RequestBody @NotEmpty List ids) throws Exception { List list = structuralPackageOrderTrayItemService.getListVOByTrayIds(ids); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("数据不存在"); DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(list.get(0).getTrayId()); @@ -2133,10 +2133,7 @@ public class StructuralPackageOrderController extends BaseController { variables.put("info", vo); variables.put("pages", PdfPageDTO.create(items, 9, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); -// PdfGeneratorUtil.generatePdf(vo.getExternalOrderNo() + "-" + vo.getWorkbenchCode() + "老鼠图", html, response); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - PdfGeneratorUtil.generatePdf(vo.getExternalOrderNo() + "-" + vo.getWorkbenchCode() + "老鼠图", html, outputStream); - InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray()); - return ApiResult.success(fileUploadService.upload("tmp/sp/" + RandomUtil.randomString(10) + "/" + "老鼠图.pdf", inputStream, MediaType.APPLICATION_PDF_VALUE)); + URL baseUrl = new ClassPathResource("template/").getURL(); + PdfGeneratorUtil.generatePdf("钢构件老鼠图", html, baseUrl.toString(), response); } } \ No newline at end of file