From 537aa0fe3d0f3b81b0138da418f3082a8c5a1584 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 1 Apr 2024 10:40:19 +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/wwwroot/WMS.Web.Core.xml       |  5 +++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml     |  8 ++++++++
 .../Dto/InStock/BoxInStockTaskRequest.cs       |  5 +++++
 .../IInStockTaskBoxRepositories.cs             |  8 ++++++++
 src/WMS.Web.Domain/Services/InStockService.cs  |  2 +-
 .../InStockTaskBoxRepositories.cs              | 18 +++++++++++++++++-
 6 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index db218c02..9b45cb4c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2548,6 +2548,11 @@
             仓库编码
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.BoxInStockTaskRequest.TaskId">
+            <summary>
+            任务来源单的ID
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStock.InStockInfoResponse">
             <summary>
             入库单详情
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index c1c456af..aa0c4dd2 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2806,6 +2806,14 @@
             <param name="boxBillNo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskBoxRepositories.GetBy(System.String,System.Nullable{System.Int32})">
+            <summary>
+            实体：箱号和任务单ID
+            </summary>
+            <param name="boxBillNo"></param>
+            <param name="taskId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskBoxRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InStockTaskBox},System.Boolean)">
             <summary>
             批量添加
diff --git a/src/WMS.Web.Core/Dto/InStock/BoxInStockTaskRequest.cs b/src/WMS.Web.Core/Dto/InStock/BoxInStockTaskRequest.cs
index f4c02bb5..414146c1 100644
--- a/src/WMS.Web.Core/Dto/InStock/BoxInStockTaskRequest.cs
+++ b/src/WMS.Web.Core/Dto/InStock/BoxInStockTaskRequest.cs
@@ -18,5 +18,10 @@ namespace WMS.Web.Core.Dto.InStock
         /// 仓库编码
         /// </summary>
         public string StockCode { get; set; }
+
+        /// <summary>
+        /// 任务来源单的ID
+        /// </summary>
+        public int? TaskId { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
index ac630c2b..5c162c05 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInStockTaskBoxRepositories.cs
@@ -39,6 +39,14 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<InStockTaskBox> GetBy(string boxBillNo);
 
+        /// <summary>
+        /// 实体：箱号和任务单ID
+        /// </summary>
+        /// <param name="boxBillNo"></param>
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        Task<InStockTaskBox> GetBy(string boxBillNo, int? taskId);
+
         /// <summary>
         /// 批量添加
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index f5b3ca99..6cdd264a 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -195,7 +195,7 @@ namespace WMS.Web.Domain.Services
                 materials = materials_result.Data.ToList();
 
             //1.先判断：箱号已经绑定了入库任务单中；备注：业务说法就是箱是否收货了
-            var tast_box = await _inStockTaskBoxRepositories.GetBy(dto.BoxBillNo);
+            var tast_box = await _inStockTaskBoxRepositories.GetBy(dto.BoxBillNo,dto.TaskId);
             if (tast_box == null)
                 return Result<BoxInStockTaskDto>.ReFailure(ResultCodes.Box_NoBind_Task_Data);
 
diff --git a/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs b/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
index 73274011..485e6473 100644
--- a/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskBoxRepositories.cs
@@ -16,7 +16,7 @@ namespace WMS.Web.Repositories
     /// <summary>
     /// 箱与任务单绑定（收货）关系表-仓储
     /// </summary>
-    public class InStockTaskBoxRepositories: IInStockTaskBoxRepositories
+    public class InStockTaskBoxRepositories : IInStockTaskBoxRepositories
     {
         private readonly IMapper _mapper;
         private readonly IServiceProvider _serviceProvider;
@@ -95,6 +95,22 @@ namespace WMS.Web.Repositories
             return entity;
         }
 
+        /// <summary>
+        /// 实体：箱号和任务单ID
+        /// </summary>
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public async Task<InStockTaskBox> GetBy(string boxBillNo, int? taskId)
+        {
+            var query = _context.InstockTaskBox
+                 .Include(s => s.Details).Where(x => x.BoxBillNo == boxBillNo);
+
+            if (taskId.HasValue)
+                query = query.Where(x => x.TaskId == taskId.Value);
+
+            return await query.FirstOrDefaultAsync();
+        }
+
         /// <summary>
         /// 批量添加
         /// </summary>