From 5c50078c04b17d169d28805ca6ba7229b69acb3b Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 10 Oct 2022 11:49:40 -0700 Subject: [PATCH] Added Work Order and change to left join --- Archive/Repositories/RdsMaxRepo.cs | 6 +++--- Shared/DataModels/RDS/Max.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Archive/Repositories/RdsMaxRepo.cs b/Archive/Repositories/RdsMaxRepo.cs index 3052f7c..3bcd7c8 100644 --- a/Archive/Repositories/RdsMaxRepo.cs +++ b/Archive/Repositories/RdsMaxRepo.cs @@ -77,7 +77,7 @@ public class RdsMaxRepo : IRdsMaxRepo Append(" ) as qc "). Append(" inner join lsl2sql.dbo.react_run rr "). Append(" on qc.rds_no = rr.rds_no "). - Append(" inner join [lsl2sql].[dbo].[rds_test] rt "). + Append(" left join [lsl2sql].[dbo].[rds_test] rt "). Append(" on rr.rds_no = rt.rds_no "). Append(" and rr.ps_no = rt.ps_no "). Append(" left join [lsl2sql].[dbo].[clean_insp] ci "). @@ -254,7 +254,7 @@ public class RdsMaxRepo : IRdsMaxRepo List thick = new(); List centerRes = new(); StringBuilder stringBuilder = new(); - _ = stringBuilder.Append($"Reactor\tReactorType\tRDS\tPSN\tName\tSpecType\tRes\tThick\tCenter Res\tScan"); + _ = stringBuilder.Append($"Reactor\tReactorType\tWO\tRDS\tPSN\tName\tSpecType\tRes\tThick\tCenter Res\tScan"); row = stringBuilder.ToString().Split('\t'); results.Add(row); Dictionary> reactorToRecords = GetReactorToRecords(collection); @@ -268,7 +268,7 @@ public class RdsMaxRepo : IRdsMaxRepo _ = stringBuilder.Clear(); foreach (Max max in reactorToRecord.Value) { - _ = stringBuilder.Append($"R{max.Reactor}\t{max.ReactorType}\t{max.RdsNo}\t{max.PsNo}\t{max.RecipeName}\t{max.SpecType}\t"); + _ = stringBuilder.Append($"R{max.Reactor}\t{max.ReactorType}\t{max.WoNo}\t{max.RdsNo}\t{max.PsNo}\t{max.RecipeName}\t{max.SpecType}\t"); break; } layerZoneCollection = GetLayerZoneCollection(layerCollection, comboCollection, zoneCollection, reactorToRecord.Value); diff --git a/Shared/DataModels/RDS/Max.cs b/Shared/DataModels/RDS/Max.cs index 6df70d9..8dc2d1d 100644 --- a/Shared/DataModels/RDS/Max.cs +++ b/Shared/DataModels/RDS/Max.cs @@ -9,6 +9,7 @@ public record Max( [property: JsonPropertyName("zone")] string Zone, [property: JsonPropertyName("load_lock_side")] string LoadLockSide, [property: JsonPropertyName("rds_no")] int RdsNo, + [property: JsonPropertyName("wo_no")] int WoNo, [property: JsonPropertyName("ps_no")] string PsNo, [property: JsonPropertyName("recipe_name")] string RecipeName, [property: JsonPropertyName("recipe_no")] int RecipeNo,