MET08RESIMAPCDE - v2.43.4 - MethodBaseName

This commit is contained in:
2022-08-08 16:05:28 -07:00
parent 94b06b7de5
commit 1d7368c44e
69 changed files with 1763 additions and 356 deletions

View File

@ -107,7 +107,7 @@ public class FileRead : Shared.FileRead, IFileRead
return results;
}
private void SendData(DateTime dateTime, List<pcl.Description> descriptions)
private void SendData(DateTime dateTime, List<txt.Description> descriptions)
{
if (dateTime == DateTime.MinValue)
{ }
@ -131,7 +131,7 @@ public class FileRead : Shared.FileRead, IFileRead
_Logistics = new Logistics(reportFullPath, pdsf.Item1);
SetFileParameterLotIDToLogisticsMID();
JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(pdsf);
List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
SendData(dateTime, descriptions);

View File

@ -42,18 +42,18 @@ public class WSRequest
public string Temp { get; set; }
public string UniqueId { get; set; }
public string Zone { get; set; }
public List<pcl.Detail> Details { get; protected set; }
public List<txt.Detail> Details { get; protected set; }
[Obsolete("For json")] public WSRequest() { }
internal WSRequest(IFileRead fileRead, Logistics logistics, List<pcl.Description> descriptions)
internal WSRequest(IFileRead fileRead, Logistics logistics, List<txt.Description> descriptions)
{
Id = "-1";
if (fileRead is null)
{ }
CellName = logistics.MesEntity;
Details = new List<pcl.Detail>();
if (descriptions[0] is not pcl.Description x)
Details = new List<txt.Detail>();
if (descriptions[0] is not txt.Description x)
throw new Exception();
//Header
{
@ -81,10 +81,10 @@ public class WSRequest
UniqueId = x.UniqueId;
Zone = x.Zone;
}
pcl.Detail detail;
foreach (pcl.Description description in descriptions)
txt.Detail detail;
foreach (txt.Description description in descriptions)
{
detail = new pcl.Detail
detail = new txt.Detail
{
HeaderUniqueId = description.HeaderUniqueId,
Merit = description.Merit,
@ -104,7 +104,7 @@ public class WSRequest
FilePath = onlyWSRequest;
}
internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, string json, List<pcl.Description> descriptions, string matchDirectory)
internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, string json, List<txt.Description> descriptions, string matchDirectory)
{
if (dateTime == DateTime.MinValue)
{ }
@ -117,8 +117,8 @@ public class WSRequest
}
WS.Results metrologyWSRequest = JsonSerializer.Deserialize<WS.Results>(json);
long wsResultsHeaderID = metrologyWSRequest.HeaderID;
string[] pclFiles = Directory.GetFiles(matchDirectory, "*.pcl", SearchOption.TopDirectoryOnly);
if (pclFiles.Length != 1)
string[] txtFiles = Directory.GetFiles(matchDirectory, "*.txt", SearchOption.TopDirectoryOnly);
if (txtFiles.Length != 1)
throw new Exception($"Invalid source file count for <{wsResultsHeaderID}>!{Environment.NewLine}{json}");
List<string> pdfFiles = new();
pdfFiles.AddRange(Directory.GetFiles(matchDirectory, "*.pdf_old", SearchOption.TopDirectoryOnly));