From a15ad691b6ad9116b2f10e3fae73189e5adea4aa Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Wed, 15 Apr 2026 15:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/vo/ShipmentMaterialCodeQRVO.java     |  21 ++
 .../WmsShipmentMaterialCodeItemQrMapper.xml   |   2 +-
 .../controller/MaterialCodeController.java    | 234 +++++++++++++-----
 .../controller/PackagingCodeController.java   |  33 ++-
 .../nflg/wms/shipment/util/QRCodeUtil.java    |  20 ++
 .../template/label/material-pdf.html          | 128 ++++++----
 .../template/label/packaging-pdf.html         |  48 ++--
 7 files changed, 337 insertions(+), 149 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java
index 874a03f9..e3c1ff97 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java
@@ -4,6 +4,7 @@ import com.nflg.wms.common.util.NumberUtil;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class ShipmentMaterialCodeQRVO {
@@ -69,4 +70,24 @@ public class ShipmentMaterialCodeQRVO {
      */
     private String customerName;
 
+    /**
+     * 二维码编号列表（用于打印）
+     */
+    private List<String> qrCodes;
+
+    /**
+     * 物料码主表ID（用于查询客户信息）
+     */
+    private Long materialCodeId;
+
+    /**
+     * 销售订单号
+     */
+    private String soNo;
+
+    /**
+     * 下单日期
+     */
+    private String orderDate;
+
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
index b822d9ab..bc7cab8e 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
@@ -22,7 +22,7 @@
     </select>
 
     <select id="getListVOByCodeIds" resultType="com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO">
-        SELECT qr.id,qr.no,it.material_no,it.material_describe,qr.num,it.unit,qr.status,mc.device_no,mc.customer_name
+        SELECT qr.id,qr.no,it.material_no,it.material_describe,qr.num,it.unit,qr.status,mc.device_no,mc.customer_name,it.material_code_id
         FROM wms_shipment_material_code_item_qr qr
         INNER JOIN wms_shipment_material_code_item it ON qr.item_id=it."id"
         INNER JOIN wms_shipment_material_code mc ON mc."id"=it.material_code_id
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
index 1b27d02e..4e216eb3 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
@@ -12,10 +12,7 @@ import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.MaterialCodePrintDTO;
 import com.nflg.wms.common.pojo.dto.MaterialPdfDTO;
 import com.nflg.wms.common.pojo.qo.*;
-import com.nflg.wms.common.pojo.vo.MaterialPdfVO;
-import com.nflg.wms.common.pojo.vo.MaterialItemPrintVO;
-import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
-import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
+import com.nflg.wms.common.pojo.vo.*;
 import com.nflg.wms.common.util.EecExcelUtil;
 import com.nflg.wms.common.util.NumberUtil;
 import com.nflg.wms.common.util.UserUtil;
@@ -763,21 +760,32 @@ public class MaterialCodeController extends BaseController {
      * 导出老鼠图PDF
      */
     @PostMapping("exportPdf")
-    public ApiResult<String> exportPdf(HttpServletResponse response, @RequestBody MaterialPdfQO request) throws Exception {
-        List<WmsShipmentMaterialCodeItem> materialCodeIts =materialCodeItemService.lambdaQuery()
-                .in(WmsShipmentMaterialCodeItem::getId, request.getMaterialIds()).list();
-        //根据前端传入的物料ID查询对应的物料编号再查询物料主数据
-        List<WmsShipmentMaterial> shipmentMaterials = materialService.lambdaQuery()
-                .in(WmsShipmentMaterial::getNo, materialCodeIts
-                        .stream()
-                        .map(WmsShipmentMaterialCodeItem::getMaterialNo)
-                        .toList())
-                .list();
-        //根据前端传入的物料ID查询物料明细
+    public ApiResult<String> exportPdf(HttpServletResponse response, @RequestBody @NotEmpty List<ShipmentMaterialCodeQRVO> list) throws Exception {
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("没有需要导出的数据");
+        
+        // 从 list 中提取物料ID（明细ID）
+        List<Long> materialIds = list.stream()
+                .map(ShipmentMaterialCodeQRVO::getId)
+                .filter(Objects::nonNull)
+                .toList();
+        VUtil.trueThrowBusinessError(materialIds.isEmpty()).throwMessage("物料ID不能为空");
+        
+        // 根据前端传入的物料ID查询对应的物料编号再查询物料主数据
         List<WmsShipmentMaterialCodeItem> materialCodeItems = materialCodeItemService.lambdaQuery()
-                .in(WmsShipmentMaterialCodeItem::getId, request.getMaterialIds()).list();
-        //将主数据转换成PDF需要的DTO列表
-        List<MaterialPdfDTO> items = Convert.toList(MaterialPdfDTO.class, materialCodeIts);
+                .in(WmsShipmentMaterialCodeItem::getId, materialIds)
+                .list();
+        
+        List<String> materialNos = materialCodeItems.stream()
+                .map(WmsShipmentMaterialCodeItem::getMaterialNo)
+                .distinct()
+                .toList();
+        
+        List<WmsShipmentMaterial> shipmentMaterials = materialService.lambdaQuery()
+                .in(WmsShipmentMaterial::getNo, materialNos)
+                .list();
+        
+        // 将主数据转换成PDF需要的DTO列表
+        List<MaterialPdfDTO> items = Convert.toList(MaterialPdfDTO.class, materialCodeItems);
         Map<String, WmsShipmentMaterial> materialMap = shipmentMaterials.stream()
                 .collect(Collectors.toMap(WmsShipmentMaterial::getNo, m -> m));
         for (MaterialPdfDTO dto : items) {
@@ -788,7 +796,8 @@ public class MaterialCodeController extends BaseController {
                 dto.setDrawingNo(mat.getDrawingNo());
             }
         }
-        //计算总重量 = 单个重量 * 数量 累加
+        
+        // 计算总重量 = 单个重量 * 数量 累加
         BigDecimal allWeight = new BigDecimal(0);
         for (WmsShipmentMaterialCodeItem temp : materialCodeItems) {
             WmsShipmentMaterial material = shipmentMaterials.stream()
@@ -800,10 +809,39 @@ public class MaterialCodeController extends BaseController {
             BigDecimal num = temp.getActualNum() == null ? BigDecimal.ZERO : temp.getActualNum();
             allWeight = allWeight.add(weight.multiply(num));
         }
-        MaterialPdfVO material = Convert.convert(MaterialPdfVO.class, request);
-        material.setWeight(allWeight);
-        material.setQrCode(QRCodeUtil.generateQRCodeBase64(request.getNo(), 100, 100));
-        //制作pdf
+        
+        // 从 list 中获取第一条数据
+        ShipmentMaterialCodeQRVO firstItem = list.get(0);
+        
+        // 根据物料码主表ID查询清单信息（清单编号、机台编号、销售订单号、客户名称、下单日期）
+        WmsShipmentMaterialCode materialCode = null;
+        if (firstItem.getMaterialCodeId() != null) {
+            materialCode = materialCodeService.lambdaQuery()
+                    .select(WmsShipmentMaterialCode::getNo, 
+                            WmsShipmentMaterialCode::getDeviceNo, 
+                            WmsShipmentMaterialCode::getSoNo, 
+                            WmsShipmentMaterialCode::getCustomerName, 
+                            WmsShipmentMaterialCode::getOrderDate)
+                    .eq(WmsShipmentMaterialCode::getId, firstItem.getMaterialCodeId())
+                    .one();
+        }
+        
+        // 构建表头数据
+        MaterialPdfVO material = new MaterialPdfVO();
+        // 优先使用从数据库查询的清单信息，如果没有则使用前端传入的数据
+        material.setNo(materialCode != null ? materialCode.getNo() : firstItem.getNo());                    // 清单编号
+        material.setDeviceNo(materialCode != null ? materialCode.getDeviceNo() : firstItem.getDeviceNo());  // 机台编号
+        material.setMaterialNo(firstItem.getMaterialNo());                                                   // 物料编号
+        material.setSoNo(materialCode != null ? materialCode.getSoNo() : firstItem.getSoNo());              // 销售订单号
+        material.setCustomerName(materialCode != null ? materialCode.getCustomerName() : firstItem.getCustomerName()); // 客户名称
+        material.setOrderDay(materialCode != null ? materialCode.getOrderDate() : firstItem.getOrderDate()); // 下单日期
+        material.setWeight(allWeight);                                                                       // 总重量
+        
+        // 用清单编号生成二维码（放在红圈位置）
+        String qrCodeNo = materialCode != null ? materialCode.getNo() : firstItem.getNo();
+        material.setQrCode(QRCodeUtil.generateQRCodeBase64(qrCodeNo, 100, 100));
+        
+        // 制作pdf
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", material);
         variables.put("pages", PdfPageDTO.create(items, 9, new MaterialPdfDTO()));
@@ -827,40 +865,68 @@ public class MaterialCodeController extends BaseController {
      * 导出标签图片PDF（打印预览）
      *
      * @param response HTTP响应
-     * @param ids      物料主数据id列表（wms_shipment_material.id）
+     * @param list     物料码主表列表
      */
     @PostMapping("exportToPdf")
-    public void exportToPdf(HttpServletResponse response, @RequestBody @NotEmpty List<Long> ids) throws Exception {
-        // 根据清单ID查询二维码数据
-        List<ShipmentMaterialCodeQRVO> datas = materialCodeItemQrService.getListVOByCodeIds(ids);
-        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("物料数据不存在");
+    public void exportToPdf(HttpServletResponse response, @RequestBody @NotEmpty List<ShipmentMaterialCodeQRVO> list) throws Exception {
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("物料数据不存在");
         
-        // 取第一条数据
-        ShipmentMaterialCodeQRVO data = datas.get(0);
+        // 收集所有物料码主表ID
+        List<Long> materialCodeIds = list.stream()
+                .map(ShipmentMaterialCodeQRVO::getId)
+                .filter(Objects::nonNull)
+                .toList();
+        VUtil.trueThrowBusinessError(materialCodeIds.isEmpty()).throwMessage("物料码ID不能为空");
+        
+        // 根据物料码主表ID查询物料明细（包含二维码信息和客户名称）
+        List<ShipmentMaterialCodeQRVO> qrDatas = materialCodeItemQrService.getListVOByCodeIds(materialCodeIds);
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(qrDatas)).throwMessage("没有需要打印的二维码数据");
+        
+        // 构建客户名称Map（从传入的list中获取，key为物料码主表ID）
+        Map<Long, String> customerNameMap = list.stream()
+                .filter(item -> item.getId() != null && StrUtil.isNotBlank(item.getCustomerName()))
+                .collect(Collectors.toMap(
+                        ShipmentMaterialCodeQRVO::getId,
+                        ShipmentMaterialCodeQRVO::getCustomerName,
+                        (v1, v2) -> v1
+                ));
         
         // 根据物料编号查询物料图片
         Map<String, String> images = materialService.lambdaQuery()
                 .select(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getImage)
-                .in(WmsShipmentMaterial::getNo, datas.stream().map(ShipmentMaterialCodeQRVO::getMaterialNo).collect(Collectors.toSet()))
+                .in(WmsShipmentMaterial::getNo, qrDatas.stream().map(ShipmentMaterialCodeQRVO::getMaterialNo).collect(Collectors.toSet()))
                 .list()
                 .stream()
                 .collect(Collectors.toMap(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getImage));
         
         // 构建打印数据
         Map<String, Object> variables = new HashMap<>();
+        List<Map<String, Object>> printList = new ArrayList<>();
         
-        Map<String, Object> info = new HashMap<>();
-        info.put("no", data.getNo());
-        info.put("materialNo", data.getMaterialNo());
-        info.put("numText", data.getNumText());
-        info.put("customerName", data.getCustomerName());
+        for (ShipmentMaterialCodeQRVO item : qrDatas) {
+            // 优先使用从list中获取的客户名称，如果没有则使用SQL查询的customerName
+            String customerName = customerNameMap.get(item.getMaterialCodeId());
+            if (StrUtil.isBlank(customerName)) {
+                customerName = item.getCustomerName();
+            }
+            
+            Map<String, Object> info = new HashMap<>();
+            info.put("no", item.getNo());
+            info.put("materialNo", item.getMaterialNo());
+            info.put("numText", item.getNumText());
+            info.put("customerName", customerName);
+            
+            Map<String, String> ext = new HashMap<>();
+            ext.put("qrCode", QRCodeUtil.generateQRCodeBase64(item.getNo(), 200, 200));
+            ext.put("lst", QRCodeUtil.imageUrlToBase64(images.get(item.getMaterialNo())));
+            
+            Map<String, Object> printData = new HashMap<>();
+            printData.put("info", info);
+            printData.put("ext", ext);
+            printList.add(printData);
+        }
         
-        Map<String, String> ext = new HashMap<>();
-        ext.put("qrCode", QRCodeUtil.generateQRCodeBase64(data.getNo(), 200, 200));
-        ext.put("lst", images.get(data.getMaterialNo()));
-        
-        variables.put("info", info);
-        variables.put("ext", ext);
+        variables.put("list", printList);
         
         String html = ThymeleafUtil.generator("/template/label/", "material-pdf", ".html", variables);
         URL baseUrl = new ClassPathResource("template/label/").getURL();
@@ -871,43 +937,83 @@ public class MaterialCodeController extends BaseController {
      * 根据明细ID导出物料明细PDF（打印预览）
      *
      * @param response HTTP响应
-     * @param ids      明细id列表（wms_shipment_material_code_item.id）
+     * @param list     物料明细列表（包含qrCodes二维码数组）
      */
     @PostMapping("exportItemToPdf")
-    public void exportItemToPdf(HttpServletResponse response, @RequestBody @NotEmpty List<Long> ids) throws Exception {
-        // 根据明细ID查询数据
-        List<ShipmentMaterialCodeQRVO> datas = materialCodeItemQrService.getListVOByItemIds(ids);
-        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("没有需要导出的数据");
+    public void exportItemToPdf(HttpServletResponse response, @RequestBody @NotEmpty List<ShipmentMaterialCodeQRVO> list) throws Exception {
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("没有需要导出的数据");
         
-        // 取第一条数据
-        ShipmentMaterialCodeQRVO data = datas.get(0);
+        // 收集所有二维码编号
+        List<String> allQrCodes = new ArrayList<>();
+        for (ShipmentMaterialCodeQRVO item : list) {
+            if (item.getQrCodes() != null && !item.getQrCodes().isEmpty()) {
+                allQrCodes.addAll(item.getQrCodes());
+            }
+        }
+        VUtil.trueThrowBusinessError(allQrCodes.isEmpty()).throwMessage("没有需要打印的二维码");
+        
+        // 根据物料码主表ID查询客户名称
+        Set<Long> materialCodeIds = list.stream()
+                .map(ShipmentMaterialCodeQRVO::getMaterialCodeId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+        
+        Map<Long, String> customerNameMap = new HashMap<>();
+        if (!materialCodeIds.isEmpty()) {
+            customerNameMap = materialCodeService.lambdaQuery()
+                    .select(WmsShipmentMaterialCode::getId, WmsShipmentMaterialCode::getCustomerName)
+                    .in(WmsShipmentMaterialCode::getId, materialCodeIds)
+                    .list()
+                    .stream()
+                    .collect(Collectors.toMap(WmsShipmentMaterialCode::getId, WmsShipmentMaterialCode::getCustomerName));
+        }
         
         // 根据物料编号查询物料图片
         Map<String, String> images = materialService.lambdaQuery()
                 .select(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getImage)
-                .in(WmsShipmentMaterial::getNo, datas.stream().map(ShipmentMaterialCodeQRVO::getMaterialNo).collect(Collectors.toSet()))
+                .in(WmsShipmentMaterial::getNo, list.stream().map(ShipmentMaterialCodeQRVO::getMaterialNo).collect(Collectors.toSet()))
                 .list()
                 .stream()
                 .collect(Collectors.toMap(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getImage));
         
-        // 构建打印数据
+        // 构建打印数据（支持多个二维码生成多页）
         Map<String, Object> variables = new HashMap<>();
+        List<Map<String, Object>> printList = new ArrayList<>();
         
-        Map<String, Object> info = new HashMap<>();
-        info.put("no", data.getNo());
-        info.put("materialNo", data.getMaterialNo());
-        info.put("numText", data.getNumText());
-        info.put("customerName", data.getCustomerName());
+        for (ShipmentMaterialCodeQRVO item : list) {
+            if (item.getQrCodes() == null || item.getQrCodes().isEmpty()) {
+                continue;
+            }
+            
+            // 获取客户名称
+            String customerName = customerNameMap.get(item.getMaterialCodeId());
+            
+            for (String qrCode : item.getQrCodes()) {
+                Map<String, Object> info = new HashMap<>();
+                info.put("no", qrCode);
+                info.put("materialNo", item.getMaterialNo());
+                info.put("numText", item.getNumText());
+                info.put("customerName", customerName);
+                
+                Map<String, String> ext = new HashMap<>();
+                ext.put("qrCode", QRCodeUtil.generateQRCodeBase64(qrCode, 200, 200));
+                ext.put("lst", QRCodeUtil.imageUrlToBase64(images.get(item.getMaterialNo())));
+                
+                Map<String, Object> printData = new HashMap<>();
+                printData.put("info", info);
+                printData.put("ext", ext);
+                printList.add(printData);
+            }
+        }
         
-        Map<String, String> ext = new HashMap<>();
-        ext.put("qrCode", QRCodeUtil.generateQRCodeBase64(data.getNo(), 200, 200));
-        ext.put("lst", images.get(data.getMaterialNo()));
-        
-        variables.put("info", info);
-        variables.put("ext", ext);
+        variables.put("list", printList);
         
+        // 生成 PDF
         String html = ThymeleafUtil.generator("/template/label/", "material-pdf", ".html", variables);
-        URL baseUrl = new ClassPathResource("template/label/").getURL();
-        PdfGeneratorUtil.generatePdf("物料明细标签", html, baseUrl.toString(), response);
+        ClassPathResource resource = new ClassPathResource("template/label/");
+        VUtil.trueThrowBusinessError(!resource.exists()).throwMessage("PDF模板不存在");
+        
+        URL baseUrl = resource.getURL();
+        PdfGeneratorUtil.generatePdf("物料标签", html, baseUrl.toString(), response);
     }
 }
\ No newline at end of file
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
index 3b367d6b..298b1dce 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
@@ -415,21 +415,34 @@ public class PackagingCodeController extends BaseController {
      */
     @PostMapping("exportToPdf")
     public void exportToPdf(HttpServletResponse response, @RequestBody @NotEmpty List<ShipmentPackagingCodeVO> list) throws Exception {
+
+        List<Long> ids = list.stream()
+                .map(ShipmentPackagingCodeVO::getId)
+                .filter(Objects::nonNull)
+                .toList();
+
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(ids)).throwMessage("ID不能为空");
+
+        // 根据ID列表查询包装码数据
+        List<WmsShipmentPackagingCode> packagingCodes = packagingCodeService.lambdaQuery()
+                .in(WmsShipmentPackagingCode::getId,ids)
+                .list();
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(packagingCodes)).throwMessage("包装码数据不存在");
+        
+        // 查询包装类型字典
         List<DictionaryItem> types = dictionaryItemService.getListByDictionaryCode("PackagingType");
+        Map<Long, String> typeMap = types.stream()
+                .collect(Collectors.toMap(DictionaryItem::getId, DictionaryItem::getName));
         
         // 构建打印数据
         Map<String, Object> variables = new HashMap<>();
-        variables.put("list", list.stream()
-                .map(data -> {
+        variables.put("list", packagingCodes.stream()
+                .map(code -> {
                     ShipmentPackagingCodeVO vo = new ShipmentPackagingCodeVO();
-                    vo.setNo(data.getNo());
-                    vo.setName(data.getName());
-                    vo.setTypeName(types.stream()
-                            .filter(type -> type.getId().equals(data.getType()))
-                            .map(DictionaryItem::getName)
-                            .findFirst()
-                            .orElse(""));
-                    vo.setQrCode(QRCodeUtil.generateQRCodeBase64(data.getNo(), 100, 100));
+                    vo.setNo(code.getNo());
+                    vo.setName(code.getName());
+                    vo.setTypeName(typeMap.getOrDefault(code.getType(), ""));
+                    vo.setQrCode(QRCodeUtil.generateQRCodeBase64(code.getNo(), 100, 100));
                     return vo;
                 }).toList()
         );
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/QRCodeUtil.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/QRCodeUtil.java
index 1660cdce..b841d5ad 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/QRCodeUtil.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/QRCodeUtil.java
@@ -8,6 +8,8 @@ import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.Base64;
 import java.util.Hashtable;
 
@@ -38,4 +40,22 @@ public class QRCodeUtil {
         }
     }
 
+    public static String imageUrlToBase64(String imageUrl) {
+        if (imageUrl == null || imageUrl.isBlank()) {
+            return null;
+        }
+        try (InputStream in = new URL(imageUrl).openStream();
+             ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            byte[] buf = new byte[4096];
+            int n;
+            while ((n = in.read(buf)) != -1) {
+                baos.write(buf, 0, n);
+            }
+            String ext = imageUrl.toLowerCase().contains(".png") ? "png" : "jpeg";
+            return "data:image/" + ext + ";base64," + Base64.getEncoder().encodeToString(baos.toByteArray());
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
 }
diff --git a/nflg-wms-shipment/src/main/resources/template/label/material-pdf.html b/nflg-wms-shipment/src/main/resources/template/label/material-pdf.html
index 813de42f..2ee0e65f 100644
--- a/nflg-wms-shipment/src/main/resources/template/label/material-pdf.html
+++ b/nflg-wms-shipment/src/main/resources/template/label/material-pdf.html
@@ -6,30 +6,51 @@
     <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
     <style>
         @page {
-            size: 1200px 800px;
+            size: 1000px 500px;
             margin: 0;
         }
 
         body {
-            width: 1200px;
-            height: 800px;
-            font-size: 20pt;
+            font-size: 11pt;
             font-family: SimSun, Arial, sans-serif;
             margin: 0;
             padding: 0;
         }
 
+        .label-page {
+            width: 1000px;
+            height: 500px;
+            display: table;
+            page-break-after: always;
+        }
+
+        .label-page:last-child {
+            page-break-after: auto;
+        }
+
+        .label-center {
+            display: table-cell;
+            width: 1000px;
+            vertical-align: middle;
+            text-align: center;
+        }
+
+        .label-content {
+            display: inline-block;
+            margin: 0 auto;
+        }
+
         table {
-            width: 1200px;
-            height: 800px;
+            width: 900px;
             border: 3px solid #000;
             border-collapse: collapse;
             table-layout: fixed;
+            margin: 0 auto;
         }
 
         th, td {
             border: 3px solid #000;
-            padding: 10px;
+            padding: 4px;
             text-align: center;
             vertical-align: middle;
             word-wrap: break-word;
@@ -37,54 +58,61 @@
         }
 
         .qrcode {
-            width: 380px;
-            height: 380px;
+            width: 160px;
+            height: 160px;
         }
         .lst{
-            width: 800px;
-            height: auto;
+            max-width: 480px;
+            width: auto;
+            height: 220px;
         }
     </style>
 </head>
 <body>
-<table>
-    <tr>
-        <td style="text-align: center; width: 400px" rowspan="3">
-            <img alt="" class="qrcode" th:src="${ext.qrCode}"/>
-            <div style="font-size: 16pt" th:text="${info.no}">0PC7B724KV6FM</div>
-        </td>
-        <td style="width: 140px;">
-            机台编号
-        </td>
-        <td style="width: 200px;" th:text="${info.no}">
-            26LBZ4000L001
-        </td>
-        <td style="width: 140px;">
-            客户名称
-        </td>
-        <td style="text-align: left" th:text="${info.customerName}">
-            北京市京联鑫路用材料有限公司
-        </td>
-    </tr>
-    <tr>
-        <td>
-            物料编码
-        </td>
-        <td th:text="${info.materialNo}">
-            3100006701
-        </td>
-        <td>
-            数量
-        </td>
-        <td th:text="${info.numText}">
-            10
-        </td>
-    </tr>
-    <tr>
-        <td colspan="4">
-            <img style="width: 750px;" alt="" src="https://img-s.msn.cn/tenant/amp/entityid/AA1VWN3Q.img?w=768&h=333&m=6" class="lst" th:src="${ext.lst}"/>
-        </td>
-    </tr>
-</table>
+<div class="label-page" th:each="item, iterStat : ${list}">
+    <div class="label-center">
+        <div class="label-content">
+            <table>
+                <tr>
+                    <td style="text-align: center; width: 200px" rowspan="3">
+                        <img alt="" class="qrcode" th:src="${item.ext.qrCode}"/>
+                        <div style="font-size: 16pt" th:text="${item.info.no}">0PC7B724KV6FM</div>
+                    </td>
+                    <td style="width: 140px;">
+                        机台编号
+                    </td>
+                    <td style="width: 200px;" th:text="${item.info.no}">
+                        26LBZ4000L001
+                    </td>
+                    <td style="width: 140px;">
+                        客户名称
+                    </td>
+                    <td style="text-align: center" th:text="${item.info.customerName}">
+                        北京市京联鑫路用材料有限公司
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        物料编码
+                    </td>
+                    <td th:text="${item.info.materialNo}">
+                        3100006701
+                    </td>
+                    <td>
+                        数量
+                    </td>
+                    <td th:text="${item.info.numText}">
+                        10
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <img alt="" class="lst" th:src="${item.ext.lst}"/>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/nflg-wms-shipment/src/main/resources/template/label/packaging-pdf.html b/nflg-wms-shipment/src/main/resources/template/label/packaging-pdf.html
index 2b9df155..01d0759a 100644
--- a/nflg-wms-shipment/src/main/resources/template/label/packaging-pdf.html
+++ b/nflg-wms-shipment/src/main/resources/template/label/packaging-pdf.html
@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8"/>
-    <title>包装码标签-A4打印版</title>
+    <title>包装码标签-打印预览版</title>
     <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
     <style>
         @page {
@@ -15,31 +15,29 @@
             font-family: SimSun, Arial, sans-serif;
             margin: 0;
             padding: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            min-height: 100vh;
         }
 
         .label-page {
             width: 210mm;
             height: 297mm;
-            display: flex;
-            align-items: center;
-            justify-content: center;
+            display: table;
             page-break-after: always;
-            position: relative;
         }
 
         .label-page:last-child {
             page-break-after: auto;
         }
 
+        .label-center {
+            display: table-cell;
+            vertical-align: middle;
+            text-align: center;
+        }
+
         .label-content {
+            display: inline-block;
             width: 600px;
             height: 400px;
-            transform-origin: center center;
-            transform: scale(calc(210mm / 600px));
         }
 
         table {
@@ -72,19 +70,21 @@
 <body>
 
 <div class="label-page" th:each="item, iterStat : ${list}">
-    <div class="label-content">
-        <table>
-            <tr>
-                <td style="text-align: center;">
-                    <img alt="" class="qrcode" th:src="${item.qrCode}"/>
-                    <div style="font-size: 16pt" th:text="${item.no}">NFLG-QZ-002</div>
-                </td>
-                <td style="text-align: left;vertical-align: top">
-                    <div class="div-with-border">包装名称: <span th:text="${item.name}">NFLG-QZ-002 测试包装名称</span></div>
-                    <div class="div-with-border">包装类型: <span th:text="${item.typeName}">托盘</span></div>
-                </td>
-            </tr>
-        </table>
+    <div class="label-center">
+        <div class="label-content">
+            <table>
+                <tr>
+                    <td style="text-align: center;">
+                        <img alt="" class="qrcode" th:src="${item.qrCode}"/>
+                        <div style="font-size: 16pt" th:text="${item.no}">NFLG-QZ-002</div>
+                    </td>
+                    <td style="text-align: left;vertical-align: top">
+                        <div class="div-with-border">包装名称: <span th:text="${item.name}">NFLG-QZ-002 测试包装名称</span></div>
+                        <div class="div-with-border">包装类型: <span th:text="${item.typeName}">托盘</span></div>
+                    </td>
+                </tr>
+            </table>
+        </div>
     </div>
 </div>