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

调整bug

Browse Source
This commit is contained in:
18942506660
2023-11-09 10:32:09 +08:00
parent 87f914dcdb
commit 3687bbb7d1
2 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -106,21 +106,12 @@ namespace WMS.Web.Repositories
return (new List<OutStockQueryInfoResponse>(), 0); return (new List<OutStockQueryInfoResponse>(), 0);
var orgs = org_result.Data.ToList(); var orgs = org_result.Data.ToList();
List<int> cIds = new List<int>(); //取客户
var customer_result = await _erpService.BillQueryForCustomer(); var customer_result = await _erpService.BillQueryForCustomer();
if (!customer_result.IsSuccess) if (!customer_result.IsSuccess)
return (new List<OutStockQueryInfoResponse>(), 0); return (new List<OutStockQueryInfoResponse>(), 0);
var customers = customer_result.Data.ToList(); var customers = customer_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
{
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 #endregion
var query = _context.OutStockDetails var query = _context.OutStockDetails
@@ -129,13 +120,15 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.order.Id) .OrderByDescending(o => o.order.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (cIds.Count() != 0) if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
{ {
var q = dto.ReceiptCustomer.Substring(0, 1); var rec_type = dto.ReceiptCustomer.Substring(0, 1);
if (q.Equals("c"))//差销售出库单(客户) var rec_id = Convert.ToInt32(dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1));
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal);
if (rec_type.Equals("c"))//差销售出库单(客户)
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type == OutStockType.Sal);
else//查其他单据(组织) else//查其他单据(组织)
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal); query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
} }
if (mIds.Count() != 0) if (mIds.Count() != 0)
query = query.Where(w => mIds.Contains(w.detail.MaterialId)); query = query.Where(w => mIds.Contains(w.detail.MaterialId));

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

@@ -232,21 +232,12 @@ namespace WMS.Web.Repositories
return (new List<OutStockTaskQueryInfoResponse>(), 0); return (new List<OutStockTaskQueryInfoResponse>(), 0);
var orgs = org_result.Data.ToList(); var orgs = org_result.Data.ToList();
List<int> cIds = new List<int>(); //取客户
var customer_result = await _erpService.BillQueryForCustomer(); var customer_result = await _erpService.BillQueryForCustomer();
if (!customer_result.IsSuccess) if (!customer_result.IsSuccess)
return (new List<OutStockTaskQueryInfoResponse>(), 0); return (new List<OutStockTaskQueryInfoResponse>(), 0);
var customers = customer_result.Data.ToList(); var customers = customer_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
{
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 #endregion
var query = _context.OutStockTaskDetails var query = _context.OutStockTaskDetails
@@ -255,13 +246,15 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.order.Id) .OrderByDescending(o => o.order.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (cIds.Count() != 0) if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
{ {
var q = dto.ReceiptCustomer.Substring(0, 1); var rec_type = dto.ReceiptCustomer.Substring(0, 1);
if (q.Equals("c"))//差销售出库单(客户) var rec_id = Convert.ToInt32(dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1));
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal);
if (rec_type.Equals("c"))//差销售出库单(客户)
query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type == OutStockType.Sal);
else//查其他单据(组织) else//查其他单据(组织)
query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal); query = query.Where(w => rec_id == w.order.ReceiptCustomerId && w.order.Type != OutStockType.Sal);
} }
if (mIds.Count() != 0) if (mIds.Count() != 0)
query = query.Where(w => mIds.Contains(w.detail.MaterialId)); query = query.Where(w => mIds.Contains(w.detail.MaterialId));