From 91db3323fc1f2e9028222341435f4502d9eea547 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Thu, 9 Apr 2026 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?pom=E4=BE=9D=E8=B5=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nflg-wms-shipment/pom.xml                     |  6 ---
 .../controller/MaterialCodeController.java    | 10 ++---
 .../wms/shipment/pojo/dto/PdfPageDTO.java     | 40 +++++++++++++++++++
 .../wms/shipment/util/PdfGeneratorUtil.java   |  3 +-
 4 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/PdfPageDTO.java

diff --git a/nflg-wms-shipment/pom.xml b/nflg-wms-shipment/pom.xml
index 983eef4b..4a6b59c9 100644
--- a/nflg-wms-shipment/pom.xml
+++ b/nflg-wms-shipment/pom.xml
@@ -132,12 +132,6 @@
             <artifactId>hypersistence-tsid</artifactId>
             <version>2.1.4</version>
         </dependency>
-        <dependency>
-            <groupId>com.nflg</groupId>
-            <artifactId>nflg-wms-admin</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
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 4d2f174e..946a9425 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
@@ -7,8 +7,6 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
-import com.nflg.wms.admin.util.PdfGeneratorUtil;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.MaterialPdfDTO;
@@ -23,12 +21,10 @@ import com.nflg.wms.common.util.VUtil;
 import com.nflg.wms.repository.entity.*;
 import com.nflg.wms.repository.service.*;
 import com.nflg.wms.shipment.pojo.dto.MaterialCodeForwardImportDTO;
+import com.nflg.wms.shipment.pojo.dto.PdfPageDTO;
 import com.nflg.wms.shipment.pojo.vo.MaterialCodeItemVO;
 import com.nflg.wms.shipment.service.BasdeSerialNumberControllerService;
-import com.nflg.wms.shipment.util.HtmlToImageUtil;
-import com.nflg.wms.shipment.util.KeyUtil;
-import com.nflg.wms.shipment.util.QRCodeUtil;
-import com.nflg.wms.shipment.util.ThymeleafUtil;
+import com.nflg.wms.shipment.util.*;
 import com.nflg.wms.starter.BaseController;
 import com.nflg.wms.starter.service.FileUploadService;
 import jakarta.annotation.Resource;
@@ -803,7 +799,7 @@ public class MaterialCodeController extends BaseController {
         }
         MaterialPdfVO material = Convert.convert(MaterialPdfVO.class, request);
         material.setWeight(allWeight);
-        material.setQrCode(com.nflg.wms.admin.util.QRCodeUtil.generateQRCodeBase64(request.getNo(), 100, 100));
+        material.setQrCode(QRCodeUtil.generateQRCodeBase64(request.getNo(), 100, 100));
         //制作pdf
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", material);
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/PdfPageDTO.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/PdfPageDTO.java
new file mode 100644
index 00000000..02454575
--- /dev/null
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/PdfPageDTO.java
@@ -0,0 +1,40 @@
+package com.nflg.wms.shipment.pojo.dto;
+
+import cn.hutool.core.collection.CollectionUtil;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Data
+public class PdfPageDTO<T, Z> {
+
+    private List<Z> headers;
+
+    private List<T> datas;
+
+    public static <T, Z> List<PdfPageDTO<T, Z>> create(List<T> list, int pageSize, T defaultValue) {
+        return create(list, pageSize, defaultValue, null);
+    }
+
+    public static <T, Z> List<PdfPageDTO<T, Z>> create(List<T> list, int pageSize, T defaultValue, Z header) {
+        List<Z> headers = Objects.isNull(header) ? null : List.of(header);
+        System.out.println("list.size():" + list.size());
+        int num = list.size() % pageSize;
+        if (num > 0) {
+            for (int i = 0, s = pageSize - num; i < s; i++) {
+                list.add(defaultValue);
+            }
+        }
+        int pageNum = list.size() / pageSize;
+        List<PdfPageDTO<T, Z>> pageList = new ArrayList<>();
+        for (int i = 0; i < pageNum; i++) {
+            PdfPageDTO<T, Z> page = new PdfPageDTO<>();
+            page.setDatas(CollectionUtil.page(i, pageSize, list));
+            page.setHeaders(headers);
+            pageList.add(page);
+        }
+        return pageList;
+    }
+}
\ No newline at end of file
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/PdfGeneratorUtil.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/PdfGeneratorUtil.java
index e92ee069..4ec4ea2b 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/PdfGeneratorUtil.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/PdfGeneratorUtil.java
@@ -1,6 +1,5 @@
 package com.nflg.wms.shipment.util;
 
-
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
@@ -50,7 +49,7 @@ public class PdfGeneratorUtil {
         generatePdf(name,html,baseUrl.toString(),output);
     }
 
-    public static void generatePdf(String name, String html, String baseUrl, OutputStream output) throws Exception {
+    public static void generatePdf(String name,String html,String baseUrl,OutputStream output) throws Exception {
         ITextRenderer renderer = new ITextRenderer();
         loadFonts(renderer);
         renderer.setDocumentFromString(html,baseUrl);