This commit is contained in:
tongfei
2024-04-17 14:47:42 +08:00
parent 7559de8831
commit 7700bc37fb
5 changed files with 23 additions and 0 deletions

View File

@@ -2338,6 +2338,11 @@
箱信息ID 箱信息ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.TaskDetailId">
<summary>
单据ID(等同-入库任务单明细ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.ErpDetailId"> <member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest.ErpDetailId">
<summary> <summary>
对应金蝶的明细ID 对应金蝶的明细ID

View File

@@ -1075,6 +1075,11 @@
入库任务单ID 入库任务单ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.TaskDetailId">
<summary>
单据ID(等同-入库任务单明细ID)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.BoxId"> <member name="P:WMS.Web.Domain.Entitys.InStockTaskBox.BoxId">
<summary> <summary>
箱号ID 箱号ID

View File

@@ -19,6 +19,11 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary> /// </summary>
public int BoxId { get; set; } public int BoxId { get; set; }
/// <summary>
/// 单据ID(等同-入库任务单明细ID)
/// </summary>
public int TaskDetailId { get; set; }
/// <summary> /// <summary>
/// 对应金蝶的明细ID /// 对应金蝶的明细ID
/// </summary> /// </summary>

View File

@@ -24,6 +24,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
public int TaskId { get; set; } public int TaskId { get; set; }
/// <summary>
/// 单据ID(等同-入库任务单明细ID)
/// </summary>
public int TaskDetailId { get; set; }
/// <summary> /// <summary>
/// 箱号ID /// 箱号ID
/// </summary> /// </summary>

View File

@@ -176,10 +176,13 @@ namespace WMS.Web.Repositories
var boxList = await _context.InStockTaskBoxDetails var boxList = await _context.InStockTaskBoxDetails
.GroupJoin(_context.InstockTaskBox, boxde => boxde.Fid, ts => ts.Id, (detail, ts) => new { detail, ts }) .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 }) .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() .Where(x => x.box.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto()
{ {
BoxId = x.box.BoxId, BoxId = x.box.BoxId,
BoxBillNo = x.box.BoxBillNo, BoxBillNo = x.box.BoxBillNo,
SaleBillNo=x.taskDet.SaleBillNo,
Method = InventoryInOutMethod.Box.GetRemark(), Method = InventoryInOutMethod.Box.GetRemark(),
MaterialNumber = x.detail.MaterialNumber, MaterialNumber = x.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),