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

Removed CDE2 and CDE2

Browse Source
This commit is contained in:
Mike Phares
2025-01-13 12:30:42 -07:00
parent dd342eb236
commit 2b21f30797
15 changed files with 25 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

18
Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs
View File

@ -41,18 +41,18 @@ public class WSRequest
public string Temp { get; set; }
public string UniqueId { get; set; }
public string Zone { get; set; }
public List<txt.Detail> Details { get; protected set; }
public List<RsM.Detail> Details { get; protected set; }
[Obsolete("For json")] public WSRequest() { }
#pragma warning disable IDE0060
internal WSRequest(IFileRead fileRead, Logistics logistics, List<txt.Description> descriptions, string processDataStandardFormat = null)
internal WSRequest(IFileRead fileRead, Logistics logistics, List<RsM.Description> descriptions, string processDataStandardFormat = null)
#pragma warning restore IDE0060
{
Id = -1;
CellName = logistics.MesEntity;
Details = new List<txt.Detail>();
if (descriptions[0] is not txt.Description x)
Details = new List<RsM.Detail>();
if (descriptions[0] is not RsM.Description x)
throw new Exception();
//Header
{
@ -80,10 +80,10 @@ public class WSRequest
UniqueId = x.UniqueId;
Zone = x.Zone;
}
txt.Detail detail;
foreach (txt.Description description in descriptions)
RsM.Detail detail;
foreach (RsM.Description description in descriptions)
{
detail = new txt.Detail
detail = new RsM.Detail
{
HeaderUniqueId = description.HeaderUniqueId,
Merit = description.Merit,
@ -102,7 +102,7 @@ public class WSRequest
FilePath = onlyWSRequest;
}
internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, string json, List<txt.Description> descriptions)
internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, string json, List<RsM.Description> descriptions)
{
long result;
if (string.IsNullOrEmpty(json))
@ -119,7 +119,7 @@ public class WSRequest
}
#pragma warning disable IDE0060
internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, List<txt.Description> descriptions, string matchDirectory, string subGroupId, long headerId, string headerIdDirectory)
internal static void PostOpenInsightMetrologyViewerAttachments(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, List<RsM.Description> descriptions, string matchDirectory, string subGroupId, long headerId, string headerIdDirectory)
#pragma warning restore IDE0060
{
string[] txtFiles = Directory.GetFiles(matchDirectory, "*.txt", SearchOption.TopDirectoryOnly);