diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 41109096..d84d9baf 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -182,15 +182,17 @@ namespace WMS.Web.Domain.Services if (erp_list.Count != 0) { var add_entitys = new List(); - var current_billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList(); + //var current_billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList(); + var current_billNos = erp_list.GroupBy(x => new { x.FBillNo, x.FCreateDate }).Select(x => new { x.Key.FBillNo, x.Key.FCreateDate }).ToList(); foreach (var item in current_billNos) { var dto = new InStockTask(); - dto.SourceBillNo = item; + dto.SourceBillNo = item.FBillNo; + dto.CreateTime = item.FCreateDate; dto.Create(InstockType.Purchase); //找到当前对应来源单据编号的集合数据 - var current_erp_details = erp_list.Where(x => x.FBillNo == item).ToList(); + var current_erp_details = erp_list.Where(x => x.FBillNo == item.FBillNo).ToList(); //给到dto的实体明细中 dto.Details = _mapper.Map>(current_erp_details); add_entitys.Add(dto); @@ -256,15 +258,16 @@ namespace WMS.Web.Domain.Services if (erp_list.Count != 0) { var add_entitys = new List(); - var current_billNos = erp_list.GroupBy(x => x.BillNo).Select(x => x.Key).ToList(); + var current_billNos = erp_list.GroupBy(x => new { x.BillNo,x.CreateTime }).Select(x => new {x.Key.BillNo,x.Key.CreateTime }).ToList(); foreach (var item in current_billNos) { var dto = new InStockTask(); - dto.SourceBillNo = item; + dto.SourceBillNo = item.BillNo; + dto.CreateTime = item.CreateTime; dto.Create(InstockType.Miscellaneous); //找到当前对应来源单据编号的集合数据 - var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList(); + var current_erp_details = erp_list.Where(x => x.BillNo == item.BillNo).ToList(); //给到dto的实体明细中 dto.Details = _mapper.Map>(current_erp_details); add_entitys.Add(dto);