From f09d9da82fa9f4e8dc9081be3d415c8e1a5f2c92 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 22 二月 2024 15:43:30 +0800
Subject: [PATCH] 库存总量和库存明细新增维护货主编码和货主名称字段；修改库存统计-库存总量分组方式
---
Wms/WMS.Entity/DataEntity/DataStockDetail.cs | 14 +++
Wms/WMS.Entity/DataEntity/DataStock.cs | 12 +++
HTML/views/StatisticalReport/BoxInfor.html | 31 ++++++-
Wms/WMS.BLL/DataServer/StockServer.cs | 38 +++++++-
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs | 2
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 13 +++
Wms/Model/ModelDto/DataDto/MateDataStockDto.cs | 14 +++
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 14 +++
Wms/Model/ModelDto/DataDto/StockDetailDto.cs | 14 +++
HTML/views/StatisticalReport/InventoryStatistics.html | 40 ++++++++-
Wms/Wms/Controllers/StatisticalController.cs | 12 +-
Wms/WMS.IBLL/IDataServer/IStockServer.cs | 4
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 20 ++++-
13 files changed, 195 insertions(+), 33 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index c6e0191..068f453 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -566,6 +566,19 @@
});
return;
}
+ var type= $("#Type").val();
+ if(type=='6'){
+ var customerName=$("#CustomerName").val();
+ if(customerName==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
SetArrivalNotice();
});
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 0e75ea6..5fe5cfc 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -52,6 +52,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" class="layui-input">
@@ -303,7 +317,7 @@
var $ = layui.$;
var yemianid =0;
- refreshTable("","","","","","","","","","");
+ refreshTable("","","","","","","","","","","","");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
@@ -378,6 +392,8 @@
{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
+ {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
+ {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
@@ -390,7 +406,7 @@
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎵樼洏鏄庣粏
- function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus) {
+ function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -432,7 +448,9 @@
InspectMark:InspectMark, //妫�楠屾爣璁�
BitPalletMark:BitPalletMark, //闆舵墭鏍囪
BitBoxMark:BitBoxMark, //闆剁鏍囪
- InspectStatus:InspectStatus //璐ㄩ噺鐘舵��
+ InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName //璐т富鍚嶇О
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
console.log(res)
@@ -639,9 +657,12 @@
var BitBoxMark = $("#BitBoxMark").val();
var InspectStatus = $("#InspectStatus").val();
+ var OwnerNo = $("#OwnerNo").val();
+ var OwnerName = $("#OwnerName").val();
+
if(yemianid == 0){
console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus);
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
}else if(yemianid == 1){
quanid = '';
console.log("鏄庣粏");
@@ -667,7 +688,7 @@
yemianid = data.index
if(yemianid == 0){
console.log("鎬诲崟");
- refreshTable("","","","","","","","","","");
+ refreshTable("","","","","","","","","","","","");
}else if(yemianid == 1){
console.log("鏄庣粏");
refreshTable2(quanid);
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);
}
});
diff --git a/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs b/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
index 71f8dd1..b89dc8a 100644
--- a/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
+++ b/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
@@ -119,6 +119,20 @@
/// 鏄惁鎵撳甫
/// </summary>
public string IsBelt { get; set; }
+
+ /// <summary>
+ /// Desc:璐т富缂栧彿
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerNo { get; set; }
+
+ /// <summary>
+ /// Desc:璐т富鍚嶇О
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerName { get; set; }
}
/// <summary>
diff --git a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
index 6589bdc..bf0b02a 100644
--- a/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
+++ b/Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -164,5 +164,19 @@
/// 鏄惁鎵撳甫
/// </summary>
public string IsBelt { get; set; }
+
+ /// <summary>
+ /// Desc:璐т富缂栧彿
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerNo { get; set; }
+
+ /// <summary>
+ /// Desc:璐т富鍚嶇О
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerName { get; set; }
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index fe0f1cc..9867faa 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1438,12 +1438,19 @@
#endregion
break;
- case "0":
+ case "0":
var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.ASNDetailNo);
if (noticeDetail == null)
{
throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟鏄庣粏淇℃伅");
}
+ var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
+ if (notice == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏缁戝畾鐨勫叆搴撳崟淇℃伅");
+ }
+ string ownerNo = notice.CustomerNo;//璐т富缂栫爜
+ string ownerName = notice.CustomerName;//璐т富鍚嶇О
var sku1 = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo);
string isinspect = "0";
@@ -1460,7 +1467,7 @@
{
LotNo = item.LotNo,
LotText = noticeDetail.LotText,
- SupplierLot = noticeDetail.SupplierLot,
+ SupplierLot = noticeDetail.SupplierLot,
SkuNo = noticeDetail.SkuNo,
SkuName = noticeDetail.SkuName,
Standard = noticeDetail.Standard,
@@ -1488,6 +1495,9 @@
PackagNo = noticeDetail.PackagNo,
IsBale = item.IsBale,
IsBelt = item.IsBelt,
+
+ OwnerNo = ownerNo,
+ OwnerName = ownerName,
IsDel = "0",
CreateUser = 0,
@@ -1577,6 +1587,9 @@
LockQty = 0,
FrozenQty = 0,
+ OwnerNo = ownerNo,
+ OwnerName = ownerName,
+
IsDel = "0",
CreateUser = userId,
CreateTime = comTime
@@ -1598,8 +1611,7 @@
var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
.Count(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo && m.Status != "2");
if (asnDetailNum == 0)
- {
- var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == noticeDetail.ASNNo);
+ {
notice.Status = "2";
notice.CompleteTime = comTime;
Db.Updateable(notice).ExecuteCommand();
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index 8d66d0b..ef19666 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -34,7 +34,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <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)
+ 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 str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
@@ -61,6 +61,16 @@
if (!string.IsNullOrEmpty(bitPalletMark))
{
str += " and detail.BitPalletMark = @bitpalletmark";
+ }
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and detail.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and detail.OwnerName like @ownerName";
}
int i = 0;
@@ -151,6 +161,8 @@
bitpalletmark = bitPalletMark, //闆舵墭鏍囪
inspectmark = inspectMark, //妫�楠屾爣璁�
inspectstatus = inspectStatus, //璐ㄩ噺鐘舵��
+ ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
//stockdetailid = "(" + arr + ")" //搴撳瓨鏄庣粏id
});
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index ac4587f..b2012da 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -32,9 +32,9 @@
/// <param name="skuNo">鐗╂枡缂栫爜</param>
/// <param name="skuName">鐗╂枡鍚嶇О</param>
/// <returns></returns>
- public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName)
+ public List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName)
{
- string str = "select stock.SkuNo,stock.SkuName,stock.Standard,stock.Qty,stock.LockQty,stock.FrozenQty,(mate.Weight * stock.Qty) WeightSum from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
+ string str = "select stock.SkuNo,stock.SkuName,stock.LotNo,stock.LotText,stock.Standard,stock.Qty,stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum from DataStock stock left join SysMaterials mate on stock.SkuNo = mate.SkuNo Where stock.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
@@ -45,13 +45,25 @@
{
str += " and stock.SkuName like @skuname";
}
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and stock.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and stock.OwnerName like @ownerName";
+ }
//鎺掑簭
str += " order by stock.SkuNo";
List<MateDataStockDto> StockList = Db.Ado.SqlQuery<MateDataStockDto>(str, new
{
isdel = "0", //鏄惁鍒犻櫎
skuno = "%" + skuNo + "%", //鐗╂枡缂栫爜
- skuname = "%" + skuName + "%" //鐗╂枡鍚嶇О
+ skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
+ ownerNo= "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName= "%" + ownerName + "%" //璐т富鍚嶇О
});
//搴撳瓨鎬婚噺
@@ -66,8 +78,8 @@
//foreach寰幆搴撳瓨鎬婚噺
foreach (var dto in StockListDto)
{
- //鍒ゆ柇鐗╂枡鏄惁鐩稿悓
- if (dto.SkuNo == item.SkuNo)
+ //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
+ if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
{
dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
@@ -105,7 +117,7 @@
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
- public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
+ public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
{
string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo Where detail.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
@@ -143,6 +155,16 @@
{
str += " and detail.InspectStatus = @inspectstatus";
}
+ //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerNo))
+ {
+ str += " and detail.OwnerNo like @ownerNo";
+ }
+ //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
+ if (!string.IsNullOrEmpty(ownerName))
+ {
+ str += " and detail.OwnerName like @ownerName";
+ }
//鎺掑簭
str += " order by detail.SkuNo,detail.PalletNo,detail.LotNo";
List<StockDetailDto> stockDetailsList = Db.Ado.SqlQuery<StockDetailDto>(str, new
@@ -154,7 +176,9 @@
locatno = locatNo, //鍌ㄤ綅鍦板潃
palletno = palletNo, //鎵樼洏鏉＄爜
status = status, //搴撳瓨鐘舵��
- inspectstatus = inspectStatus //璐ㄦ鐘舵��
+ inspectstatus = inspectStatus, //璐ㄦ鐘舵��
+ ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
+ ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
});
return stockDetailsList;
}
diff --git a/Wms/WMS.Entity/DataEntity/DataStock.cs b/Wms/WMS.Entity/DataEntity/DataStock.cs
index 86517a1..12398b2 100644
--- a/Wms/WMS.Entity/DataEntity/DataStock.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStock.cs
@@ -50,6 +50,18 @@
/// </summary>
public string SupplierLot { get; set; }
/// <summary>
+ /// Desc:璐т富缂栧彿
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerNo { get; set; }
+ /// <summary>
+ /// Desc:璐т富鍚嶇О
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerName { get; set; }
+ /// <summary>
/// Desc:鏁伴噺
/// Default:
/// Nullable:False
diff --git a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
index dcd75c1..f42d73f 100644
--- a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
@@ -33,6 +33,20 @@
public string SupplierLot {get;set;}
/// <summary>
+ /// Desc:璐т富缂栧彿
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerNo { get; set; }
+
+ /// <summary>
+ /// Desc:璐т富鍚嶇О
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string OwnerName { get; set; }
+
+ /// <summary>
/// Desc:鐗╂枡缂栫爜
/// Default:
/// Nullable:True
diff --git a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
index b41ffc5..25d357b 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -23,7 +23,7 @@
/// <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);
+ 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);
/// <summary>
/// 瀵煎嚭鎵樼洏鏄庣粏
diff --git a/Wms/WMS.IBLL/IDataServer/IStockServer.cs b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
index 58d74cc..8f05642 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockServer.cs
@@ -16,7 +16,7 @@
/// <param name="skuNo">鐗╂枡缂栫爜</param>
/// <param name="skuName">鐗╂枡鍚嶇О</param>
/// <returns></returns>
- List<MateDataStockDto> GetDataStockList(string skuNo, string skuName);
+ List<MateDataStockDto> GetDataStockList(string skuNo, string skuName, string ownerNo, string ownerName);
/// <summary>
/// 鑾峰彇搴撳瓨鏄庣粏
@@ -29,7 +29,7 @@
/// <param name="status">搴撳瓨鐘舵��</param>
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
- List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus);
+ List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName);
#endregion
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 5a1516a..5364465 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -40,9 +40,9 @@
/// <param name="skuName"></param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList(string skuNo, string skuName)
+ public IActionResult GetInventoryList(string skuNo, string skuName,string ownerNo,string ownerName)
{
- List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName);
+ List<MateDataStockDto> StockList = _stock.GetDataStockList(skuNo, skuName,ownerNo,ownerName);
return Ok(new
{
data = StockList,
@@ -64,9 +64,9 @@
/// <param name="inspectStatus">璐ㄦ鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus)
+ public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, string status, string inspectStatus, string ownerNo, string ownerName)
{
- List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus);
+ List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo, status, inspectStatus, ownerNo, ownerName);
return Ok(new
{
data = stockDetailsList,
@@ -94,11 +94,11 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <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)
+ 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)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0