From ae03ec7001b6ba415fa5ccac7c6ff06c81578eb1 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期五, 19 九月 2025 08:02:38 +0800
Subject: [PATCH] Merge branch 'djp'
---
Pda/View/HouseDataSetting/stockQuery.html | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/Pda/View/HouseDataSetting/stockQuery.html b/Pda/View/HouseDataSetting/stockQuery.html
index 8180398..40ef808 100644
--- a/Pda/View/HouseDataSetting/stockQuery.html
+++ b/Pda/View/HouseDataSetting/stockQuery.html
@@ -111,7 +111,15 @@
autocomplete="off" class="layui-input">
</div>
</div>
+ <!-- 绠辩爜 -->
<div id="" class="layui-form-item layout-input" style="margin-top: 5px;">
+ <label class="layui-form-label">绠辩爜</label>
+ <div class="layui-input-block">
+ <input id="BoxNo" type="text" lay-verify="stock" placeholder="绠辩爜"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <!-- <div id="" class="layui-form-item layout-input" style="margin-top: 5px;">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
<input id="SkuNo" type="text" lay-verify="stock"
@@ -131,7 +139,7 @@
<input id="Standard" type="text" lay-verify="stock"
autocomplete="off" class="layui-input" style="border: 0px;" disabled>
</div>
- </div>
+ </div> -->
<div id="" class="" style="width: 100%;height: 36px;margin-top: 15px;">
<button id="btnQuery" class="btn-ok" type="button">鏌ヨ</button>
</div>
@@ -163,6 +171,8 @@
<!-- <p class="box-list-title">宸茬粦瀹氱瀛愬垪琛�</p> -->
<table id="tableBoxList" class="tbl-box-list" border="1px" >
<tr>
+ <th >鐗╂枡鍚嶇О</th>
+ <th >鐗╂枡缂栫爜</th>
<th >鐗╁搧鎵规</th>
<th >搴撳瓨<br>鏁伴噺</th>
<th >閿佸畾<br>鏁伴噺</th>
@@ -170,7 +180,9 @@
</tr>
<tr id="boxCell" style="display: none;">
- <td name="LotNo">鐗╂枡鎵规</td>
+ <td name="SkuName" style="word-wrap: break-word; max-width: 64px;">鐗╂枡鍚嶇О</td>
+ <td name="SkuNo" style="word-wrap: break-word; max-width: 48px;">鐗╂枡缂栫爜</td>
+ <td name="LotNo" style="word-wrap: break-word; max-width: 48px;">鐗╂枡鎵规</td>
<td name="Qty">鍓╀綑鏁伴噺</td>
<td name="LockQty">閿佸畾鏁伴噺</td>
<td name="FrozenQty">鍐荤粨鏁伴噺</td>
@@ -236,13 +248,14 @@
function clear(){
$("#LocatNo").val('');
$("#PalletNo").val('');
- $("#SkuNo").val("");
- $("#SkuName").val("");
- $("#Standard").val("");
+ //$("#BoxNo").val('');
+ //$("#SkuNo").val("");
+ //$("#SkuName").val("");
+ //$("#Standard").val("");
}
$("#btnQuery").click(function(){
- if($('#LocatNo').val() == '' && $('#PalletNo').val() == '' && $('#SkuName').val() == ''){
+ if($('#LocatNo').val() == '' && $('#PalletNo').val() == '' && $('#BoxNo').val() == '' && $('#SkuName').val() == ''){
// layer.msg("璇疯緭鍏ユ煡璇㈡潯浠�", {
// icon: 2,
// time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -252,6 +265,7 @@
var param = {
LocatNo: $('#LocatNo').val(),
PalletNo: $('#PalletNo').val(),
+ BoxNo:$('#BoxNo').val(),
};
sendData(IP + "/PdaCr/GetStockQueryList", param, 'get', function(res) {
console.log("搴撳瓨鏌ヨ锛�",res)
@@ -259,9 +273,10 @@
clear();
$("#LocatNo").val(res.data[0].LocatNo);
$("#PalletNo").val(res.data[0].PalletNo);
- $("#SkuNo").val(res.data[0].SkuNo);
- $("#SkuName").val(res.data[0].SkuName);
- $("#Standard").val(res.data[0].Standard);
+ //$("#BoxNo").val(res.data[0].BoxNo);
+ // $("#SkuNo").val(res.data[0].SkuNo);
+ // $("#SkuName").val(res.data[0].SkuName);
+ // $("#Standard").val(res.data[0].Standard);
tableData = deepCopy(res.data)
refreshTable()
} else { //涓嶆垚鍔�
@@ -306,6 +321,8 @@
idx++;
tr.attr('index', idx)
+ tr.find("td[name='SkuName']").html(list[i].SkuName);
+ tr.find("td[name='SkuNo']").html(list[i].SkuNo);
tr.find("td[name='LotNo']").html(list[i].LotNo);
tr.find("td[name='Qty']").html(list[i].Qty);
tr.find("td[name='LockQty']").html(list[i].LockQty);
--
Gitblit v1.8.0