From 0fb0da2dafc6c42e7453aa8bcf4e6050be23ddb0 Mon Sep 17 00:00:00 2001 From: SHM Date: Thu, 4 Sep 2025 11:10:34 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=84=B1=ED=98=84=EB=AA=A8]=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Web.Tra/Components/Module/TraGrid.razor | 3 +++ .../WebClient/Web.Tra/Components/Pages/TRA.razor | 12 ++++++------ Projects/WebClient/Web.Tra/Model/IDataModel.cs | 12 +++++++++++- Projects/WebClient/Web.Tra/Model/TestHistory.cs | 3 +++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor index a22cc33..cbcd6a0 100644 --- a/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor +++ b/Projects/WebClient/Web.Tra/Components/Module/TraGrid.razor @@ -99,6 +99,9 @@ if (args.Column.Property == null) return; + if ((args.Column.Property.ToLower().Equals("testdate") || args.Column.Property.ToLower().Equals("host")) == false) + return; + int index = DataList.ToList().FindIndex(x => x.Equals(args.Data)); //testdate 컬럼일때 날짜 병합 diff --git a/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor b/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor index 30f24d1..fc44cf7 100644 --- a/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor +++ b/Projects/WebClient/Web.Tra/Components/Pages/TRA.razor @@ -199,13 +199,13 @@ private void OnSelectRowOverview(IDataModel overview) { - // SelectionStationName = $"{overview.StationName} ({overview.Host},{overview.Section})"; - // SelectionProductNO = $"{overview.ProductNo} ({overview.TestCode})"; - // SelectionParentInfo = $"{overview.ParentNo} ({overview.FileVersion},{overview.FileCode})"; + SelectionStationName = $"{overview.StationName} ({overview.Host},{overview.Section})"; + SelectionProductNO = $"{overview.ProductNo} ({overview.TestCode})"; + SelectionParentInfo = $"{overview.ParentNo} ({overview.FileVersion},{overview.FileCode})"; - // SelectionSearchBegin = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FirstTestTime}"; - // SelectionSearchEnd = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FinalTestTime}"; - // SelectionStepVersion = $"{overview.StepVersion}"; + SelectionSearchBegin = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FirstTestTime}"; + SelectionSearchEnd = $"{overview.TestDate?.ToString("yyyy-MM-dd")} {overview.FinalTestTime}"; + SelectionStepVersion = $"{overview.StepVersion}"; } private void OnClickDetailOverviewContextMenu() diff --git a/Projects/WebClient/Web.Tra/Model/IDataModel.cs b/Projects/WebClient/Web.Tra/Model/IDataModel.cs index a815274..6902f4a 100644 --- a/Projects/WebClient/Web.Tra/Model/IDataModel.cs +++ b/Projects/WebClient/Web.Tra/Model/IDataModel.cs @@ -3,7 +3,17 @@ public interface IDataModel { public DateTime? TestDate { get; set; } - public string ModelName { get; set; } + public string StationName { get; set; } public string Host { get; set; } + public string Section { get; set; } + public string ModelName { get; set; } + public string ProductNo { get; set; } + public string TestCode { get; set; } + public string ParentNo { get; set; } + public string FileCode { get; set; } + public string FileVersion { get; set; } + public int? StepVersion { get; set; } + public string FirstTestTime { get; set; } + public string FinalTestTime { get; set; } } } diff --git a/Projects/WebClient/Web.Tra/Model/TestHistory.cs b/Projects/WebClient/Web.Tra/Model/TestHistory.cs index fea7625..b8dd00c 100644 --- a/Projects/WebClient/Web.Tra/Model/TestHistory.cs +++ b/Projects/WebClient/Web.Tra/Model/TestHistory.cs @@ -21,5 +21,8 @@ public string Duration { get; set; } public string TestResult { get; set; } public string TestlistReqID { get; set; } + + public string FirstTestTime { get; set; } + public string FinalTestTime { get; set; } } }