From 439b9805148ba01b14ad4e6e85ff8e745bfc55b1 Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Tue, 21 Oct 2025 09:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=89=93=E5=8D=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BarcodePrintingController.java | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 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 6af8721f..6f870c5e 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
@@ -214,32 +214,50 @@ public class BarcodePrintingController extends BaseController {
         List<DeliverNormalOrderItemDTO> datas = new ArrayList<>();
         //  Integer i = 1;
         for (WmsInventoryBarcodePrinting item : codelist) {
-            DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO();
-            dto.setMaterialNo(item.getMaterialNo());
-            dto.setMaterialDesc(item.getMaterialDes());
-            dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber());
-            dto.setExternalOrderNo("");
-            dto.setRowNo("");
             if (StrUtil.isNotBlank(item.getSerialNumbers())) {
                 List<String> serialNumbers = StrUtil.split(item.getSerialNumbers(), ",");
                 for (String serialNumber : serialNumbers) {
+                    DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO();
+                    dto.setMaterialNo(item.getMaterialNo());
+                    dto.setMaterialDesc(item.getMaterialDes());
+                    dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber());
+                    dto.setExternalOrderNo("");
+                    dto.setRowNo("");
+                    dto = new DeliverNormalOrderItemDTO();
+                    dto.setMaterialNo(item.getMaterialNo());
+                    dto.setMaterialDesc(item.getMaterialDes());
+                    dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber());
+                    dto.setExternalOrderNo("");
+                    dto.setRowNo("");
                     dto.setPrintNo(IdUtil.getSnowflakeNextIdStr());
                     dto.setPrintNum("1");
-                    String qCode = QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, serialNumber), 100, 100);
+                    String qCode =  QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, serialNumber), 100, 100);
                     dto.setQrCode(qCode);
+                    datas.add(dto);
                     //i += 1;
                 }
             } else {
                 int codeNum = item.getQty().divide(item.getPackingNum(), 0, RoundingMode.UP).intValue();
                 for (int j = 0; j < codeNum; j++) {
+                    DeliverNormalOrderItemDTO dto = new DeliverNormalOrderItemDTO();
+                    dto.setMaterialNo(item.getMaterialNo());
+                    dto.setMaterialDesc(item.getMaterialDes());
+                    dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber());
+                    dto.setExternalOrderNo("");
+                    dto.setRowNo("");
+                    dto = new DeliverNormalOrderItemDTO();
+                    dto.setMaterialNo(item.getMaterialNo());
+                    dto.setMaterialDesc(item.getMaterialDes());
+                    dto.setBatchNo(StrUtil.isBlank(item.getBatchNumber()) ? "" : item.getBatchNumber());
+                    dto.setExternalOrderNo("");
+                    dto.setRowNo("");
                     dto.setPrintNo(IdUtil.getSnowflakeNextIdStr());
                     dto.setPrintNum(item.getPackingNum().toString());
                     String qCode = QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, ""), 100, 100);
                     dto.setQrCode(qCode);
+                    datas.add(dto);
                 }
-
             }
-            datas.add(dto);
         }
         Map<String, Object> variables = new HashMap<>();
         variables.put("list", datas);