From 22075e0f63376b4e3a477f261e8812d3728aa0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 22 Dec 2025 14:48:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(barcode):=20=E8=B0=83=E6=95=B4=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=A0=87=E7=AD=BE=E5=B0=BA=E5=AF=B8=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将二维码图片生成宽度从480调整到600像素 - 修改HTML模板中页面尺寸为600x400像素 - 相应调整body和table的宽高为600x400像素 - 增加带边框div的内边距为18像素 - 调整二维码图片尺寸为240x240像素 - 提升标签字体大小至16pt以增强可读性 --- .../controller/BarcodePrintingController.java | 2 +- .../controller/InProduceOrderController.java | 2 +- .../InProduceOrderSurplusController.java | 2 +- .../controller/NormalOrderController.java | 2 +- .../resources/template/qrcode/dp-1-label.html | 25 ++++++++++--------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java index 6beeceb6..c7c04d3d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BarcodePrintingController.java @@ -333,7 +333,7 @@ public class BarcodePrintingController extends BaseController { String html = ThymeleafUtil.generator("/template/qrcode/", "dp-1-label", ".html", variables); ZipEntry entry = new ZipEntry(it.getPrintNo() + ".png"); zos.putNextEntry(entry); - byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 480); + byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); zos.write(imageBytes, 0, imageBytes.length); zos.closeEntry(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index bf220c2e..2af580af 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -299,7 +299,7 @@ public class InProduceOrderController extends BaseController { String html = ThymeleafUtil.generator("/template/qrcode/", "dp-1-label", ".html", variables); ZipEntry entry = new ZipEntry(it.getPrintNo() + ".png"); zos.putNextEntry(entry); - byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 480); + byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); zos.write(imageBytes, 0, imageBytes.length); zos.closeEntry(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index f6e5c245..1f3dd2c8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -419,7 +419,7 @@ public class InProduceOrderSurplusController extends BaseController { // break; ZipEntry entry = new ZipEntry(it.getPrintNo() + ".png"); zos.putNextEntry(entry); - byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 480); + byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); zos.write(imageBytes, 0, imageBytes.length); zos.closeEntry(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index 41f1be56..902f715e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -342,7 +342,7 @@ public class NormalOrderController extends BaseController { String html = ThymeleafUtil.generator("/template/qrcode/", "dp-1-label", ".html", variables); ZipEntry entry = new ZipEntry(it.getPrintNo() + ".png"); zos.putNextEntry(entry); - byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 480); + byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); zos.write(imageBytes, 0, imageBytes.length); zos.closeEntry(); } diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/dp-1-label.html b/nflg-wms-admin/src/main/resources/template/qrcode/dp-1-label.html index 49e2a86b..c73f94ea 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/dp-1-label.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/dp-1-label.html @@ -6,13 +6,13 @@ @@ -58,17 +58,18 @@ -
20250227100950-0
+
20250227100950-0
-
logo +
+ logo
SAP编码: 88888888888
名称: 测试测试测试测试测试测试测试测试
数量: 25.000
-
批次号: 20251024006
+
批次号: 20251024006