diff --git a/Adaptation/FileHandlers/OpenInsight/FileRead.cs b/Adaptation/FileHandlers/OpenInsight/FileRead.cs index fa1b4e3..7af8c4e 100644 --- a/Adaptation/FileHandlers/OpenInsight/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsight/FileRead.cs @@ -171,19 +171,17 @@ public class FileRead : Shared.FileRead, IFileRead Append(x.GradeRadialGradient).Append(del). Append(x.RsMean).Append(del). Append(x.RsStdDev).Append(del). - Append(x.RsRadialGradient).Append(del); + Append(x.RsRadialGradient); foreach (pcl.Description description in descriptions) - { - _ = results.Append(description.Index + 1).Append(del). - Append(description.NAvg).Append(del). - Append(description.Nsl).Append(del). - Append(description.Vd).Append(del). - Append(description.FlatZ).Append(del). - Append(description.RhoAvg).Append(del). - Append(description.Rhosl).Append(del). - Append(description.Phase).Append(del). - Append(description.Grade).Append(del); - }; + _ = results.Append(del).Append(description.Index + 1). + Append(del).Append(description.NAvg). + Append(del).Append(description.Nsl). + Append(del).Append(description.Vd). + Append(del).Append(description.FlatZ). + Append(del).Append(description.RhoAvg). + Append(del).Append(description.Rhosl). + Append(del).Append(description.Phase). + Append(del).Append(description.Grade); return results.ToString(); } diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs index 49affd8..e1ef985 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs @@ -6,6 +6,7 @@ using Adaptation.Shared.Methods; using Adaptation.Shared.Metrology; using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Text.Json; @@ -16,6 +17,7 @@ public class FileRead : Shared.FileRead, IFileRead { private readonly string _OpenInsightMetrologyViewerAPI; + private readonly string _OpenInsightMetrologyViewerFileShare; public FileRead(ISMTP smtp, Dictionary fileParameter, string cellInstanceName, int? connectionCount, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList modelObjectParameters, string equipmentDictionaryName, Dictionary> dummyRuns, Dictionary> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) : base(new Description(), false, smtp, fileParameter, cellInstanceName, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null) @@ -29,6 +31,7 @@ public class FileRead : Shared.FileRead, IFileRead throw new Exception(cellInstanceConnectionName); if (!_IsDuplicator) throw new Exception(cellInstanceConnectionName); + _OpenInsightMetrologyViewerFileShare = @"\\messv02ecc1.ec.local\EC_Metrology_Si\MetrologyAttachments\MercuryProbeRunHeader_"; _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI"); } @@ -107,11 +110,15 @@ public class FileRead : Shared.FileRead, IFileRead return results; } -#pragma warning disable IDE0060 - private void SendData(DateTime dateTime, List descriptions) -#pragma warning restore IDE0060 + private void SendData(string reportFullPath, DateTime dateTime, List descriptions) { - WSRequest wsRequest = new(this, _Logistics, descriptions); + int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday); + string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}", _Logistics.Sequence.ToString()); + if (!Directory.Exists(directory)) + _ = Directory.CreateDirectory(directory); + string fullPath = Path.Combine(directory, Path.GetFileName(reportFullPath)); + File.Copy(reportFullPath, fullPath); + WSRequest wsRequest = new(this, _Logistics, descriptions, fullPath); (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest); if (!wsResults.Success) throw new Exception(wsResults.ToString()); @@ -134,7 +141,7 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = pcl.ProcessData.GetDescriptions(jsonElements); Test[] tests = (from l in descriptions select (Test)l.Test).ToArray(); if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) - SendData(dateTime, descriptions); + SendData(reportFullPath, dateTime, descriptions); results = new Tuple>(pdsf.Item1, tests, jsonElements, new List()); return results; } diff --git a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs index 5e4eca2..5c917bc 100644 --- a/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs +++ b/Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs @@ -70,13 +70,15 @@ public class WSRequest public string WaferSize { get; set; } public string Zone { get; set; } public List Details { get; protected set; } + public string ProcessDataStandardFormat { get; set; } [Obsolete("For json")] public WSRequest() { } #pragma warning disable IDE0060 - internal WSRequest(IFileRead fileRead, Logistics logistics, List descriptions) + internal WSRequest(IFileRead fileRead, Logistics logistics, List descriptions, string processDataStandardFormat = null) #pragma warning restore IDE0060 { + ProcessDataStandardFormat = processDataStandardFormat; Id = string.Empty; Details = new List(); CellName = logistics.MesEntity; @@ -185,7 +187,7 @@ public class WSRequest { if (string.IsNullOrEmpty(json)) { - WSRequest wsRequest = new(fileRead, logistics, descriptions); + WSRequest wsRequest = new(fileRead, logistics, descriptions, string.Empty); (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, wsRequest); if (!wsResults.Success) throw new Exception(wsResults.ToString()); diff --git a/Adaptation/MET08RESIHGCV.Tests.csproj b/Adaptation/MET08RESIHGCV.Tests.csproj index 2750c22..2d4afa0 100644 --- a/Adaptation/MET08RESIHGCV.Tests.csproj +++ b/Adaptation/MET08RESIHGCV.Tests.csproj @@ -43,7 +43,6 @@ NU1701 NU1701 -