From 5cd857c91bd49e276274f6df6b9a126febfbf978 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 27 六月 2025 17:04:17 +0800
Subject: [PATCH] 托盘明细增加所属仓库、区域查询条件
---
Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs | 2
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 2
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 15 ++++
Wms/Wms/Controllers/StatisticalController.cs | 10 ++-
HTML/views/StatisticalReport/BoxInfor.html | 120 ++++++++++++++++++++++++++++++++--------
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs | 5 +
6 files changed, 122 insertions(+), 32 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 4eb09eb..3a9707f 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -153,6 +153,23 @@
<input type="text" autocomplete="off" id="EndTime" class="layui-input" placeholder="缁撴潫鏃堕棿">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+
<div class="layui-inline sousuo">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
@@ -370,38 +387,38 @@
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
{ field: '', title: '搴忓彿', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
- { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center' , width: 120,},
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 120, },
{ field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center', width: 120, },
{ field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center', width: 120, },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100, },
- { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center' , width: 100,},
- { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' , width: 120,},
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 120,},
- { field: 'LotNo', title: '鎵规鍙�', align: 'center' , width: 100,},
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100, },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 120, },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 120, },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 100, },
//{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
- { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' , width: 120,},
- { field: 'Qty', title: '鏁伴噺', align: 'center' ,width: 90,},
- { field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',width: 90, },
- { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center',width: 90, },
-
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 120, },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 90, },
+ { field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', width: 90, },
+ { field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center', width: 90, },
+
{ field: 'Status', title: '搴撳瓨鐘舵��', align: 'center', templet: '#buttonTpl', width: 90, },
- { field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' ,width: 100,},
- { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' ,width: 100,},
- { field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus',width: 100,},
-
+ { field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center', width: 100, },
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus', width: 100, },
+ { field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus', width: 100, },
+
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
- { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' , width: 100,},
- { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' , width: 100,},
- { field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center' , width: 100,},
- { field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center' , width: 100,},
-
-
+ { field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center', width: 100, },
+ { field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center', width: 100, },
+ { field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center', width: 100, },
+ { field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center', width: 100, },
+
+
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎵樼洏鏄庣粏
function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
- BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime) {
+ BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1 = {
@@ -448,6 +465,8 @@
OwnerName: OwnerName, //璐т富鍚嶇О
StartTime: StartTime, //寮�濮嬫椂闂�
EndTime: EndTime, //缁撴潫鏃堕棿
+ WareHouseNo: WareHouseNo,
+ AreaNo: AreaNo,
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function (res) {
console.log(res)
@@ -498,7 +517,8 @@
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime) {
+ function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus,
+ StartTime, EndTime, WareHouseNo, AreaNo) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1 = {
@@ -543,6 +563,8 @@
InspectStatu: InspectStatus,
StartTime: StartTime,
EndTime: EndTime,
+ WareHouseNo: WareHouseNo,
+ AreaNo: AreaNo,
}
sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function (res) {
if (res.code == 0) //鎴愬姛
@@ -593,14 +615,18 @@
var StartTime = $("#StartTime").val();
var EndTime = $("#EndTime").val();
+ var WareHouseNo = $("#WareHouseNo").val();
+ var AreaNo = $("#AreaNo").val();
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
+ refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark,
+ InspectStatus, OwnerNo, OwnerName, StartTime, EndTime, WareHouseNo, AreaNo);
} else if (yemianid == 1) {
quanid = '';
console.log("鏄庣粏");
- refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
+ refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark,
+ InspectStatus, StartTime, EndTime, WareHouseNo, AreaNo);
}
});
@@ -760,6 +786,52 @@
});
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function (data) {
+ console.log(data);
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+
+ };
+
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index b94d8ee..5456865 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -35,7 +35,7 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
public List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
- string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
"LotText,ProductionTime,ExpirationTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index e8699c6..3d94e2f 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -38,7 +38,8 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
- string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
+ string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName,
+ string startTime, string endTime, string WareHouseNo, string AreaNo)
{
string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName," +
"area.AreaNo + '-' + area.AreaName as AreaName " +
@@ -91,6 +92,18 @@
endTime = Convert.ToDateTime(endTime).AddDays(1).ToString();
str += $" and detail.CompleteTime < '{endTime}'";
}
+ if (!string.IsNullOrEmpty(WareHouseNo))
+ {
+ str += $" and detail.WareHouseNo = '{WareHouseNo}'";
+ }
+ if (!string.IsNullOrEmpty(WareHouseNo))
+ {
+ str += $" and detail.WareHouseNo = '{WareHouseNo}'";
+ }
+ if (!string.IsNullOrEmpty(AreaNo))
+ {
+ str += $" and detail.AreaNo = '{AreaNo}'";
+ }
int i = 0;
//鍦ㄧ鐮佹槑缁嗕腑鑾峰彇鐩稿簲鏁版嵁
diff --git a/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs b/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
index d7c3d7d..7b73c75 100644
--- a/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IDataBoxInfoServer.cs
@@ -24,7 +24,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus);
+ List<DataBoxInfo> GetDataBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo);
/// <summary>
/// 鏍规嵁绠辩爜鑾峰彇绠辨敮淇℃伅
diff --git a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
index 4ecd5cd..3074347 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -23,7 +23,10 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme);
+ List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo,
+ string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark,
+ string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme,
+ string WareHouseNo, string AreaNo);
/// <summary>
/// 瀵煎嚭鎵樼洏鏄庣粏
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 10798d0..5d8ea60 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -106,12 +106,13 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
- string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme)
+ string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName,
+ string startTime, string endTIme,string WareHouseNo,string AreaNo)
{
try
{
List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
- bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
+ bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
@@ -137,11 +138,12 @@
/// <returns></returns>
[HttpGet]
public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
- string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
+ string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
{
try
{
- List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus);
+ List<DataBoxInfo> boxInfo = _dataBoxInfo.GetDataBoxInfo(id, skuNo, skuName, palletNo,
+ lotNo, boxNo, status, inspectMark, bitBoxMark, inspectStatus, WareHouseNo, AreaNo);
return Ok(new { data = boxInfo, code = 0, msg = "鑾峰彇绠辩爜鏄庣粏鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0