diff --git a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs index 4b7344f..e333c9c 100644 --- a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs +++ b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs @@ -89,22 +89,29 @@ namespace SystemX.Product.TRA.DataManager public DataTable dtHistVersionTL; + eSelectDataView TestSummarySelectView { get; set; } + + IDataBaseController GetDBController; + public int nCurrentTLMaxStepVersion { get; set; } //public DataTable this[int i] => dtEachVersionTL[i]; public DMTestSummary(eSelectDataView SelectView, IDataBaseController getDBController, DateTime dtStart) { + GetDBController = getDBController; DBConn = getDBController.GetMainConn(); if (SelectView == eSelectDataView.DataDocumentViewC1) { + TestSummarySelectView = eSelectDataView.DataDocumentViewC1; ShortTermDBConn = getDBController.GetShortTermConn1(); LongTermDBConn = getDBController.GetLongTermConn1().Where(x=>x.Key.Contains(dtStart.Year.ToString())).First().Value; } else if (SelectView == eSelectDataView.DataDocumentViewC2) { + TestSummarySelectView = eSelectDataView.DataDocumentViewC2; ShortTermDBConn = getDBController.GetShortTermConn2(); LongTermDBConn = getDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtStart.Year.ToString())).First().Value; @@ -292,6 +299,21 @@ namespace SystemX.Product.TRA.DataManager public DataTable SearchTestSummary(string[] testReqID, List vnpSummaryNo) { + DateTime start = Convert.ToDateTime(testReqID?.First().Split(';')[0]); + + if (TestSummarySelectView == eSelectDataView.DataDocumentViewC1) + { + ShortTermDBConn = GetDBController.GetShortTermConn1(); + + LongTermDBConn = GetDBController.GetLongTermConn1().Where(x => x.Key.Contains(start.Year.ToString())).First().Value; + } + else if (TestSummarySelectView == eSelectDataView.DataDocumentViewC2) + { + ShortTermDBConn = GetDBController.GetShortTermConn2(); + + LongTermDBConn = GetDBController.GetLongTermConn2().Where(x => x.Key.Contains(start.Year.ToString())).First().Value; + } + DataTable dtResult = new DataTable(); string strQuery = string.Empty;