SW/CPXV2
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] Trend 클릭 오류 수정, DB 커넥션 정보 오류 수정

Browse Source
This commit is contained in:
SHM
2024-06-26 13:57:41 +09:00
parent 42a5919ca7
commit 983914afc5
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CPXV2 TRA V2/SystemX.Product.CP.TRA/DB/DataBaseConn.cs
View File

@ -27,6 +27,8 @@ namespace DataBaseConnection.Control
public static string MainCatalogName = "CPXV2";
public static string ShortTermCatalogName = "";
public static List<string> LongTermCatalogName = new List<string> { "" } ;
public static string SelectLongTermCatalogNameCon1 = string.Empty;
public static string SelectLongTermCatalogNameCon2 = string.Empty;
public static bool ScanLongTermLog = false;
public const string Address = "192.168.0.43";
@ -251,14 +253,14 @@ namespace DataBaseConnection.Control
if (list?.Count > 0)
{
//short term
var shortTermCatalogName = list.Find(x => x.ToLower().Contains("short"));
var shortTermCatalogName = list.Find(x => x.ToLower().Contains("short") && x.ToLower().Contains("json"));
if (string.IsNullOrEmpty(shortTermCatalogName) == false)
{
ShortTermCatalogName = shortTermCatalogName;
}
//long term
var longTermCatalogName = list.FindAll(x => x.ToLower().Contains("long"));
var longTermCatalogName = list.FindAll(x => x.ToLower().Contains("long") && x.ToLower().Contains("json"));
if (longTermCatalogName?.Count() > 0)
{
LongTermCatalogName?.Clear();

3
CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMOverview.cs
View File

@ -121,7 +121,7 @@ namespace SystemX.Product.TRA.DataManager
{
LongTermDBConn = GetDBController.GetLongTermConn1().FirstOrDefault().Value;
}
DatabaseConnControl.SelectLongTermCatalogNameCon1 = LongTermDBConn.Database;
}
else if (SelectView == eSelectDataView.DataDocumentViewC2)
{
@ -130,6 +130,7 @@ namespace SystemX.Product.TRA.DataManager
{
LongTermDBConn = GetDBController.GetLongTermConn2().FirstOrDefault().Value;
}
DatabaseConnControl.SelectLongTermCatalogNameCon2 = LongTermDBConn.Database;
}
DataTable dtResult = new DataTable();

10
CPXV2 TRA V2/SystemX.Product.CP.TRA/MainForm.cs
View File

@ -545,7 +545,7 @@ namespace SystemX.Product.CP.TRA
strAddress += " , " + nConnPortDT1.ToString();
strConnDT1Label = "Data Database [1][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.LongTermCatalogName + "]";
strConnDT1Label = "Data Database [1][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.SelectLongTermCatalogNameCon1 + "]";
barStaticItemConn.Caption += (" " + strConnDT1Label);
@ -555,7 +555,7 @@ namespace SystemX.Product.CP.TRA
strAddress += " , " + nConnPortDT2.ToString();
strConnDT2Label = "Data Database [2][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.LongTermCatalogName + "]";
strConnDT2Label = "Data Database [2][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.SelectLongTermCatalogNameCon2 + "]";
//barStaticItemConn.Caption += " Data Database [2][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.LongTermCatalogName + "]";
@ -583,6 +583,12 @@ namespace SystemX.Product.CP.TRA
OverviewSearchOption oso = await view.ViewData(eCurrentView, dtStart, dtEnd, OvOp, bMergeByPartNumber, false, strTestQuery);
string strAddress = (strConnIPAddressTL == string.Empty ? "LocalHost" : strConnIPAddressTL);
strConnDT1Label = "Data Database [1][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.SelectLongTermCatalogNameCon1 + "]";
strConnDT2Label = "Data Database [2][" + strAddress + "] [" + DatabaseConnControl.ShortTermCatalogName + "] [" + DatabaseConnControl.SelectLongTermCatalogNameCon2 + "]";
ChangeDatabaseView(eCurrentView);
if (oso.ViewOptionPanel)
{
if (barToggleSwitchItemOverviewMerge.Checked == !oso.DisplayByStation)

2
CPXV2 TRA V2/SystemX.Product.CP.TRA/UIControl/UcTRAStepTrend.cs
View File

@ -783,7 +783,7 @@ namespace SystemX.Product.TRA.UIControl
if (nRowHndl < 0)
return;
string strGetId = DTTestLogList.Rows[e.RowHandle][23].ToString();
string strGetId = DTTestLogList.Rows[e.RowHandle][18].ToString();
BaseRow br = vGridControlInfo.Rows.GetRowByFieldName("TestRequestID");
vGridControlInfo.SetCellValue(br, 0, strGetId);