修复bug
This commit is contained in:
Binary file not shown.
@@ -1962,6 +1962,11 @@
|
||||
任务箱信息
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.DetailId">
|
||||
<summary>
|
||||
明细Id
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.BoxId">
|
||||
<summary>
|
||||
箱ID
|
||||
|
||||
@@ -9,7 +9,10 @@ namespace WMS.Web.Core.Dto.InStockTask
|
||||
/// </summary>
|
||||
public class InStockTaskBoxInfoDto
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 明细Id
|
||||
/// </summary>
|
||||
public string DetailId { get; set; }
|
||||
/// <summary>
|
||||
/// 箱ID
|
||||
/// </summary>
|
||||
|
||||
@@ -184,6 +184,7 @@ namespace WMS.Web.Repositories
|
||||
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskBox) => new { p.detail, p.order, p.box, p.taskDet, taskBox })
|
||||
.Where(x => x.detail.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto()
|
||||
{
|
||||
DetailId = "instock_" + x.detail.Id,
|
||||
BoxId = x.box.Id,
|
||||
BoxBillNo = x.box.BoxBillNo,
|
||||
SaleBillNo = x.taskDet.SaleBillNo,
|
||||
@@ -202,6 +203,8 @@ namespace WMS.Web.Repositories
|
||||
SerialNumbers = (string.Join(",", x.detail.SerialNumbers).TrimEnd(','))
|
||||
|
||||
}).ToListAsync();
|
||||
//这里不知道为什么左连接会查出重复多余数据 需要去重
|
||||
boxList = boxList.GroupBy(g => g.DetailId).Select(s => s.First()).ToList();
|
||||
|
||||
var boxIds = boxList.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
|
||||
|
||||
@@ -214,6 +217,7 @@ namespace WMS.Web.Repositories
|
||||
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskDet) => new { p.detail, p.box, taskDet })
|
||||
.Where(x => x.box.TaskId == entity.Id && !boxIds.Contains(x.box.BoxId)).Select(x => new InStockTaskBoxInfoDto()
|
||||
{
|
||||
DetailId = "instocktask_" + x.detail.Id,
|
||||
BoxId = x.box.BoxId,
|
||||
BoxBillNo = x.box.BoxBillNo,
|
||||
SaleBillNo = x.taskDet.SaleBillNo,
|
||||
|
||||
Reference in New Issue
Block a user