From 5ad04bd10e5e757545cddf66b02e1d51873b0ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 25 Nov 2025 15:49:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-841=20=E9=92=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E9=9D=9E=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/StructuralPackageOrderController.java | 1 + .../src/main/resources/template/qrcode/qitao.html | 6 +++--- .../src/main/resources/template/qrcode/spitem.html | 4 ++-- 3 files changed, 6 insertions(+), 5 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 0e7ab2af..24cbfdce 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 @@ -476,6 +476,7 @@ public class StructuralPackageOrderController extends BaseController { } Map variables = new HashMap<>(); variables.put("list", datas); + variables.put("info", trayVO); String html = ThymeleafUtil.generator("/template/qrcode/", "spitem", ".html", variables); URL baseUrl = new ClassPathResource("template/qrcode/").getURL(); PdfGeneratorUtil.generatePdf(trayVO.getExternalOrderNo() + "-" + trayVO.getWorkbenchCode() + "标签", html, baseUrl.toString(), response); diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html index f3e16932..cb240e6b 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/qitao.html @@ -39,10 +39,10 @@ - - 托盘号: + + 采购单号: - + S2507090053 diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html b/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html index 7bda3d3e..3e85e4a2 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html @@ -1,5 +1,5 @@ - + 钢构件物料标签 @@ -21,7 +21,7 @@ - +
833-33-07-NF左踏板连接架(0000101627)833-33-07-NF左踏板连接架(0000101627)