phares3757/mesareportingservices
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed EPP TW "Prod" scrap from Reactor Yielded Outs calculation and removed Customer scrap from Yield calculation

Browse Source
This commit is contained in:
Daniel Wathen
2023-01-23 14:08:50 -07:00
parent a67cc55abe
commit 35dfd6a23c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs
View File

@ -81,7 +81,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
" DATE_OUT," + " DATE_OUT," +
" SUM(CUST_TOT_REJ) AS TOT_REJ_CUST," + " SUM(CUST_TOT_REJ) AS TOT_REJ_CUST," +
" SUM(LSL_TOT_REJ) AS TOT_REJ_MANU," + " SUM(LSL_TOT_REJ) AS TOT_REJ_MANU," +
" SUM(TW_PROD) AS TW_PROD " + " SUM(CASE WHEN REACTOR_TYPE <> 'EPP' THEN TW_PROD ELSE 0 END) AS TW_PROD " +
"FROM RDS " + "FROM RDS " +
"WHERE SEQ IN (" + rdsNumbers + ") " + "WHERE SEQ IN (" + rdsNumbers + ") " +
"GROUP BY DATE_OUT " + "GROUP BY DATE_OUT " +
@ -533,7 +533,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
string query = "SELECT SUM(WFRS_OUT) AS OUTS, " + string query = "SELECT SUM(WFRS_OUT) AS OUTS, " +
" SUM(CUST_TOT_REJ) AS CUST, " + " SUM(CUST_TOT_REJ) AS CUST, " +
" SUM(LSL_TOT_REJ) AS MANU, " + " SUM(LSL_TOT_REJ) AS MANU, " +
" SUM(TW_PROD) AS PROD " + " SUM(CASE WHEN REACTOR_TYPE <> 'EPP' THEN TW_PROD ELSE 0 END) AS PROD " +
" FROM RDS " + " FROM RDS " +
" WHERE DATE_OUT >= @startDate " + " WHERE DATE_OUT >= @startDate " +
" AND DATE_OUT < @endDate"; " AND DATE_OUT < @endDate";

6
ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
View File

@ -183,7 +183,7 @@
{ {
if (i < numberOfDaysInWeek) if (i < numberOfDaysInWeek)
{ {
float yield = ((float)Model.OutsByDay[i].TotalWafers - (float)Model.ScrapByDay[i].TOT_REJ_WFRS) / (float)Model.OutsByDay[i].TotalWafers; float yield = ((float)Model.OutsByDay[i].TotalWafers - (float)Model.ScrapByDay[i].TOT_REJ_MANU) / (float)Model.OutsByDay[i].TotalWafers;
<td class="text-center">@(string.Format("{0:P2}", yield))</td> <td class="text-center">@(string.Format("{0:P2}", yield))</td>
@ -194,8 +194,8 @@
<td></td> <td></td>
} }
} }
<td class="text-center">@(string.Format("{0:P2}", (float)(totalWafersOut - totalCustomerScrap - totalManufacturingScrap) / (float)totalWafersOut))</td> <td class="text-center">@(string.Format("{0:P2}", (float)(totalWafersOut - totalManufacturingScrap) / (float)totalWafersOut))</td>
<td class="text-center">@string.Format("{0:P2}", (float)(Model.QTDOutsAndScrap.Outs - Model.QTDOutsAndScrap.ManufacturingScrap - Model.QTDOutsAndScrap.CustomerScrap) / (float)Model.QTDOutsAndScrap.Outs)</td> <td class="text-center">@string.Format("{0:P2}", (float)(Model.QTDOutsAndScrap.Outs - Model.QTDOutsAndScrap.ManufacturingScrap) / (float)Model.QTDOutsAndScrap.Outs)</td>
<td>After Scrap</td> <td>After Scrap</td>
</tr> </tr>
<tr> <tr>