From c459d35486875daf24613d2f2f83fb5e028e2e50 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 1 Apr 2024 16:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/InStockTaskController.cs   | 10 +++++++++-
 .../Infrastructure/IInStockRepositories.cs             |  2 +-
 src/WMS.Web.Repositories/InStockRepositories.cs        |  8 ++------
 3 files changed, 12 insertions(+), 8 deletions(-)

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<ReceiveBoxResponse>();
             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
         /// </summary>
         /// <param name="taskId"></param>
         /// <returns></returns>
-        Task<List<ReceiveBoxResponse>> GetInstockBox(int taskId);
+        Task<List<int>> GetInstockBox(int taskId);
 
         /// <summary>
         /// 获取最新的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
         /// </summary>
         /// <param name="taskId"></param>
         /// <returns></returns>
-        public async Task<List<ReceiveBoxResponse>> GetInstockBox(int taskId)
+        public async Task<List<int>> 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();
         }
 
         /// <summary>