From 0ed14f257c7e5ebcb450998770c73cfc29e169bc Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 16 Apr 2024 14:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 3ce221cc..fb6970a1 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -277,7 +277,9 @@ namespace WMS.Web.Repositories if (customer_result.IsSuccess) customers = customer_result.Data.ToList(); - List taskIds = new List(); + List taskIds = null; + List taskIds_s = new List(); + List taskIds_b = new List(); //序列码出库单 if (dto.SerialNumbers != null && dto.SerialNumbers.Count() > 0) { @@ -288,7 +290,11 @@ namespace WMS.Web.Repositories if (dto.BoxBillNos != null && dto.BoxBillNos.Count() > 0) { 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 @@ -332,7 +338,7 @@ namespace WMS.Web.Repositories DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1); 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)); }