diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 3c38bd17..774f13aa 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -204,10 +204,18 @@ namespace WMS.Web.Api.Controllers //找到已入库的箱子 var instockBoxList= await _inStockRepositories.GetInstockBox(taskId); + var remobox = new List(); if (receiveBoxList.Count!=0 && instockBoxList.Count != 0) { //剔除已入库的箱子 - foreach (var item in instockBoxList.Distinct().ToList()) + foreach (var boxid in instockBoxList.Distinct().ToList()) + { + remobox.Add(receiveBoxList.Where(x => x.BoxId == boxid).First()); + } + } + if (remobox.Count != 0) + { + foreach (var item in remobox) { receiveBoxList.Remove(item); } diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs index 0329df07..c53a6b74 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs @@ -80,7 +80,7 @@ namespace WMS.Web.Domain.Infrastructure /// /// /// - Task> GetInstockBox(int taskId); + Task> GetInstockBox(int taskId); /// /// 获取最新的erp明细 diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 73256071..b7f68d1a 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -260,13 +260,9 @@ namespace WMS.Web.Repositories /// /// /// - public async Task> GetInstockBox(int taskId) + public async Task> GetInstockBox(int taskId) { - return await _context.InStockDetails.Where(x => x.TaskId == taskId).Select(x => new ReceiveBoxResponse() - { - TaskId = x.TaskId, - BoxId = x.BoxId - }).ToListAsync(); + return await _context.InStockDetails.Where(x => x.TaskId == taskId).Select(x => x.BoxId).ToListAsync(); } ///