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-03-18 11:03:51 +08:00
parent c0520b5cd3
commit 896450fd23
49 changed files with 394 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,11 +72,13 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
{
//materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).ToList();
if (materials.Count != 0)
{
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)
|| w.MaterialName.Contains(dto.MaterialNumber)
|| w.Specifications.Contains(dto.MaterialNumber)
).ToList();
}
}
var query = _context.InventoryInOutDetails
@@ -87,11 +89,9 @@ namespace WMS.Web.Repositories
{
if (materials != null && materials.Count != 0)
{
var mids = materials.Select(x => x.MaterialId).ToList();
query = query.Where(w => mids.Contains(w.MaterialId));
var mids = materials.Select(x => x.MaterialNumber).ToList();
query = query.Where(w => mids.Contains(w.MaterialNumber));
}
else
query = query.Where(w => w.MaterialId == 0);
}
if (!string.IsNullOrEmpty(dto.StockCode))
@@ -113,9 +113,9 @@ namespace WMS.Web.Repositories
var list = await query.Select(s => new InventoryInOutDetailsQueryResponse()
{
Id = s.Id,
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
MaterialNumber = s.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
Type =s.Type.GetRemark(),
OrderType=s.OrderType.GetRemark(),
OrderBillNo=s.OrderBillNo,