From 7e10622ead5bd8b3ce0c9fda39d22ae0e938e030 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 12 九月 2025 13:44:10 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 224 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 178 insertions(+), 46 deletions(-)
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..54b3de3 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -94,15 +94,20 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="杈撳叆鍚嶇О"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -111,6 +116,9 @@
</button>
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
<i class="layui-icon"></i>閲嶇疆
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="synchronous" lay-submit>
+ <i class="layui-icon"></i>鍚屾搴瓨
</button>
</div>
</div>
@@ -154,7 +162,9 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="sync">鍚屾</a>-->
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
+ <button class="layui-btn layui-btn-xs btn-sync" lay-event="sync">鍚屾</button>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -198,31 +208,38 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+ <label class="layui-form-label layui-form-required">鍚嶇О</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips"
+ <input name="maktx" placeholder="璇疯緭鍏ュ悕绉�" class="layui-input" lay-vertype="tips"
lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">閰嶇疆</label>
+ <label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
+ <label class="layui-form-label">閲嶉噺</label>
<div class="layui-input-block">
- <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+ <input name="weight" placeholder="璇疯緭鍏ラ噸閲�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
+ <label class="layui-form-label">闀垮害</label>
<div class="layui-input-block">
- <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
+ <input name="length" placeholder="闀垮害" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹藉害</label>
+ <div class="layui-input-block">
+ <input name="width" placeholder="瀹藉害" class="layui-input">
</div>
</div>
@@ -230,38 +247,44 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
+ <label class="layui-form-label layui-form-required">鍝佸彿</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips"
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�" class="layui-input" lay-vertype="tips"
lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">鏈哄瀷</label>
<div class="layui-input-block">
- <input name="model" type="number" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+ <input name="model" placeholder="璇疯緭鍏ユ満鍨�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">搴撳瓨涓婇檺</label>
+ <label class="layui-form-label">鍒朵护</label>
<div class="layui-input-block">
- <input name="safeQty" placeholder="搴撳瓨涓婇檺" class="layui-input">
+ <input name="decrees" placeholder="鍒朵护" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠姣涢噸</label>
+ <label class="layui-form-label">鍥惧彿</label>
<div class="layui-input-block">
- <input name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ <input name="imgNum" placeholder="鍥惧彿" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
+ <label class="layui-form-label">楂樺害</label>
<div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ <input name="height" placeholder="楂樺害" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇楃О</label>
+ <div class="layui-input-block">
+ <input name="sku" placeholder="淇楃О" class="layui-input">
</div>
</div>
@@ -284,6 +307,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 +315,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 +413,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 +452,56 @@
<!-- 妯℃澘寮曟搸 -->
<!-- 妯℃澘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: 20px">
+ <td align="center" scope="col" colspan="1" style="font-size: 10px;">鍚嶇О</td>
+ <td align="center" scope="col" colspan="2" style="font-size: 10px;">{{this.maktx}}</td>
+ <td align="center" scope="col" colspan="3" rowspan="4">
+ <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="50%">
+ <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: 20px">
+ <td align="center" colspan="1" style="font-size: 10px;">鍒朵护</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.decrees}}
</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
+ </tr>
+ <tr style="height: 20px">
+ <td align="center" colspan="1" style="font-size: 10px;">鏈哄瀷</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.model}}
+ </td>
+ </tr>
+ <tr style="height: 20px">
+ <td align="center" colspan="1" style="font-size: 10px;">鍥惧彿</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.imgNum}}
+ </td>
+ </tr>
+ <tr style="height: 20px">
+ <td align="center" colspan="1" style="font-size: 10px;">瑙勬牸</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.specs}}
+ </td>
+ <td align="center" colspan="1" style="font-size: 10px;">鏉愯川</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.material}}
+ </td>
+ </tr>
+ <tr style="height: 20px">
+ <td align="center" colspan="1" style="font-size: 10px;">閲嶉噺</td>
+ <td align="center" colspan="2"
+ style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.weight}}
+ </td>
+ <td align="center" colspan="1" style="font-size: 10px;">闀垮楂�</td>
+ <td align="center" colspan="2" style="font-size: 10px;">{{this.length}}x{{this.width}}x{{this.height}}
+ </td>
</tr>
</table>
{{/each}}
@@ -459,6 +567,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