diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index e7cf131..db872b2 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -121,13 +121,12 @@ public class FileRead : Shared.FileRead, IFileRead StringBuilder results = new(); char del = '\t'; SECS.Description x = descriptions[0]; - _ = results.Append(x.MesEntity).Append(del) + _ = results.Append(x.PSN).Append(del) .Append(x.Reactor).Append(del) + .Append(logistics.MesEntity).Append(del) .Append(x.RDS).Append(del) .Append(x.Recipe).Append(del) - .Append(x.PSN).Append(del) - .Append(x.Employee).Append(del) - .Append(logistics.MesEntity).Append(del); + .Append(x.Employee).Append(del); return results.ToString(); } diff --git a/Adaptation/FileHandlers/SECS/Description.cs b/Adaptation/FileHandlers/SECS/Description.cs index 2828465..5caa8ac 100644 --- a/Adaptation/FileHandlers/SECS/Description.cs +++ b/Adaptation/FileHandlers/SECS/Description.cs @@ -14,23 +14,24 @@ public class Description : IDescription, Shared.Properties.IDescription public int Count { get; set; } public int Index { get; set; } + [JsonPropertyName("CURRENT_RECIPE_NAME")] + public string PSN { get; set; } // Part + + [JsonPropertyName("LotID")] + public string Reactor { get; set; } // Process + public string MesEntity { get; set; } - public string Date { get; set; } - - [JsonPropertyName("PATTERNTYPE")] - public string Employee { get; set; } // Item descriptor - - [JsonPropertyName("SAMPLETYPE")] - public string PSN { get; set; } // Item descriptor [JsonPropertyName("ID")] public string RDS { get; set; } // Lot - [JsonPropertyName("LotID")] - public string Reactor { get; set; } // Process + [JsonPropertyName("PATTERNTYPE")] + public string Recipe { get; set; } // Item descriptor - [JsonPropertyName("CURRENT_RECIPE_NAME")] - public string Recipe { get; set; } // Part + [JsonPropertyName("SAMPLETYPE")] + public string Employee { get; set; } // Item descriptor + + public string Date { get; set; } string IDescription.GetEventDescription() => "File Has been read and parsed";