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

v2.47.1 - Ready to test IQS query

Browse Source
This commit is contained in:
Mike Phares
2022-12-02 14:09:43 -07:00
parent 2467f32867
commit 6e09172646
55 changed files with 1198 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Adaptation/FileHandlers/Stratus/Description.cs
View File

@ -192,7 +192,7 @@ public class Description : IDescription, Shared.Properties.IDescription
ProcessJobID = logistics.ProcessJobID,
MID = logistics.MID,
//
Date = processData.Date,
Date = processData.Date.ToString(GetDateFormat()),
Employee = processData.Employee,
Lot = processData.Batch,
PSN = processData.PSN,
@ -274,4 +274,6 @@ public class Description : IDescription, Shared.Properties.IDescription
return result;
}
internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";
}

4
Adaptation/FileHandlers/Stratus/FileRead.cs
View File

@ -14,6 +14,7 @@ namespace Adaptation.FileHandlers.Stratus;
public class FileRead : Shared.FileRead, IFileRead
{
private long? _TickOffset;
private readonly string _OriginalDataBioRad;
public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
@ -99,7 +100,8 @@ public class FileRead : Shared.FileRead, IFileRead
private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
{
Tuple<string, Test[], JsonElement[], List<FileInfo>> results = new(string.Empty, null, null, new List<FileInfo>());
_Logistics = new Logistics(this, reportFullPath, useSplitForMID: true);
_TickOffset ??= new FileInfo(reportFullPath).LastWriteTime.Ticks - dateTime.Ticks;
_Logistics = new Logistics(this, _TickOffset.Value, reportFullPath, useSplitForMID: true);
SetFileParameterLotIDToLogisticsMID();
if (_Logistics.FileInfo.Length < _MinFileLength)
results.Item4.Add(_Logistics.FileInfo);

11
Adaptation/FileHandlers/Stratus/ProcessData.cs
View File

@ -23,7 +23,7 @@ public partial class ProcessData : IProcessData
public string MesEntity { get; set; }
public string Batch { get; set; }
public string Cassette { get; set; }
public string Date { get; set; }
public DateTime Date { get; set; }
public string FilePath { get; set; }
public string Layer { get; set; }
public string MeanThickness { get; set; }
@ -376,12 +376,12 @@ public partial class ProcessData : IProcessData
{
string psn;
string rds;
string date;
string text;
string zone;
string batch;
string layer;
string title;
DateTime date;
string reactor;
string cassette;
string employee;
@ -411,8 +411,8 @@ public partial class ProcessData : IProcessData
string dateTimeText = GetToEOL();
if (dateTimeText.EndsWith("."))
dateTimeText = dateTimeText.Remove(dateTimeText.Length - 1, 1);
DateTime dateTime = GetDateTime(logistics, dateTimeText);
date = dateTime.ToString();
date = GetDateTime(logistics, dateTimeText);
;
Descriptor descriptor = GetDescriptor(text);
cassette = descriptor.Cassette;
psn = descriptor.PSN;
@ -573,8 +573,7 @@ public partial class ProcessData : IProcessData
{
detail.HeaderUniqueId = UniqueId;
detail.UniqueId = string.Concat(UniqueId, detail.UniqueId);
if (detail.Points is null)
detail.Points = new List<Point>();
detail.Points ??= new List<Point>();
foreach (Point bioRadDetail in detail.Points)
{
bioRadDetail.HeaderUniqueId = detail.HeaderUniqueId;