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

feat: bug-841 钢结构订单批量导入功能及非采购订单关联的订单

This commit is contained in:
曹鹏飞 2025-11-25 15:49:38 +08:00
parent 4b5f2d1864
commit 5ad04bd10e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -476,6 +476,7 @@ public class StructuralPackageOrderController extends BaseController {
} }
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("list", datas); variables.put("list", datas);
variables.put("info", trayVO);
String html = ThymeleafUtil.generator("/template/qrcode/", "spitem", ".html", variables); String html = ThymeleafUtil.generator("/template/qrcode/", "spitem", ".html", variables);
URL baseUrl = new ClassPathResource("template/qrcode/").getURL(); URL baseUrl = new ClassPathResource("template/qrcode/").getURL();
PdfGeneratorUtil.generatePdf(trayVO.getExternalOrderNo() + "-" + trayVO.getWorkbenchCode() + "标签", html, baseUrl.toString(), response); PdfGeneratorUtil.generatePdf(trayVO.getExternalOrderNo() + "-" + trayVO.getWorkbenchCode() + "标签", html, baseUrl.toString(), response);

6
nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
View File

@ -39,10 +39,10 @@
<td rowspan="4" style="text-align: center;width: 100px;"> <td rowspan="4" style="text-align: center;width: 100px;">
<img alt="" height="100" th:src="${info.qrCode}"/> <img alt="" height="100" th:src="${info.qrCode}"/>
</td> </td>
<td style="width: 60px;"> <td style="width: 70px;">
托盘号: 采购单号:
</td> </td>
<td style="width: 100px;" th:text="${info.trayNo}"> <td style="width: 100px;" th:text="${info.externalOrderNo}">
S2507090053 S2507090053
</td> </td>
</tr> </tr>

4
nflg-wms-admin/src/main/resources/template/qrcode/spitem.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title>钢构件物料标签</title> <title>钢构件物料标签</title>
@ -21,7 +21,7 @@
<body> <body>
<table th:each="item , iterStat: ${list}" th:style="${iterStat.index == 0} ? 'page-break-before: auto;' : 'page-break-before: always;'"> <table th:each="item , iterStat: ${list}" th:style="${iterStat.index == 0} ? 'page-break-before: auto;' : 'page-break-before: always;'">
<tr> <tr>
<td colspan="4" th:text="${item.materialDesc}">833-33-07-NF左踏板连接架(0000101627)</td> <td colspan="4" th:text="|${item.materialDesc}(${info.supplierCode})|">833-33-07-NF左踏板连接架(0000101627)</td>
</tr> </tr>
<tr> <tr>
<td colspan="2" rowspan="3"> <td colspan="2" rowspan="3">