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
2024-04-16 14:34:39 +08:00
parent d86033b30b
commit 0ed14f257c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,9 @@ namespace WMS.Web.Repositories
if (customer_result.IsSuccess) if (customer_result.IsSuccess)
customers = customer_result.Data.ToList(); customers = customer_result.Data.ToList();
List<int> taskIds = new List<int>(); List<int> taskIds = null;
List<int> taskIds_s = new List<int>();
List<int> taskIds_b = new List<int>();
//序列码出库单 //序列码出库单
if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0) if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0)
{ {
@@ -288,7 +290,11 @@ namespace WMS.Web.Repositories
if (dto.BoxBillNos != null && dto.BoxBillNos.Count() > 0) if (dto.BoxBillNos != null && dto.BoxBillNos.Count() > 0)
{ {
var res = await _outStockRepositories.GetEntityListByBoxBillNos(dto.BoxBillNos); var res = await _outStockRepositories.GetEntityListByBoxBillNos(dto.BoxBillNos);
taskIds.AddRange(res.Select(s => s.TaskId)); //要跟上面的序列码搜索取交集
if (taskIds == null)
taskIds.AddRange(res.Select(s => s.TaskId));
else
taskIds = res.Select(s => s.TaskId).Intersect(taskIds).ToList();
} }
#endregion #endregion
@@ -332,7 +338,7 @@ namespace WMS.Web.Repositories
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1); DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
query = query.Where(w => w.order.OperateTime <= dt_end); query = query.Where(w => w.order.OperateTime <= dt_end);
} }
if (taskIds.Count() > 0) if (taskIds != null)
{ {
query = query.Where(w => taskIds.Contains(w.order.Id)); query = query.Where(w => taskIds.Contains(w.order.Id));
} }