diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index be2c33a0..3e653133 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2338,6 +2338,11 @@ 箱信息ID + + + 单据ID(等同-入库任务单明细ID) + + 对应金蝶的明细ID diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index f8a28270..78f695cd 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1075,6 +1075,11 @@ 入库任务单ID + + + 单据ID(等同-入库任务单明细ID) + + 箱号ID diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs index be238f35..19461409 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs @@ -19,6 +19,11 @@ namespace WMS.Web.Core.Dto.InStockTask /// public int BoxId { get; set; } + /// + /// 单据ID(等同-入库任务单明细ID) + /// + public int TaskDetailId { get; set; } + /// /// 对应金蝶的明细ID /// diff --git a/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs b/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs index 8d0bd708..50624b36 100644 --- a/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs +++ b/src/WMS.Web.Domain/Entitys/InStockTaskBox.cs @@ -24,6 +24,11 @@ namespace WMS.Web.Domain.Entitys /// public int TaskId { get; set; } + /// + /// 单据ID(等同-入库任务单明细ID) + /// + public int TaskDetailId { get; set; } + /// /// 箱号ID /// diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 32bbe4e8..694bb73a 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -176,10 +176,13 @@ namespace WMS.Web.Repositories var boxList = await _context.InStockTaskBoxDetails .GroupJoin(_context.InstockTaskBox, boxde => boxde.Fid, ts => ts.Id, (detail, ts) => new { detail, ts }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, box }) + .GroupJoin(_context.InStockTaskDetails, p => p.box.TaskDetailId, ts => ts.Id, (p, ts) => new { p.detail, p.box, ts }) + .SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskDet) => new { p.detail, p.box, taskDet }) .Where(x => x.box.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto() { BoxId = x.box.BoxId, BoxBillNo = x.box.BoxBillNo, + SaleBillNo=x.taskDet.SaleBillNo, Method = InventoryInOutMethod.Box.GetRemark(), MaterialNumber = x.detail.MaterialNumber, Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),