diff --git a/Adaptation/FileHandlers/TIBCO/Transport/Input.cs b/Adaptation/FileHandlers/TIBCO/Transport/Input.cs index aaa42c6..8a4cf88 100644 --- a/Adaptation/FileHandlers/TIBCO/Transport/Input.cs +++ b/Adaptation/FileHandlers/TIBCO/Transport/Input.cs @@ -3,11 +3,12 @@ namespace Adaptation.FileHandlers.TIBCO.Transport; public class Input { - public string Sequence { get; set; } public string Area { get; set; } public string EquipmentType { get; set; } - public string MesEntity { get; set; } public string MID { get; set; } + public string MeanThickness { get; set; } + public string MesEntity { get; set; } public string Recipe { get; set; } + public string Sequence { get; set; } } \ No newline at end of file diff --git a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs index b7b5cc7..71d93ff 100644 --- a/Adaptation/FileHandlers/TIBCO/Transport/Job.cs +++ b/Adaptation/FileHandlers/TIBCO/Transport/Job.cs @@ -61,7 +61,7 @@ public class Job Equipment = input.MesEntity; JobName = DateTime.Ticks.ToString(); if (!IsValid(rds)) - (basicType, epiLayer, lotName, psn, reactor) = Get(lsl2SQLConnectionString, psn, rds, reactor); + (basicType, epiLayer, lotName, psn, reactor) = Get(lsl2SQLConnectionString, input, psn, rds, reactor); else { basicType = hyphen; @@ -222,7 +222,7 @@ public class Job return result; } - private static (string, string, string, string, string) Get(string lsl2SQLConnectionString, string psn, int rds, string reactor) + private static (string, string, string, string, string) Get(string lsl2SQLConnectionString, Input input, string psn, int rds, string reactor) { string lotName; string epiLayer; @@ -267,13 +267,19 @@ public class Job epiLayer = "1"; else { - epiLayer = runs[zero].EpiLayer; - foreach (Run run in runs) + if (string.IsNullOrEmpty(input.MeanThickness) || !double.TryParse(input.MeanThickness, out double meanThickness)) + epiLayer = runs[zero].EpiLayer; + else { - if (run.EpiThickMin is null || run.EpiThickMax is null) - continue; - if (run.EpiResMin is null || run.EpiResMax is null) - continue; + epiLayer = hyphen; + foreach (Run run in runs) + { + if (run.EpiThickMin is null || run.EpiThickMax is null) + continue; + if (meanThickness < run.EpiThickMin || meanThickness > run.EpiThickMax) + continue; + epiLayer = run.EpiLayer; + } } } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 4e6e7e9..1b3b627 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.43.0.0")] -[assembly: AssemblyFileVersion("2.43.0.0")] +[assembly: AssemblyVersion("2.43.4.0")] +[assembly: AssemblyFileVersion("2.43.4.0")]