From 093b7d5704d0c2d612f297976039473e1e0ca48f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 25 五月 2024 09:35:02 +0800
Subject: [PATCH] #增加打印模板
---
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 156 +++++++++++++++++++++++++++++++++------
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java | 24 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 9 ++
3 files changed, 165 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
index 774b212..9e4ef18 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
@@ -38,4 +38,28 @@
*/
private String memo;
+ //鏉愯川
+ private String material;
+
+ //鍒朵护
+ private String decrees;
+
+ //鍥惧彿
+ private String imgNum;
+
+ //鏈哄瀷
+ private String model;
+
+ //閲嶉噺
+ private String weight;
+
+ //闀垮害
+ private String length;
+
+ //瀹藉害
+ private String width;
+
+ //楂樺害
+ private String height;
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index b9527f6..45aa04e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -175,6 +175,15 @@
print.setSpecs(mat.getSpecs());
print.setUnit(mat.getUnit());
print.setMemo(mat.getMemo());
+
+ print.setMaterial(mat.getMaterial());
+ print.setDecrees(mat.getDecrees());
+ print.setImgNum(mat.getImgNum());
+ print.setWeight(String.valueOf(mat.getWeight()));
+ print.setModel(mat.getModel());
+ print.setLength(String.valueOf(mat.getLength()));
+ print.setWidth(mat.getWidth());
+ print.setHeight(mat.getHeight());
res.add(print);
}
return R.ok().add(res);
diff --git a/zy-asrs-wms/src/main/webapp/views/mat/mat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
index 878a4cb..53d5bba 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -284,6 +284,7 @@
<input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
<input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
<input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
+ <input type="radio" name="selectTemplate" value="4" title="妯℃澘鍥�" lay-filter="selectTemplateRadio">
</div>
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
@@ -291,22 +292,53 @@
<!-- 棰勮鍥� 1 -->
<div id="template-preview-1" class="template-preview" style="display: inline-block">
- <table class="contain" width="280"
+ <table class="contain" width="300"
style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
- <td class="barcode" colspan="9" align="center" scope="col">
- <img class="template-code template-barcode" src="" width="90%;">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
+ <tr style="height: 50px">
+ <td align="center" scope="col" colspan="1">鍚嶇О</td>
+ <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
+ <td align="center" scope="col" colspan="2" rowspan="2">
+ <img class="template-code template-qrcode" src="" width="80%">
+ <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
<span>xxxxxx</span>
</div>
</td>
</tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5">xxxxxx-xx/xx</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">xx</td>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">瑙勬牸</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鍥惧彿</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ <td align="center" colspan="1">閲嶉噺</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鏈哄瀷</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ <td align="center" colspan="1">鏉愯川</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鍒朵护</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
+ <td align="center" colspan="1">闀垮楂�</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx
+ </td>
</tr>
</table>
</div>
@@ -358,6 +390,28 @@
</tr>
</table>
</div>
+
+ <!-- 棰勮鍥� 4 -->
+ <div id="template-preview-4" class="template-preview" style="display: none">
+ <table class="contain" width="280"
+ style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 74px">
+ <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
+ <td class="barcode" colspan="9" align="center" scope="col">
+ <img class="template-code template-barcode" src="" width="90%;">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
+ <span>xxxxxx</span>
+ </div>
+ </td>
+ </tr>
+ <tr style="height: 74px">
+ <td align="center" colspan="3">鍟嗗搧</td>
+ <td align="center" colspan="5">xxxxxx-xx/xx</td>
+ <td align="center" colspan="2">澶囨敞</td>
+ <td align="center" colspan="2">xx</td>
+ </tr>
+ </table>
+ </div>
</div>
</fieldset>
@@ -375,25 +429,55 @@
<!-- 妯℃澘寮曟搸 -->
<!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1" class="template-barcode">
+<script type="text/template" id="templatePreview1" class="template-qrcode">
{{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
- <td align="center" class="barcode" colspan="9" scope="col">
- <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+ <table class="contain" width="300"
+ style="overflow: hidden;font-size: xx-small;table-layout: fixed;margin-top: 20px;">
+ <tr style="height: 50px">
+ <td align="center" scope="col" colspan="1">鍚嶇О</td>
+ <td align="center" scope="col" colspan="1" style="">{{this.maktx}}</td>
+ <td align="center" scope="col" colspan="2" rowspan="2">
+ <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
<span>{{this.matnr}}</span>
</div>
</td>
</tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">
- {{this.maktx}}
+ <tr style="height: 50px">
+ <td align="center" colspan="1">瑙勬牸</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.specs}}
</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鍥惧彿</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.imgNum}}
+ </td>
+ <td align="center" colspan="1">閲嶉噺</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.weight}}
+ </td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鏈哄瀷</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.model}}
+ </td>
+ <td align="center" colspan="1">鏉愯川</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.material}}
+ </td>
+ </tr>
+ <tr style="height: 50px">
+ <td align="center" colspan="1">鍒朵护</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.decrees}}
+ </td>
+ <td align="center" colspan="1">闀垮楂�</td>
+ <td align="center" colspan="1"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.length}}x{{this.width}}x{{this.height}}
+ </td>
</tr>
</table>
{{/each}}
@@ -459,6 +543,30 @@
</table>
{{/each}}
</script>
+<!-- 妯℃澘4 -->
+<script type="text/template" id="templatePreview4" class="template-barcode">
+ {{#each data}}
+ <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
+ <tr style="height: 74px">
+ <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
+ <td align="center" class="barcode" colspan="9" scope="col">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+ <span>{{this.matnr}}</span>
+ </div>
+ </td>
+ </tr>
+ <tr style="height: 74px">
+ <td align="center" colspan="3">鍟嗗搧</td>
+ <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">
+ {{this.maktx}}
+ </td>
+ <td align="center" colspan="2">澶囨敞</td>
+ <td align="center" colspan="2">{{this.memo}}</td>
+ </tr>
+ </table>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1