From 17cfaf16af557e7d933397a1ce1e2b686d53a698 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 6 Dec 2023 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml         |  7 +++++++
 .../Infrastructure/IInStockTaskBoxRepositories.cs  |  7 +++++++
 src/WMS.Web.Domain/Services/InStockService.cs      |  5 ++---
 .../InStockTaskBoxRepositories.cs                  | 14 +++++++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 4e6e7330..f8918874 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2026,6 +2026,13 @@
             <param name="taskId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskBoxRepositories.GetListBy(System.Collections.Generic.List{System.String})">
+            <summary>
+            集合：根据箱号集合
+            </summary>
+            <param name="boxBillNos"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskBoxRepositories.GetBy(System.String)">
             <summary>
             实体：箱号ID
diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
index 58a45098..234545ad 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
@@ -18,6 +18,13 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<List<InStockTaskBox>> GetListBy(int taskId);
 
+        /// <summary>
+        /// 集合：根据箱号集合
+        /// </summary>
+        /// <param name="boxBillNos"></param>
+        /// <returns></returns>
+        Task<List<InStockTaskBox>> GetListBy(List<string> boxBillNos);
+
         /// <summary>
         /// 实体：箱号ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 116a56db..a2af1798 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -570,9 +570,8 @@ namespace WMS.Web.Domain.Services
 
 
             //4.是否任务单存在绑定箱号判断:存在的话，就不能收货或者非采购上架
-            var taskBoxList = await _inStockTaskBoxRepositories.GetListBy(task.Id);
-            bool isHave = taskBoxList.Where(x => dto.BoxBillNos.Contains(x.BoxBillNo)).Any();
-            if (isHave)
+            var taskBoxList = await _inStockTaskBoxRepositories.GetListBy(dto.BoxBillNos);
+            if (taskBoxList != null && taskBoxList.Count != 0)
                 return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.BoxHaveError);
 
             //4.返回对比结果：true为比对成功，并把箱ID和箱号返回
diff --git a/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs b/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
index b3faa4dc..798ca318 100644
--- a/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
@@ -48,7 +48,7 @@ namespace WMS.Web.Repositories
         }
 
         /// <summary>
-        /// 集合：任务ID
+        /// 集合：根据任务ID
         /// </summary>
         /// <param name="taskId"></param>
         /// <returns></returns>
@@ -59,6 +59,18 @@ namespace WMS.Web.Repositories
             return entitys;
         }
 
+        /// <summary>
+        /// 集合：根据箱号集合
+        /// </summary>
+        /// <param name="boxBillNos"></param>
+        /// <returns></returns>
+        public async Task<List<InStockTaskBox>> GetListBy(List<string> boxBillNos)
+        {
+            var entitys = await _context.InstockTaskBox
+                 .Include(s => s.Details).Where(x => boxBillNos.Contains(x.BoxBillNo)).ToListAsync();
+            return entitys;
+        }
+
         /// <summary>
         /// 实体：箱号ID
         /// </summary>