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

调整出库单查询

Browse Source
This commit is contained in:
18942506660
2023-11-09 10:25:59 +08:00
parent 0bd21a0329
commit 87f914dcdb
9 changed files with 263 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -240,7 +240,12 @@ namespace WMS.Web.Repositories
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
{
cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.MaterialId).ToList();
var q = dto.ReceiptCustomer.Substring(0, 1);
var h = dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1);
if (q.Equals("c"))
cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
else
cIds = orgs.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
}
#endregion
@@ -251,7 +256,13 @@ namespace WMS.Web.Repositories
.Where(adv => 1 == 1);
if (cIds.Count() != 0)
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId));
{
var q = dto.ReceiptCustomer.Substring(0, 1);
if (q.Equals("c"))//差销售出库单(客户)
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal);
else//查其他单据(组织)
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal);
}
if (mIds.Count() != 0)
query = query.Where(w => mIds.Contains(w.detail.MaterialId));
if (dto.Ids.Count() > 0)