优化接口

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>
             入库单详情

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>
             批量添加

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; }
     }
 }

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>

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);
 

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>