diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs index 9b2f4ed1..93584228 100644 --- a/ZR.Service/mes/qc/QCStatisticsService.cs +++ b/ZR.Service/mes/qc/QCStatisticsService.cs @@ -246,20 +246,65 @@ namespace ZR.Service.mes.qc public List DoSecondExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) { List list = GetQualityStatisticsTable_again(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; - List newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); + List newList = list.Select(item => new QcQualityStatisticsFirstDto() + { + WorkorderId = item.WorkorderId, + FinishedPartNumber = item.FinishedPartNumber, + ProductDescription = product_description, + Color = item.Color, + RequireNumber = item.RequireNumber, + Team = item.Team, + QualifiedNumber = item.QualifiedNumber, + QualifiedRate = item.QualifiedRate ?? 0, + PaoguangTotal = item.PaoguangTotal ?? 0, + DamoTotal = item.DamoTotal ?? 0, + BaofeiTotal = item.BaofeiTotal ?? 0, + StartTime = item.StartTime, + EndTime = item.EndTime, + }).ToList(); return newList; } public List DoThirdExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) { List list = GetQualityStatisticsTable_final(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; - List newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); + List newList = list.Select(item => new QcQualityStatisticsFirstDto() + { + WorkorderId = item.WorkorderId, + FinishedPartNumber = item.FinishedPartNumber, + ProductDescription = product_description, + Color = item.Color, + RequireNumber = item.RequireNumber, + Team = item.Team, + QualifiedNumber = item.QualifiedNumber, + QualifiedRate = item.QualifiedRate ?? 0, + PaoguangTotal = item.PaoguangTotal ?? 0, + DamoTotal = item.DamoTotal ?? 0, + BaofeiTotal = item.BaofeiTotal ?? 0, + StartTime = item.StartTime, + EndTime = item.EndTime, + }).ToList(); return newList; } public List DoTotalExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) { List list = GetQualityStatisticsTable_total(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; - List newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); + List newList = list.Select(item => new QcQualityStatisticsFirstDto() + { + WorkorderId = item.WorkorderId, + FinishedPartNumber = item.FinishedPartNumber, + ProductDescription = product_description, + Color = item.Color, + RequireNumber = item.RequireNumber, + Team = item.Team, + QualifiedNumber = item.QualifiedNumber, + QualifiedRate = item.QualifiedRate ?? 0, + PaoguangTotal = item.PaoguangTotal ?? 0, + DamoTotal = item.DamoTotal ?? 0, + BaofeiTotal = item.BaofeiTotal ?? 0, + StartTime = item.StartTime, + EndTime = item.EndTime, + }).ToList(); return newList; } }