Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

质检导出修复

Browse Source
This commit is contained in:
赵正易
2024-05-13 08:35:51 +08:00
parent 385bd9ca7b
commit 0212f86b92
1 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ZR.Service/mes/qc/QCStatisticsService.cs
View File

@@ -246,20 +246,65 @@ namespace ZR.Service.mes.qc
public List<QcQualityStatisticsFirstDto> DoSecondExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public List<QcQualityStatisticsFirstDto> DoSecondExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
List<QcQualityStatisticsAgain> list = GetQualityStatisticsTable_again(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; List<QcQualityStatisticsAgain> list = GetQualityStatisticsTable_again(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); List<QcQualityStatisticsFirstDto> 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; return newList;
} }
public List<QcQualityStatisticsFirstDto> DoThirdExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public List<QcQualityStatisticsFirstDto> DoThirdExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
List<QcQualityStatisticsFinal> list = GetQualityStatisticsTable_final(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; List<QcQualityStatisticsFinal> list = GetQualityStatisticsTable_final(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); List<QcQualityStatisticsFirstDto> 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; return newList;
} }
public List<QcQualityStatisticsFirstDto> DoTotalExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public List<QcQualityStatisticsFirstDto> DoTotalExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
List<QcQualityStatisticsTotal> list = GetQualityStatisticsTable_total(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1; List<QcQualityStatisticsTotal> list = GetQualityStatisticsTable_total(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList(); List<QcQualityStatisticsFirstDto> 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; return newList;
} }
} }