From bed84fcc5fff8cc59a1f93a1a46362bf8f512112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 30 May 2026 11:46:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(pdf):=20=E8=B0=83=E6=95=B4=E9=92=A2?= =?UTF-8?q?=E6=9E=84=E4=BB=B6=E8=80=81=E9=BC=A0=E5=9B=BE=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将分页数量从9或6调整为15，优化PDF分页显示 - 修正数据库查询回显结构，确保材料列表正确转换 - 缩小字体和内边距，提升页面布局紧凑度 - 调整图片尺寸及表格单元格样式，使显示更美观与统一 - 修改部分文本样式和位置，提高信息呈现清晰度 --- .../StructuralPackageOrderController.java | 4 +- .../StructuralPackageControllerService.java | 2 +- .../template/钢构件老鼠图.html | 41 ++++++++----------- .../impl/WmsStructuralPackageServiceImpl.java | 4 +- 4 files changed, 23 insertions(+), 28 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 9a5b7992..7e525486 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 @@ -581,7 +581,7 @@ public class StructuralPackageOrderController extends BaseController { ).collect(Collectors.toList()); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(items, 9, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(items, 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); // PdfGeneratorUtil.generatePdf(vo.getExternalOrderNo() + "-" + vo.getWorkbenchCode() + "老鼠图", html, response); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -2121,7 +2121,7 @@ public class StructuralPackageOrderController extends BaseController { ).collect(Collectors.toList()); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(items, 9, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(items, 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); URL baseUrl = new ClassPathResource("template/").getURL(); PdfGeneratorUtil.generatePdf("钢构件老鼠图", html, baseUrl.toString(), response); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java index 8bcdead9..60187304 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java @@ -454,7 +454,7 @@ public class StructuralPackageControllerService { vo.setQrCode(QRCodeUtil.generateQRCodeBase64(vo.getNo(), 100, 100)); Map variables = new HashMap<>(); variables.put("info", vo); - variables.put("pages", PdfPageDTO.create(vo.getMaterialList(), 6, new PackageMaterialDTO())); + variables.put("pages", PdfPageDTO.create(vo.getMaterialList(), 15, new PackageMaterialDTO())); String html = ThymeleafUtil.generator("/template/", "钢构件老鼠图", ".html", variables); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); PdfGeneratorUtil.generatePdf(vo.getNo() + "老鼠图", html, outputStream); diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html index 70bcb0a0..13c85556 100644 --- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html +++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html @@ -13,7 +13,7 @@ body { font-family: SimSun, serif; - font-size: 9pt; + font-size: 8pt; padding: 10px; margin: 0 auto; max-width: 100%; @@ -25,7 +25,7 @@ .logo img { height: 40px; - padding: 10px; + padding: 5px; } table { @@ -36,7 +36,7 @@ td { border: 1px solid #000; - padding: 7px; + padding: 4px; } tr:first-child td { @@ -67,10 +67,9 @@ } .cell-img { - display: table-cell; vertical-align: middle; text-align: center; - padding: 10px; + padding: 5px; height: auto; overflow: hidden; } @@ -82,7 +81,7 @@ .cell { border-bottom: 1px solid #000; - padding: 7px; + padding: 4px; overflow: hidden; } @@ -107,19 +106,19 @@ - - + + - - - + + - + - + @@ -132,21 +131,15 @@
订单号：12255665451615行号：1111订单号：7500381665行号：10 供应商：1111 + 供应商：首钢凯西钢铁有限公司
机型：12255665451615机型：12255665451615 版本：1机台号：1机台号：NFJ1280EB5 种类：1 总重：348.41
-
+
-
-
SAP编码：2222222222
-
图号：图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号 -
-
名称：名称名称名称名称名称名称名称名称名称名名称名名称名称名称称名称名称名称称名称名称名称 -
-
数量：1    重量：348.41
+
SAP编码：2222222222 图号：1280-008-006-WF
+
名称：受料斗前支腿
+
数量：1   重量：348.41
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java index cb4b1a38..2934a054 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageServiceImpl.java @@ -97,7 +97,9 @@ public class WmsStructuralPackageServiceImpl extends ServiceImpl