From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/webapp/views/pla2/plaDetl.html | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/views/pla2/plaDetl.html b/src/main/webapp/views/pla2/plaDetl.html
index bf879d3..e764e11 100644
--- a/src/main/webapp/views/pla2/plaDetl.html
+++ b/src/main/webapp/views/pla2/plaDetl.html
@@ -129,10 +129,10 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
-<!-- <button id="rework" style="alignment: right" class="function-btn">閲嶅仛</button>-->
+ <!-- <button id="rework" style="alignment: right" class="function-btn">閲嶅仛</button>-->
<button id="updateZpallet" style="alignment: right; display: none" class="function-btn1">鎹㈠寘瑁�/鎵樼洏/缂犺啘</button> |
<button id="sellout" style="alignment: right; display: none" class="function-btn">鍑哄簱</button>
-<!-- <button id="pickup" style="alignment: right" class="function-btn">鍙栬揣</button> |-->
+ <!-- <button id="pickup" style="alignment: right" class="function-btn">鍙栬揣</button> |-->
<button id="returned" style="alignment: right; display: none" class="function-btn">閫�鍥�</button>
<button id="updateOwner" style="alignment: right; display: none" class="function-btn">鍙樻洿涓讳綋</button>
</div>
@@ -140,12 +140,28 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" >
<div class="layui-form layui-card-header">
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 70px">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 70px">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 270px">
+ <div class="layui-input-inline">
+ <div id="mat" name="mat">
+ </div>
+ </div>
+ </div>
+ <!-- <div class="layui-inline">-->
+ <!-- <div class="layui-input-inline">-->
+ <!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div class="layui-inline" style="width: 80px">
<div class="layui-input-inline cool-auto-complete">
<input id="maktx" class="layui-input" type="text" style="display: none">
<input id="maktxV" name="brand" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" placeholder="鐗屽彿" type="text" onfocus=this.blur()>
@@ -161,9 +177,8 @@
<input class="layui-input" type="text" name="type" value="鏀规�ф爲鑴�" placeholder="鐗╄祫绫诲埆" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 80px">
<div class="layui-input-inline">
-<!-- <input class="layui-input" type="text" name="status" placeholder="鐘舵��" autocomplete="off">-->
<select name="status">
<option value="">閫夋嫨鐘舵��</option>
<option value="鏆傚叆搴�">鏆傚叆搴�</option>
@@ -184,24 +199,14 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 80px">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 80px">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet_type" placeholder="鎵樼洏绫诲瀷" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -213,14 +218,14 @@
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
<!-- </div>-->
- <div class="layui-input-inline" style="width: 290px">
- <input type="text" class="layui-input" name="create_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" style="width: 290px" name="create_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
</div>
</div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" data-value="鏀规�ф爲鑴�" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
<!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
</div>
</div>
@@ -296,6 +301,7 @@
</div>
</div>
</div>
+
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
@@ -318,8 +324,8 @@
<li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>
<li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>
<hr>
-<!-- <li class="title">2nd menu</li>-->
-<!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
+ <!-- <li class="title">2nd menu</li>-->
+ <!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
</ul>
</div>
<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>-->
@@ -376,9 +382,9 @@
Address锛歂o. 188, Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province
</div>
</div>
-<!-- <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
-<!-- </n>鑱氫钩閰� Polylactic Acid-->
-<!-- </div>-->
+ <!-- <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+ <!-- </n>鑱氫钩閰� Polylactic Acid-->
+ <!-- </div>-->
<div class="layui-row" style="alignment: center; margin-left: 65px;">
<table class="contain" width="400" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 74px" >
@@ -426,7 +432,7 @@
<!-- 妯℃澘3 -->
<script type="text/template" id="templatePreview1" class="template-qrcode">
<div class="template-preview">
- {{#each data}}
+ {{#each data}}
<div class="layui-row" style="height: 230px;width: 750px; color:#000; margin-top: 40px">
<div class="layui-col-xs6" style="height: auto; margin-top: 25px; margin-left: -20px">
<img src="../../static/image/hneLogo.png" style="display: inline-block; width: 40%;height: 30%; margin-left: 30px; color:#000;">
@@ -436,9 +442,9 @@
No.188 Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province. P.R.China
</div>
</div>
-<!-- <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
-<!-- 鑱氫钩閰� Polylactic Acid-->
-<!-- </div>-->
+ <!-- <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+ <!-- 鑱氫钩閰� Polylactic Acid-->
+ <!-- </div>-->
<div class="layui-row" style="alignment: center; margin-left: 35px; margin-top: -20px; margin-bottom: 3.7px;">
<table class="contain" width="500" style="overflow: hidden;table-layout: fixed; color:#000; font-size: 35px;text-align: left">
<tr style="height: 100px;" >
@@ -446,7 +452,7 @@
</tr>
<tr style="height: 100px; text-align: left" >
<td align="center" scope="col" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鐗屽彿: REVODE {{this.brand}}</strong></td>
-<!-- <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:normal; "><strong style="font-weight: bold;color: black;">REVODE {{this.brand}}</strong></td>-->
+ <!-- <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:normal; "><strong style="font-weight: bold;color: black;">REVODE {{this.brand}}</strong></td>-->
</tr>
<tr style="height: 100px;text-align: left">
<td align="center" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鎵瑰彿锛歿{this.batch}}</strong></td>
@@ -467,8 +473,8 @@
</tr>
</table>
</div>
- </br>
- {{/each}}
+ </br>
+ {{/each}}
</div>
</script>
--
Gitblit v1.9.1