From d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 22 二月 2024 15:44:11 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/StatisticalReport/InventoryStatistics.html | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 9a1d1fd..32821f8 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -51,6 +51,20 @@
</div>
</div>
<div class="layui-inline mingxi">
+ <label class="layui-form-label" style="width: 60px;">璐т富缂栫爜</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline mingxi">
+ <label class="layui-form-label" style="width: 60px;">璐т富鍚嶇О</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="OwnerName" name="OwnerName" placeholder="璐т富鍚嶇О" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline mingxi">
<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
@@ -71,6 +85,7 @@
class="layui-input">
</div>
</div>
+
<div class="layui-inline ">
<label class="layui-form-label" style="width: 60px;">搴撳瓨鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -337,7 +352,11 @@
{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',totalRowText: "鍚堣:", "disabled": true},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center', "disabled": true},
- {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
+ {field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
+ {field: 'LotNo',title: '鎵规鍙�',align: 'center', "disabled": true},
+ {field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
+ {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
+ {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
{field: 'Qty',title: '搴撳瓨鏁伴噺',align: 'center',totalRow: true},
{field: 'LockQty',title: '閿佸畾鏁伴噺',align: 'center',totalRow: true},
{field: 'FrozenQty',title: '鍐荤粨鏁伴噺',align: 'center',totalRow: true}
@@ -378,7 +397,7 @@
cols:colsJson
};
- sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val(), {}, 'get', function (res) {
+ sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
console.log(res)
if (res.code == 0) { //鎴愬姛
var list = res.data;
@@ -502,6 +521,8 @@
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
{field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
{field: 'LotNo',title: '鎵规鍙�',align: 'center'},
+ {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
+ {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
{field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'},
{field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
{field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'},
@@ -510,7 +531,7 @@
]];
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(sku) {
+ function refreshTable2(sku,lotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1={
@@ -542,7 +563,7 @@
cols:colsJson2
};
- sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + $("#LotNo").val() + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val(), {}, 'get', function (res) {
+ sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
if (res.code == 0) //鎴愬姛
{
var list = res.data;
@@ -572,6 +593,7 @@
//鎺ュ彈鍏ㄥ眬鍙橀噺
let quanSkuNo = '';
+ let quanLotNo='';
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function (data) {
var SkuNo = $("#SkuNo").val();
@@ -579,6 +601,8 @@
var LotNo = $("#LotNo").val();
var LocatNo = $("#LocatNo").val();
var PalletNo = $("#PalletNo").val();
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
var Status = $("#Status").val();
var InspectStatus = $("#InspectStatus").val();
if (yemianid == 0) {
@@ -586,8 +610,9 @@
refreshTable(SkuNo, SkuName);
} else if (yemianid == 1) {
quanSkuNo = '';
+ quanLotNo='';
console.log("鏄庣粏");
- refreshTable2(SkuNo);
+ refreshTable2(SkuNo,LotNo);
}
});
@@ -599,7 +624,8 @@
$('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
console.log(obj);
quanSkuNo = obj.data.SkuNo;
- refreshTable2(obj.data.SkuNo);
+ quanLotNo=obj.data.lotNo;
+ refreshTable2(obj.data.SkuNo,obj.data.LotNo);
yemianid = 1;
});
@@ -612,7 +638,7 @@
refreshTable(SkuNo, SkuName);
} else if (yemianid == 1) {
console.log("鏄庣粏");
- refreshTable2(quanSkuNo);
+ refreshTable2(quanSkuNo,quanLotNo);
}
});
--
Gitblit v1.8.0