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 @@ 仓库编码 + + + 任务来源单的ID + + 入库单详情 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 @@ + + + 实体:箱号和任务单ID + + + + + 批量添加 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 /// 仓库编码 /// public string StockCode { get; set; } + + /// + /// 任务来源单的ID + /// + 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 /// Task GetBy(string boxBillNo); + /// + /// 实体:箱号和任务单ID + /// + /// + /// + /// + Task GetBy(string boxBillNo, int? taskId); + /// /// 批量添加 /// 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.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 /// /// 箱与任务单绑定(收货)关系表-仓储 /// - 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; } + /// + /// 实体:箱号和任务单ID + /// + /// + /// + public async Task 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(); + } + /// /// 批量添加 ///