diff --git a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMStepTrend.cs b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMStepTrend.cs index 4b2714b..a61cd2e 100644 --- a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMStepTrend.cs +++ b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMStepTrend.cs @@ -24,19 +24,25 @@ namespace SystemX.Product.TRA.DataManager private SqlCommand SQLCmd { get; set; } + eSelectDataView TrendSelectView { get; set; } + + IDataBaseController GetDBController; public DMStepTrend(eSelectDataView SelectView, IDataBaseController getDBController, DateTime dtStart) { + GetDBController = getDBController; DBConn = getDBController.GetMainConn(); if (SelectView == eSelectDataView.DataDocumentViewC1) { + TrendSelectView = eSelectDataView.DataDocumentViewC1; ShortTermDBConn = getDBController.GetShortTermConn1(); LongTermDBConn = getDBController.GetLongTermConn1().Where(x=>x.Key.Contains(dtStart.Year.ToString())).First().Value; } else if (SelectView == eSelectDataView.DataDocumentViewC2) { + TrendSelectView = eSelectDataView.DataDocumentViewC2; ShortTermDBConn = getDBController.GetShortTermConn2(); LongTermDBConn = getDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtStart.Year.ToString())).First().Value; @@ -45,6 +51,21 @@ namespace SystemX.Product.TRA.DataManager public DataTable SearchTestResult(DateTime dtTest) { + if (TrendSelectView == eSelectDataView.DataDocumentViewC1) + { + TrendSelectView = eSelectDataView.DataDocumentViewC1; + ShortTermDBConn = GetDBController.GetShortTermConn1(); + + LongTermDBConn = GetDBController.GetLongTermConn1().Where(x => x.Key.Contains(dtTest.Year.ToString())).First().Value; + } + else if (TrendSelectView == eSelectDataView.DataDocumentViewC2) + { + TrendSelectView = eSelectDataView.DataDocumentViewC2; + ShortTermDBConn = GetDBController.GetShortTermConn2(); + + LongTermDBConn = GetDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtTest.Year.ToString())).First().Value; + } + DataTable dtResult = new DataTable(); string strQuery = string.Empty; //string strLongTerm = "HIST_TestResult";