diff --git a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/App.config b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/App.config
index aee9adf..4bfa005 100644
--- a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/App.config
+++ b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/App.config
@@ -1,6 +1,6 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/DBService.cs b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/DBService.cs
index d53efd8..04c6b3e 100644
--- a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/DBService.cs
+++ b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/DBService.cs
@@ -89,9 +89,24 @@ namespace SystemX.Product.CP.TRA.Extract
try
{
// 2. 실행할 쿼리 작성 (JOIN 포함)
- string sql = $@"SELECT * FROM {config.SummaryTable} as Summary WITH(NOLOCK)
- JOIN {config.ResultTable} as Result WITH(NOLOCK) ON Summary.No = Result.No
- WHERE TestListFileNo = {tl.TestListFileNo} and StepVersion={tl.StepVersion}";
+ //string sql = $@"SELECT * FROM {config.SummaryTable} as Summary WITH(NOLOCK)
+ //JOIN {config.ResultTable} as Result WITH(NOLOCK) ON Summary.No = Result.No
+ //WHERE TestListFileNo = {tl.TestListFileNo} and StepVersion={tl.StepVersion}";
+
+ string sql = $@"SELECT
+ Summary.*,
+ Result.*,
+ TL.StepVersion AS Matched_StepVersion
+ FROM [{config.DataBase}].[dbo].[{config.SummaryTable}] AS Summary WITH(NOLOCK)
+ JOIN [{config.DataBase}].[dbo].[{config.ResultTable}] AS Result WITH(NOLOCK)
+ ON Summary.No = Result.No
+ OUTER APPLY (
+ SELECT TOP 1 *
+ FROM [CPXV2].[dbo].[VRFY_TestListFileRelease]
+ WHERE StepVersion <= Summary.StepVersion and TestListFileNo = {tl.TestListFileNo} and StepDesc = '{config.MO}'
+ ORDER BY StepVersion DESC
+ ) AS TL
+ WHERE Summary.TestListFileNo = {tl.TestListFileNo} and StepVersion=TL.StepVersion";
//test code
if(string.IsNullOrEmpty(config.TestCode) == false)
diff --git a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/SystemX.Product.CP.TRA.Extract.csproj b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/SystemX.Product.CP.TRA.Extract.csproj
index 1cf2c7c..699e143 100644
--- a/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/SystemX.Product.CP.TRA.Extract.csproj
+++ b/CPXV2 TRA JSON/SystemX.Product.CP.TRA.Extract/SystemX.Product.CP.TRA.Extract.csproj
@@ -8,10 +8,11 @@
Exe
SystemX.Product.CP.TRA.Extract
SystemX.Product.CP.TRA.Extract
- v4.8.1
+ v4.8
512
true
true
+
AnyCPU