From 99ce826d1c92c801a41e88c71b380ab876187833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 9 May 2026 16:51:26 +0800 Subject: [PATCH] =?UTF-8?q?bug-939=20=E9=92=A2=E6=9E=84=E5=8C=85=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A0=BC=E5=BC=8F=E5=8F=8A=E5=8F=96=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-=E9=BD=90=E5=A5=97=E6=A0=87=E7=AD=BE=E5=92=8C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StructuralPackageOrderController.java | 39 ++++++++++--------- .../template/qrcode/spitem-label.html | 9 ++--- .../resources/template/qrcode/spitem.html | 2 +- 3 files changed, 25 insertions(+), 25 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 c56f98e1..cc72fc11 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 @@ -550,7 +550,6 @@ public class StructuralPackageOrderController extends BaseController { /** * 导出零件标签图片ZIP - * * @param id 托盘id */ @GetMapping(value = "exportItemImageZip", produces = "application/zip") @@ -560,35 +559,24 @@ public class StructuralPackageOrderController extends BaseController { List list = structuralPackageOrderTrayItemService.getListVOByTrayId(id); ByteArrayOutputStream baos = new ByteArrayOutputStream(); try (ZipOutputStream zos = new ZipOutputStream(baos)) { - List datas = new ArrayList<>(); int index = 0; for (DeliverStructuralPackageOrderTrayItemVO it : list) { - datas.clear(); index++; + String code = Base62Util.encode(it.getId()); for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) { DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class); - vo.setQrCodeId(it.getId() + "-" + (i + 1)); - vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1"); + vo.setQrCodeId(code + "-" + (i + 1)); + vo.setQrCode(code + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1"); vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200)); - datas.add(vo); + addEntry(zos, index, vo, trayVO); } if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) { DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class); - vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1)); - vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE)); + vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1)); + vo.setQrCode(code + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE)); vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200)); - datas.add(vo); + addEntry(zos, index, vo, trayVO); } - Map variables = new HashMap<>(); - variables.put("list", datas); - variables.put("info", trayVO); - variables.put("index", index); - String html = ThymeleafUtil.generator("/template/qrcode/", "spitem-label", ".html", variables); - ZipEntry entry = new ZipEntry(it.getId() + ".png"); - zos.putNextEntry(entry); - byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); - zos.write(imageBytes, 0, imageBytes.length); - zos.closeEntry(); } } byte[] zipBytes = baos.toByteArray(); @@ -598,6 +586,19 @@ public class StructuralPackageOrderController extends BaseController { return new ResponseEntity<>(zipBytes, headers, HttpStatus.OK); } + private void addEntry(ZipOutputStream zos, int index, DeliverStructuralPackageOrderTrayItemVO vo, DeliverStructuralPackageOrderExtendVO trayVO) throws Exception { + Map variables = new HashMap<>(); + variables.put("item", vo); + variables.put("info", trayVO); + variables.put("index", index); + String html = ThymeleafUtil.generator("/template/qrcode/", "spitem-label", ".html", variables); + ZipEntry entry = new ZipEntry(vo.getQrCodeId() + ".png"); + zos.putNextEntry(entry); + byte[] imageBytes = HtmlToImageUtil.convertToPng(html, 600); + zos.write(imageBytes, 0, imageBytes.length); + zos.closeEntry(); + } + /** * 导出托盘标签PDF * diff --git a/nflg-wms-admin/src/main/resources/template/qrcode/spitem-label.html b/nflg-wms-admin/src/main/resources/template/qrcode/spitem-label.html index f115abe3..efd5c3f5 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/spitem-label.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/spitem-label.html @@ -39,8 +39,8 @@ } .img { - width: auto; - height: 100%; + max-width: 350px; + max-height: 160px; margin: 0 auto; } @@ -61,13 +61,12 @@ -
+
1
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 2e41f3a2..10661988 100644 --- a/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html +++ b/nflg-wms-admin/src/main/resources/template/qrcode/spitem.html @@ -58,7 +58,7 @@
-
+
833-33-07-NF左踏板连接架(00001016NF左踏板连接架NF左踏板连接架
-
+
833-33-07-NF左踏板连接架(0000101627)833-33-07-NF左踏板连接架NF左踏板连接架NF左踏板连接架(0000101627)