18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物料搜索

Browse Source
This commit is contained in:
tongfei
2024-04-01 15:18:51 +08:00
parent ce1a2ad543
commit 5d20813a8a
6 changed files with 117 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -68,15 +68,16 @@ namespace WMS.Web.Repositories
if (materials_result.IsSuccess) if (materials_result.IsSuccess)
materials = materials_result.Data.ToList(); materials = materials_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials.Count != 0) if (materials.Count != 0)
{ {
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).ToList(); ).Select(x => x.MaterialNumber).ToList();
} }
} }
@@ -108,14 +109,8 @@ namespace WMS.Web.Repositories
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null && materials.Count != 0) query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber));
{
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialNumber));
} }
}
var tt = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, "wmsCK0213" + "CK001" + "101");
_logger.LogInformation("箱库存列表："+tt+"公司ID："+companyId);
int total = await query.CountAsync(); int total = await query.CountAsync();
var list = await query.Select(s => new BoxInventoryQueryResponse() var list = await query.Select(s => new BoxInventoryQueryResponse()

12
src/WMS.Web.Repositories/BoxMarkRepositories.cs
View File

@@ -57,10 +57,11 @@ namespace WMS.Web.Repositories
if (materials_result.IsSuccess) if (materials_result.IsSuccess)
materials = materials_result.Data.ToList(); materials = materials_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.Material)) if (!string.IsNullOrEmpty(dto.Material))
materials = materials.Where(w => w.MaterialNumber.Contains(dto.Material) || w.MaterialName.Contains(dto.Material) || w.Specifications.Contains(dto.Material)).ToList(); materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.Material) || w.MaterialName.Contains(dto.Material) || w.Specifications.Contains(dto.Material)).Select(x => x.MaterialNumber).ToList();
if (companyId == 0) if (companyId == 0)
companyId = _loginRepositories.CompanyId; companyId = _loginRepositories.CompanyId;
@@ -110,17 +111,10 @@ namespace WMS.Web.Repositories
} }
} }
List<string> mNumber = new List<string>();
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.Material)) if (!string.IsNullOrEmpty(dto.Material))
{ {
if (materials != null) query = query.Where(w => materialNumbs.Contains(w.order.MaterialNumber));
mNumber = materials.Where(w => w.MaterialNumber.Contains(dto.Material)
|| w.MaterialName.Contains(dto.Material)
|| w.Specifications.Contains(dto.Material)
).Select(s => s.MaterialNumber).ToList();
query = query.Where(w => mNumber.Contains(w.order.MaterialNumber));
} }
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))

11
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -295,16 +295,17 @@ namespace WMS.Web.Repositories
if (suppliers_result.IsSuccess) if (suppliers_result.IsSuccess)
suppliers = suppliers_result.Data.ToList(); suppliers = suppliers_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials.Count != 0) if (materials.Count != 0)
{ {
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).ToList(); ).Select(x => x.MaterialNumber).ToList();
} }
} }
@@ -329,11 +330,7 @@ namespace WMS.Web.Repositories
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null && materials.Count != 0) query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber));
{
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialNumber));
}
} }
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))

17
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -203,7 +203,8 @@ namespace WMS.Web.Repositories
boxList.ForEach(x => boxList.ForEach(x =>
{ {
var currentInstock = boxInstockList_details.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).FirstOrDefault(); var currentInstock = boxInstockList_details.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).FirstOrDefault();
if (currentInstock != null) { if (currentInstock != null)
{
var order = instockOrder.Where(o => o.Id == currentInstock.Fid).FirstOrDefault(); var order = instockOrder.Where(o => o.Id == currentInstock.Fid).FirstOrDefault();
x.RealityQty = currentInstock.Qty; x.RealityQty = currentInstock.Qty;
x.Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, (order == null ? 0 : order.CreatorId)); x.Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, (order == null ? 0 : order.CreatorId));
@@ -275,7 +276,8 @@ namespace WMS.Web.Repositories
boxList.ForEach(x => boxList.ForEach(x =>
{ {
var method = (InventoryInOutMethod)x.MethodForInt; var method = (InventoryInOutMethod)x.MethodForInt;
if (method == InventoryInOutMethod.Box) { if (method == InventoryInOutMethod.Box)
{
var currentBoxDet = boxdetails.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).FirstOrDefault(); var currentBoxDet = boxdetails.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).FirstOrDefault();
if (currentBoxDet != null) if (currentBoxDet != null)
{ {
@@ -691,6 +693,7 @@ namespace WMS.Web.Repositories
if (suppliers_result.IsSuccess) if (suppliers_result.IsSuccess)
suppliers = suppliers_result.Data.ToList(); suppliers = suppliers_result.Data.ToList();
List<string> materialNumbs = new List<string>();
List<int> ids_Receiver = new List<int>(); List<int> ids_Receiver = new List<int>();
List<int> ids_Operator = new List<int>(); List<int> ids_Operator = new List<int>();
if (companyId == 0) if (companyId == 0)
@@ -715,10 +718,10 @@ namespace WMS.Web.Repositories
{ {
if (materials.Count != 0) if (materials.Count != 0)
{ {
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).ToList(); ).Select(x => x.MaterialNumber).ToList();
} }
} }
@@ -733,11 +736,7 @@ namespace WMS.Web.Repositories
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null && materials.Count != 0) query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber));
{
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.detail.MaterialNumber));
}
} }
if (!string.IsNullOrEmpty(dto.Receiver)) if (!string.IsNullOrEmpty(dto.Receiver))

12
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -63,15 +63,16 @@ namespace WMS.Web.Repositories
if (materials_result.IsSuccess) if (materials_result.IsSuccess)
materials = materials_result.Data.ToList(); materials = materials_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials.Count != 0) if (materials.Count != 0)
{ {
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).ToList(); ).Select(x => x.MaterialNumber).ToList();
} }
} }
@@ -84,14 +85,11 @@ namespace WMS.Web.Repositories
var query = _context.InventoryDetails var query = _context.InventoryDetails
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null && materials.Count != 0) query = query.Where(w => materialNumbs.Contains(w.MaterialNumber));
{
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.MaterialNumber));
}
} }
if (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))

12
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -68,16 +68,16 @@ namespace WMS.Web.Repositories
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (orgs_result.IsSuccess) if (orgs_result.IsSuccess)
orgs = orgs_result.Data.ToList(); orgs = orgs_result.Data.ToList();
List<string> materialNumbs = new List<string>();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials.Count != 0) if (materials.Count != 0)
{ {
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber) materialNumbs = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber) || w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber) || w.Specifications.Contains(dto.MaterialNumber)
).ToList(); ).Select(x => x.MaterialNumber).ToList();
} }
} }
@@ -87,11 +87,7 @@ namespace WMS.Web.Repositories
//物料ID在模糊后的物料 //物料ID在模糊后的物料
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
{ {
if (materials != null && materials.Count != 0) query = query.Where(w => materialNumbs.Contains(w.MaterialNumber));
{
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.MaterialNumber));
}
} }
if (!string.IsNullOrEmpty(dto.StockCode)) if (!string.IsNullOrEmpty(dto.StockCode))