From f459f4e8aa1f3c26514689bb946ac51072d8fc52 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 29 May 2024 12:00:32 +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.Domain/Infrastructure/IInStockRepositories.cs | 2 +-
 src/WMS.Web.Repositories/InStockRepositories.cs           | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
index ce1cbb53..2751c5f9 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs
@@ -124,7 +124,7 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<bool> UpdateRange(List<InStockDetails> entitys, bool isTransaction = true);
         /// <summary>
-        /// 获取-已入库的箱
+        /// 获取-非采购上将已入库的箱
         /// </summary>
         /// <param name="boxIds"></param>
         /// <returns></returns>
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index 96fd2861..87368d92 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -488,13 +488,16 @@ namespace WMS.Web.Repositories
             }
         }
         /// <summary>
-        /// 获取已入库的箱
+        /// 获取非采购上将已入库的箱
         /// </summary>
         /// <param name="boxIds"></param>
         /// <returns></returns>
         public async Task<List<int>> GetInstockBoxIds(List<int> boxIds)
         {
-            return await _context.InStockDetails.Where(x => boxIds.Contains(x.BoxId)).Select(s => s.BoxId).ToListAsync();
+            return await _context.InStockDetails
+                 .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
+                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                .Where(x => boxIds.Contains(x.detail.BoxId) && x.order.Type != InstockType.Purchase).Select(s => s.detail.BoxId).ToListAsync();
         }
     }
 }