diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 9ffb06c8..73ad28c7 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 98db1f10..4201d621 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1962,6 +1962,11 @@ 任务箱信息 + + + 明细Id + + 箱ID diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs index 51a5f1a3..c9a549d5 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs @@ -9,7 +9,10 @@ namespace WMS.Web.Core.Dto.InStockTask /// public class InStockTaskBoxInfoDto { - + /// + /// 明细Id + /// + public string DetailId { get; set; } /// /// 箱ID /// diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index ad0d1510..5a695397 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -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,