From d37658cbc691fa55401349101a2a71f1420a0d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 26 May 2026 15:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=A2=E6=9E=84=E4=BB=B6?= =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E2=80=9C=E6=89=98=E7=9B=98=E6=A0=87=E7=AD=BE=E2=80=9D=E3=80=81?= =?UTF-8?q?=E2=80=9C=E6=89=98=E7=9B=98=E8=80=81=E9=BC=A0=E5=9B=BE=E2=80=9D?= =?UTF-8?q?=E3=80=81=E2=80=9C=E5=AF=BC=E5=87=BAExcel=E2=80=9D=E3=80=81?= =?UTF-8?q?=E2=80=9C=E6=A0=87=E7=AD=BE=E7=BA=B8=E6=89=93=E5=8D=B0=E2=80=9D?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StructuralPackageOrderController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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