rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pom依赖修改

This commit is contained in:
funny 2026-04-09 14:48:59 +08:00
parent bece6398d9
commit 91db3323fc
4 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-shipment/pom.xml
View File

@ -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>

10
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
View File

@ -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);

40
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/dto/PdfPageDTO.java Normal file
View File

@ -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;
}
}

3
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/PdfGeneratorUtil.java
View File

@ -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);