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

[성현모] tra 날짜 오류 수정, tra recovery 온도그래프, 버전셀렉트, ok avg 기능 추가

Browse Source
This commit is contained in:
SHM
2026-01-21 15:29:06 +09:00
parent 1abf8c5536
commit 312a7a942f
18 changed files with 142238 additions and 149047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/DataManager/DMTestSummary.cs
View File

@ -1,4 +1,7 @@
using System;
using DataBaseConnection.Control;
using DevExpress.Pdf.Native.BouncyCastle.Ocsp;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
@ -6,16 +9,12 @@ using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SystemX.Common.Util;
using SystemX.Product.ALIS.Interface;
using SystemX.Product.CP.TRA;
using SystemX.Product.TRA.UIControl;
using static SystemX.Product.TRA.DataManager.DMOverview;
using static SystemX.Product.CP.TRA.Commons;
using DataBaseConnection.Control;
using Newtonsoft.Json;
using SystemX.Common.Util;
using static SystemX.Product.TRA.DataManager.DMOverview;
using CPXV2Log = SystemX.Net.Platform.SystemX.Net.XEFCore.DBContext.CPXV2Log;
namespace SystemX.Product.TRA.DataManager
@ -24,13 +23,13 @@ namespace SystemX.Product.TRA.DataManager
{
public enum eColHideListLog
{
No,
No,
//TestID
}
public enum eColTestLog
{
No,
No,
//TestID,
StepID,
MeasVal,
@ -107,14 +106,14 @@ namespace SystemX.Product.TRA.DataManager
TestSummarySelectView = eSelectDataView.DataDocumentViewC1;
ShortTermDBConn = getDBController.GetShortTermConn1();
LongTermDBConn = getDBController.GetLongTermConn1().First().Value;
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().First().Value;
LongTermDBConn = getDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtStart.Year.ToString())).First().Value;
}
}
@ -262,26 +261,26 @@ namespace SystemX.Product.TRA.DataManager
}
//PK 키 지정
DataColumn[] keys1 = new DataColumn[1];
keys1[0] = new DataColumn();
keys1[0] = dtResult.Columns["StepID"];
//DataColumn[] keys1 = new DataColumn[1];
//keys1[0] = new DataColumn();
//keys1[0] = dtResult.Columns["StepID"];
dtResult.PrimaryKey = keys1;
//dtResult.PrimaryKey = keys1;
return dtResult;
return dtHistVersionTL;
}
public DataTable RefineStepVersion(DataTable dtTestlist, SelectedDataCollection data)
{
var DuplicatedSteps = dtTestlist.AsEnumerable().GroupBy(x => x[eColTestlist.StepID.ToString()]).
Select(x => new { StepID = x.Key, Count = x.Count() }).Where(x => x.Count > 1);
foreach(var value in DuplicatedSteps)
foreach (var value in DuplicatedSteps)
{
List<DataRow> vdtRow = dtTestlist.AsEnumerable().Where(x => x[eColTestlist.StepID.ToString()].ToString() == value.StepID.ToString()).ToList();
DataRow vExcRow = vdtRow.Where(x => x[eColTestlist.StepVersion.ToString()].ToString() == data.StepVersion).FirstOrDefault();
if(vExcRow == null)
if (vExcRow == null)
{
int nMaxVer = vdtRow.Max(x => Convert.ToInt32(x[eColTestlist.StepVersion.ToString()]));
@ -310,7 +309,10 @@ namespace SystemX.Product.TRA.DataManager
}
catch (Exception e)
{
//start = DateTime
string requId = testReqID?.First();
int year = Convert.ToInt32(requId.Split(';', '@')[0].Substring(0, 4));
start = new DateTime(year, 1, 1);
}
//string strGetDataTime = testReqID?.First().Split(';')[0];
@ -329,17 +331,17 @@ namespace SystemX.Product.TRA.DataManager
{
ShortTermDBConn = GetDBController.GetShortTermConn1();
LongTermDBConn = GetDBController.GetLongTermConn1().First().Value;
LongTermDBConn = GetDBController.GetLongTermConn1().Where(x => x.Key.Contains(start.Year.ToString())).First().Value;
}
else if (TestSummarySelectView == eSelectDataView.DataDocumentViewC2)
{
ShortTermDBConn = GetDBController.GetShortTermConn2();
LongTermDBConn = GetDBController.GetLongTermConn2().First().Value;
LongTermDBConn = GetDBController.GetLongTermConn2().Where(x => x.Key.Contains(start.Year.ToString())).First().Value;
}
DataTable dtResult = new DataTable();
string strQuery = string.Empty;
string strQuery = string.Empty;
strQuery += $"SELECT * ";
strQuery += $"FROM {DMCommon.SummaryLogTable} AS X ";
@ -362,7 +364,7 @@ namespace SystemX.Product.TRA.DataManager
// strQuery += "OR ";
//}
strQuery += $";";
strQuery += $";";
if (DatabaseConnControl.ScanLongTermLog) SQLCmd = new SqlCommand(strQuery, LongTermDBConn);
else SQLCmd = new SqlCommand(strQuery, ShortTermDBConn);
@ -374,9 +376,9 @@ namespace SystemX.Product.TRA.DataManager
dtReader.Close();
List<CPXV2Log.Tables.HIST_TestResult> list = new List<CPXV2Log.Tables.HIST_TestResult>();
for (int i=0; i<dtResult.Rows.Count; i++)
for (int i = 0; i < dtResult.Rows.Count; i++)
{
list.AddRange(JsonConvert.DeserializeObject<List<CPXV2Log.Tables.HIST_TestResult>>(dtResult.Rows[i]["LogData"].ToString().GzipDecompress()));
list.AddRange(JsonConvert.DeserializeObject<List<CPXV2Log.Tables.HIST_TestResult>>(dtResult.Rows[i]["LogData"].ToString().GzipDecompress()));
}
/*
@ -390,7 +392,7 @@ namespace SystemX.Product.TRA.DataManager
strQuery += $"FROM [{DMCommon.SummaryLogTable}] AS X WITH(NOLOCK) ";
strQuery += $"INNER JOIN [{strTableTerm}] AS Y WITH(NOLOCK) ON (Y.AccessKey BETWEEN X.AccessStart AND X.AccessEnd) ";
*/
dtResult = list.GroupBy(x => x.StepID).Select(y => new
{
StepID = y.First().StepID,
@ -430,7 +432,7 @@ namespace SystemX.Product.TRA.DataManager
if (data == null)
return dtResult;
SQLCmd = new SqlCommand(strQuery, ShortTermDBConn);
SQLCmd.CommandTimeout = DMCommon.nDefaultScanTime;

43
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/MainForm.Designer.cs generated
View File

@ -103,6 +103,8 @@
this.repositoryItemProgressBar1 = new DevExpress.XtraEditors.Repository.RepositoryItemProgressBar();
this.barCheckItem1 = new DevExpress.XtraBars.BarCheckItem();
this.barCheckItemLongTerm = new DevExpress.XtraBars.BarCheckItem();
this.barEditItemStepVersion = new DevExpress.XtraBars.BarEditItem();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ribbonPageView = new DevExpress.XtraBars.Ribbon.RibbonPage();
this.ribbonPageGroupNavigation = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@ -152,6 +154,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemProgressBar1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateTimeOffsetEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
@ -215,10 +218,11 @@
this.barCheckItemFullScan,
this.barEditItemProgress,
this.barCheckItem1,
this.barCheckItemLongTerm});
this.barCheckItemLongTerm,
this.barEditItemStepVersion});
this.ribbonControl.Location = new System.Drawing.Point(0, 0);
this.ribbonControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ribbonControl.MaxItemId = 92;
this.ribbonControl.MaxItemId = 93;
this.ribbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always;
this.ribbonControl.Name = "ribbonControl";
this.ribbonControl.OptionsMenuMinWidth = 440;
@ -245,10 +249,11 @@
this.repositoryItemCheckEdit1,
this.repositoryItemTextEdit7,
this.repositoryItemCheckEdit2,
this.repositoryItemProgressBar1});
this.repositoryItemProgressBar1,
this.repositoryItemButtonEdit1});
this.ribbonControl.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013;
this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
this.ribbonControl.Size = new System.Drawing.Size(1485, 237);
this.ribbonControl.Size = new System.Drawing.Size(1485, 160);
this.ribbonControl.StatusBar = this.ribbonStatusBar;
this.ribbonControl.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@ -752,6 +757,22 @@
this.barCheckItemLongTerm.Name = "barCheckItemLongTerm";
this.barCheckItemLongTerm.CheckedChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.barCheckItemLongTerm_CheckedChanged);
//
// barEditItemStepVersion
//
this.barEditItemStepVersion.Caption = "Step Version : ";
this.barEditItemStepVersion.Edit = this.repositoryItemButtonEdit1;
this.barEditItemStepVersion.EditWidth = 160;
this.barEditItemStepVersion.Id = 92;
this.barEditItemStepVersion.Name = "barEditItemStepVersion";
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
//
// ribbonPageView
//
this.ribbonPageView.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
@ -792,6 +813,7 @@
this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemParentInfo);
this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemDTBegin);
this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemDTEnd);
this.ribbonPageGroup2.ItemLinks.Add(this.barEditItemStepVersion);
this.ribbonPageGroup2.Name = "ribbonPageGroup2";
this.ribbonPageGroup2.Text = "Selected Data Collection";
//
@ -907,11 +929,11 @@
// ribbonStatusBar
//
this.ribbonStatusBar.ItemLinks.Add(this.barStaticItem1);
this.ribbonStatusBar.Location = new System.Drawing.Point(0, 747);
this.ribbonStatusBar.Location = new System.Drawing.Point(0, 759);
this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ribbonStatusBar.Name = "ribbonStatusBar";
this.ribbonStatusBar.Ribbon = this.ribbonControl;
this.ribbonStatusBar.Size = new System.Drawing.Size(1485, 36);
this.ribbonStatusBar.Size = new System.Drawing.Size(1485, 24);
//
// dockManager
//
@ -934,9 +956,9 @@
this.hideContainerLeft.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
this.hideContainerLeft.Controls.Add(this.dockPanel);
this.hideContainerLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.hideContainerLeft.Location = new System.Drawing.Point(0, 237);
this.hideContainerLeft.Location = new System.Drawing.Point(0, 160);
this.hideContainerLeft.Name = "hideContainerLeft";
this.hideContainerLeft.Size = new System.Drawing.Size(32, 510);
this.hideContainerLeft.Size = new System.Drawing.Size(22, 599);
//
// dockPanel
//
@ -1022,7 +1044,7 @@
// MainForm
//
this.Appearance.Options.UseFont = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Zoom;
this.BackgroundImageStore = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImageStore")));
@ -1060,6 +1082,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemProgressBar1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateTimeOffsetEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
@ -1165,5 +1188,7 @@
private System.Windows.Forms.Timer timerProc;
private DevExpress.XtraBars.BarCheckItem barCheckItem1;
private DevExpress.XtraBars.BarCheckItem barCheckItemLongTerm;
private DevExpress.XtraBars.BarEditItem barEditItemStepVersion;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}

23
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/MainForm.cs
View File

@ -1074,6 +1074,7 @@ namespace SystemX.Product.CP.TRA
private void MainForm_Load(object sender, EventArgs e)
{
barEditItemStepVersion.EditValue = string.Empty;
SetDBConn();
}
@ -1318,6 +1319,7 @@ namespace SystemX.Product.CP.TRA
SelectAccordianElement(view.ViewID);
view.ViewData(eCurrentView, SelectedDetailData);
barEditItemStepVersion.EditValue = $"{SelectedDetailData.StepVersion}";
view.OnDetailSelect -= SetDetailTestDataView;
view.OnDetailSelect += SetDetailTestDataView;
@ -1339,7 +1341,7 @@ namespace SystemX.Product.CP.TRA
{
view = new UcTRADetailTestResult();
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
view.SetSQLConnection(eCurrentView, this, dtStart);
string strSetViewID = string.Empty;
@ -1381,7 +1383,7 @@ namespace SystemX.Product.CP.TRA
{
view = new UcTRAStepTrend();
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
view.SetSQLConnection(eCurrentView, this, dtStart);
string strSetViewID = string.Empty;
@ -1438,7 +1440,7 @@ namespace SystemX.Product.CP.TRA
view = new UcTRASummaryTestResult();
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
view.SetSQLConnection(eCurrentView, this, dtStart);
string strSetViewID = string.Empty;
@ -1469,7 +1471,14 @@ namespace SystemX.Product.CP.TRA
view.OnStepSelect += SetTestTrendDataView;
if (baseView.ContentsType == eContents.TestHistory)
view.ViewData(SelectedDetailData, (baseView as UcTRATestHistHost).DataResult);
{
if (Int32.TryParse(barEditItemStepVersion.EditValue.ToString(), out var value))
{
view.ViewData(SelectedDetailData, (baseView as UcTRATestHistHost).DataResult, value);
}
else
view.ViewData(SelectedDetailData, (baseView as UcTRATestHistHost).DataResult);
}
});
}
@ -1574,7 +1583,7 @@ namespace SystemX.Product.CP.TRA
view = new UcTRATestNgHist(this, bVisibleOption, barToggleSwitchItemOverviewMerge.Checked);
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
view.SetSQLConnection(eCurrentView, this, dtStart);
string strSetViewID = string.Empty;
@ -1632,7 +1641,7 @@ namespace SystemX.Product.CP.TRA
{
view = new UcTRAStepTrend();
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
view.SetSQLConnection(eCurrentView, this, dtStart);
string strSetViewID = string.Empty;
@ -2007,7 +2016,7 @@ namespace SystemX.Product.CP.TRA
SelectAccordianElement(view.ViewID);
DateTime dtStart = DateTime.Parse(barEditItemHostHistStart.EditValue.ToString());
DateTime dtStart = DateTime.Parse(barEditItemDateStart.EditValue.ToString());
DateTime dtEnd = DateTime.Parse(barEditItemHostHistEnd.EditValue.ToString());
dtEnd = dtEnd.AddHours(23.99999);

290849
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/MainForm.resx
View File

File diff suppressed because it is too large Load Diff

22
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/Properties/licenses.licx
View File

@ -1,10 +1,12 @@
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v20.2.UI, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v22.1.UI, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

11
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/Properties/licenses.licx.bak
View File

@ -1,7 +1,10 @@
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v20.2.UI, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

4
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/Subs/ConnectForm.resx
View File

@ -1784,8 +1784,8 @@
rEH4H6xB+B+sQf//rEH//6xB
</value>
</data>
<assembly alias="DevExpress.Data.v20.2" name="DevExpress.Data.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="ConnectForm.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<assembly alias="DevExpress.Data.v22.1" name="DevExpress.Data.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="ConnectForm.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi42
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

55
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/SystemX.Product.CP.TRA.csproj
View File

@ -58,35 +58,36 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.BonusSkins.v20.2" />
<Reference Include="DevExpress.Charts.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.Desktop.v20.2" />
<Reference Include="DevExpress.Data.v20.2" />
<Reference Include="DevExpress.DataAccess.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.DataVisualization.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Reference Include="DevExpress.BonusSkins.v22.1" />
<Reference Include="DevExpress.Charts.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.Desktop.v22.1" />
<Reference Include="DevExpress.Drawing.v22.1" />
<Reference Include="DevExpress.Data.v22.1" />
<Reference Include="DevExpress.DataAccess.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.DataVisualization.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\DevExpress.DataVisualization.v20.2.Core.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Docs.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Images.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Pdf.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.RichEdit.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Spreadsheet.v20.2.Core, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v20.2" />
<Reference Include="DevExpress.Sparkline.v20.2.Core" />
<Reference Include="DevExpress.Utils.v20.2.UI, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraBars.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraCharts.v20.2.UI, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v20.2.Wizard, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v20.2" />
<Reference Include="DevExpress.Printing.v20.2.Core" />
<Reference Include="DevExpress.XtraGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraRichEdit.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraVerticalGrid.v20.2, Version=20.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Docs.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Images.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Pdf.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.RichEdit.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Spreadsheet.v22.1.Core, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v22.1" />
<Reference Include="DevExpress.Sparkline.v22.1.Core" />
<Reference Include="DevExpress.Utils.v22.1.UI, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraBars.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraCharts.v22.1.UI, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v22.1.Wizard, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v22.1" />
<Reference Include="DevExpress.Printing.v22.1.Core" />
<Reference Include="DevExpress.XtraGrid.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraRichEdit.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraVerticalGrid.v22.1, Version=22.1.12.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="log4net">
<HintPath>.\log4net.dll</HintPath>
</Reference>

4
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/SystemX.Product.CP.TRA.csproj.bak
View File

@ -165,6 +165,7 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@ -211,6 +212,7 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
@ -234,6 +236,8 @@
<Reference Include="SystemX.XEFCore">
<HintPath>..\..\Output.SystemX\SystemX.XEFCore.dll</HintPath>
</Reference>
<Reference Include="UIAutomationClient" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="ChildControl.cs">

24
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/UIControl/UcTRAStepTrend.cs
View File

@ -296,19 +296,25 @@ namespace SystemX.Product.TRA.UIControl
if (Int64.TryParse(dtRowTestlistSpec[2].ToString(), out outValue))
{
CPXV2Log.Tables.HIST_TestResult row = list.Where(x => x.StepID == outValue)?.First();
if(row == null)
if (row == null)
{
continue;
}
if (string.IsNullOrEmpty(row.MeasValStr) == true)
if (dtRowTestlistSpec.ItemArray[9].ToString() == "TEMPCELSIUS")
{
row.MeasVal = Convert.ToDecimal($"{row.Message.Split('_')[1]}");
row.MeasValStr = $"{row.Message.Split('_')[1]}";
row.Message = string.Empty;
}
else if (string.IsNullOrEmpty(row.MeasValStr) == true)
{
if (//!string.IsNullOrEmpty(row.MeasValStr) ||
//!string.IsNullOrEmpty(row.Message) ||
//!string.IsNullOrEmpty(row.Message) ||
((row.MeasVal == 0) ||
string.Compare(row.Result, "NONE") == 0))
continue;
}
continue;
}
//string strValue = drLog[DMTestHistory.eColList.No.ToString()].ToString();
try
@ -383,7 +389,7 @@ namespace SystemX.Product.TRA.UIControl
}
}
return dtFinal;
}
@ -422,7 +428,7 @@ namespace SystemX.Product.TRA.UIControl
chartControlMain.CrosshairOptions.CrosshairLabelBackColor = Color.White;
chartControlMain.CrosshairOptions.ValueLineColor = Color.Black;
chartControlMain.CrosshairOptions.GroupHeaderTextOptions.TextColor = Color.Blue;
int nSrsIdxValue = AddSeries("Value", ScaleType.Qualitative, ScaleType.Numerical, Color.Red);
int nSrsIdxMin = AddSeries("Lower Limit", ScaleType.Qualitative, ScaleType.Numerical, Color.Blue);
int nSrsIdxMax = AddSeries("Upper Limit", ScaleType.Qualitative, ScaleType.Numerical, Color.Blue);
@ -559,7 +565,7 @@ namespace SystemX.Product.TRA.UIControl
{
string strDim = dtRowTestlist[DMTestDetail.eColTestlist.Dim.ToString()].ToString();
if (NoChartDispSpec.Contains(strDim))
if (data.MO != "TEMPCELSIUS" && NoChartDispSpec.Contains(strDim))
return null;
bool bIsGlobal = (Convert.ToInt32(dtRowTestlist[DMTestDetail.eColTestlist.IsGlobal.ToString()])) > 0 ? true : false;
@ -608,7 +614,7 @@ namespace SystemX.Product.TRA.UIControl
elemUnit.Result = strResult == "NG" || strResult == "ERROR" ? eResultType.NG : strResult == "OK" ? eResultType.OK : eResultType.NONE;
if (bOKDataOnly && elemUnit.Result != eResultType.OK)
if (bOKDataOnly && data.MO != "TEMPCELSIUS" && elemUnit.Result != eResultType.OK)
continue;
resultUnit.DataElements.Add(elemUnit);

75
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/UIControl/UcTRASummaryTestResult.cs
View File

@ -1,6 +1,7 @@
using DevExpress.Utils;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraPrinting;
using DevExpress.XtraVerticalGrid;
using DevExpress.XtraVerticalGrid.Rows;
using System;
@ -57,7 +58,7 @@ namespace SystemX.Product.TRA.UIControl
delegate void evtDBQueryFinished();
event evtDBQueryFinished evtDBFin;
public delegate void evtStepTrendViewHandler(TestTrendDataCollection data);
public event evtStepTrendViewHandler OnStepSelect;
@ -84,9 +85,9 @@ namespace SystemX.Product.TRA.UIControl
DBController = getDBController;
DataManager = new DMTestSummary(SelectView, DBController, dtStart);
}
}
public void ViewData(SelectedDataCollection data, DataTable DataList)
public void ViewData(SelectedDataCollection data, DataTable DataList, int stepVersion = -1)
{
if (data == null)
return;
@ -109,7 +110,7 @@ namespace SystemX.Product.TRA.UIControl
try
{
ShowProperties(data);
data.StepVersion = stepVersion.ToString();
SelectedData = data;
DTTestLogList = DataList;
@ -122,7 +123,12 @@ namespace SystemX.Product.TRA.UIControl
string strGetStepVersion = dr[eColList.StepVersion.ToString()].ToString();
int nCurStepVersion = int.MinValue;
if (int.TryParse(strGetStepVersion, out nCurStepVersion) == false)
if (stepVersion > -1)
{
nGetStepVersion = stepVersion;
ShowProperties(data);
}
else if (int.TryParse(strGetStepVersion, out nCurStepVersion) == false)
{
bOptionNewStepVersionBase = true;
@ -149,12 +155,12 @@ namespace SystemX.Product.TRA.UIControl
DTLastestTestlistSrc = DataManager.SearchTestlist(data, nGetStepVersion, bOptionNewStepVersionBase);
DTTestSummary = GetSummaryData(data, DataList);
ShowDetailData();
ShowDetailData();
}
catch (Exception ex)
{
MessageBox.Show($"Searching Failure - {ex.Message}", "Test Trend - Error");
}
}
}
void CloseWaitingForm()
@ -166,12 +172,12 @@ namespace SystemX.Product.TRA.UIControl
{
DataTable dtSummary = new DataTable();
List<Int64> vnpHistSummaryNo = (from drTest in DataList.AsEnumerable()
where drTest[eColList.ParentNo.ToString()].ToString() != "-"
let npValue = Convert.ToInt64(drTest[eColList.No.ToString()])
select npValue).ToList();
where drTest[eColList.ParentNo.ToString()].ToString() != "-"
let npValue = Convert.ToInt64(drTest[eColList.No.ToString()])
select npValue).ToList();
dtSummary = DataManager.SearchTestSummary(data.TestRequestID, vnpHistSummaryNo);
evtDBFin();
return dtSummary;
@ -184,13 +190,13 @@ namespace SystemX.Product.TRA.UIControl
DataTable dtFinal = new DataTable();
foreach(string strCol in Enum.GetNames(typeof(eColDataTable)))
foreach (string strCol in Enum.GetNames(typeof(eColDataTable)))
{
Type typCol = typeof(string);
if (strCol == eColDataTable.StepNo.ToString())
typCol = typeof(int);
else if (strCol == eColDataTable.Duration.ToString()
else if (strCol == eColDataTable.Duration.ToString()
|| strCol == eColDataTable.Total.ToString()
|| strCol == eColDataTable.OK.ToString()
|| strCol == eColDataTable.NG.ToString())
@ -266,7 +272,7 @@ namespace SystemX.Product.TRA.UIControl
}
DataRow drDisp = dtFinal.NewRow();
drDisp[eColDataTable.StepNo.ToString()] = Convert.ToInt32(Convert.ToInt32(drLog[eColTestSummary.StepID.ToString()]));
if (drTL != null)
@ -277,14 +283,14 @@ namespace SystemX.Product.TRA.UIControl
drDisp[eColDataTable.Function.ToString()] = drTL[eColTestlist.UseFunction.ToString()].ToString();
bool bIsGlobal = (Convert.ToInt32(drTL[eColTestlist.IsGlobal.ToString()])) > 0 ? true : false;
if(bIsGlobal == true)
if (bIsGlobal == true)
{
}
drDisp[eColDataTable.Min.ToString()] = bIsGlobal ? "Global Var" : drTL[eColTestlist.SpecMin.ToString()].ToString();
drDisp[eColDataTable.Max.ToString()] = bIsGlobal ? "Global Var" : drTL[eColTestlist.SpecMax.ToString()].ToString();
}
}
var strMeasVal = drLog[eColTestSummary.Average.ToString()];
int nOK = Convert.ToInt32(drLog[eColTestSummary.OK.ToString()]);
int nNOK = Convert.ToInt32(drLog[eColTestSummary.NG.ToString()]);
@ -337,7 +343,7 @@ namespace SystemX.Product.TRA.UIControl
gridViewMain.ActiveFilterString = GridViewGetActiveFilterText;
}
void ShowProperties(SelectedDataCollection data)
{
vGridControlInfo.Rows.Clear();
@ -357,7 +363,7 @@ namespace SystemX.Product.TRA.UIControl
}
OnSizeChanged(vGridControlInfo);
}
void OnSizeChanged(VGridControl grid)
@ -404,5 +410,36 @@ namespace SystemX.Product.TRA.UIControl
OnStepSelect(dataSend);
}
}
public override void ExportData()
{
FolderBrowserDialog dlg = new FolderBrowserDialog();
if (dlg.ShowDialog() == DialogResult.OK)
{
string strFileName = CreateExportFileName();
string strExpPath = dlg.SelectedPath + "\\" + strFileName;
XlsxExportOptionsEx option = new XlsxExportOptionsEx();
string strFile = strExpPath + ".xlsx";
option.ShowGridLines = true;
option.ExportType = DevExpress.Export.ExportType.WYSIWYG;
option.ExportMode = XlsxExportMode.SingleFile;
option.SheetName = "Test Summary";
gridControlMain.ExportToXlsx(strFile, option);
}
}
public string CreateExportFileName()
{
string strFileName = $"{this.ContentsType.ToString()}_{SelectedData.ProductNo}_{SelectedData.TestCode}_{SelectedData.StationName}";
strFileName += $"_{SelectedData.StartTime.ToString("yyyyMMddHHmmss")}-{SelectedData.EndTime.ToString("yyyyMMddHHmmss")}";
return strFileName;
}
}
}

22
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/UIControl/UcTRATestHistHost.Designer.cs generated
View File

@ -39,6 +39,8 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.labelControlOKTestTime = new DevExpress.XtraEditors.LabelControl();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
((System.ComponentModel.ISupportInitialize)(this.gridControlMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridViewMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@ -122,6 +124,8 @@
//
// groupControl1
//
this.groupControl1.Controls.Add(this.labelControlOKTestTime);
this.groupControl1.Controls.Add(this.labelControl4);
this.groupControl1.Controls.Add(this.labelControlTestTime);
this.groupControl1.Controls.Add(this.labelControl3);
this.groupControl1.Controls.Add(this.labelControlTestResult);
@ -199,6 +203,22 @@
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
//
// labelControlOKTestTime
//
this.labelControlOKTestTime.Location = new System.Drawing.Point(894, 29);
this.labelControlOKTestTime.Name = "labelControlOKTestTime";
this.labelControlOKTestTime.Size = new System.Drawing.Size(4, 14);
this.labelControlOKTestTime.TabIndex = 7;
this.labelControlOKTestTime.Text = "-";
//
// labelControl4
//
this.labelControl4.Location = new System.Drawing.Point(800, 29);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(88, 14);
this.labelControl4.TabIndex = 6;
this.labelControl4.Text = "OK Test Time : ";
//
// UcTRATestHistHost
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@ -234,5 +254,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.LabelControl labelControlTestTime;
private DevExpress.XtraEditors.LabelControl labelControlOKTestTime;
private DevExpress.XtraEditors.LabelControl labelControl4;
}
}

46
CPXV2 TRA JSON Recovery/SystemX.Product.CP.TRA/UIControl/UcTRATestHistHost.cs
View File

@ -148,19 +148,28 @@ namespace SystemX.Product.TRA.UIControl
where drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "NG"
select drData).Count();
List<int> vnTestTime = (from drData in dtResult.AsEnumerable()
where drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "OK"
|| drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "NG"
let nTime = Convert.ToInt32(drData[DMTestHistory.eColList.Duration.ToString()].ToString())
select nTime).ToList();
where drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "OK"
|| drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "NG"
let nTime = Convert.ToInt32(drData[DMTestHistory.eColList.Duration.ToString()].ToString())
select nTime).ToList();
double dRatio = (((double)(nOKTestCount * 100)) / (nOKTestCount + nNGTestCount));
labelControlTestResult.Text = $"{nOKTestCount + nNGTestCount} (OK: {nOKTestCount}/NG: {nNGTestCount}) - Ratio: {dRatio.ToString(".##")}%";
labelControlTestTime.Text = vnTestTime.Count > 0 ?
$"Average = {(vnTestTime.Average()/1000).ToString(".##")}s, Min = {(((double)vnTestTime.Min()) / 1000).ToString(".##")}s, Max = {(((double)vnTestTime.Max()) / 1000).ToString(".##")}s" :
//total
labelControlTestTime.Text = vnTestTime.Count > 0 ?
$"Average = {(vnTestTime.Average() / 1000).ToString(".##")}s, Min = {(((double)vnTestTime.Min()) / 1000).ToString(".##")}s, Max = {(((double)vnTestTime.Max()) / 1000).ToString(".##")}s" :
$"Average = -, Min = -, Max = -";
//ok
List<int> vnOKTestTime = (from drData in dtResult.AsEnumerable()
where drData[DMTestHistory.eColList.TestResult.ToString()].ToString() == "OK"
let nTime = Convert.ToInt32(drData[DMTestHistory.eColList.Duration.ToString()].ToString())
select nTime).ToList();
labelControlOKTestTime.Text = vnOKTestTime.Count > 0 ?
$"Average = {(vnOKTestTime.Average() / 1000).ToString(".##")}s, Min = {(((double)vnOKTestTime.Min()) / 1000).ToString(".##")}s, Max = {(((double)vnOKTestTime.Max()) / 1000).ToString(".##")}s" :
$"Average = -, Min = -, Max = -";
}
void DisplayResultTable(DataTable dtResult)
@ -209,7 +218,7 @@ namespace SystemX.Product.TRA.UIControl
gridViewMain.EndUpdate();
gridViewMain.ActiveFilterString = GridViewGetActiveFilterText;
}
public DetailTestDataCollection GetSearchInfo(DataRow dtRow)
@ -218,8 +227,8 @@ namespace SystemX.Product.TRA.UIControl
//drDetail.TestID = dtRow[DMTestHistory.eColList.TestID.ToString()].ToString();
drDetail.No = Convert.ToInt64(dtRow[DMTestHistory.eColList.No.ToString()]);
drDetail.StartTime = DateTime.Parse(dtRow[DMTestHistory.eColList.TestDateTime.ToString()].ToString());
drDetail.Duration = Convert.ToInt64(dtRow[DMTestHistory.eColList.Duration.ToString()]);
drDetail.StartTime = DateTime.Parse(dtRow[DMTestHistory.eColList.TestDateTime.ToString()].ToString());
drDetail.Duration = Convert.ToInt64(dtRow[DMTestHistory.eColList.Duration.ToString()]);
drDetail.StationName = dtRow[DMTestHistory.eColList.StationName.ToString()].ToString();
drDetail.HostID = dtRow[DMTestHistory.eColList.Host.ToString()].ToString();
drDetail.SectionID = dtRow[DMTestHistory.eColList.Section.ToString()].ToString();
@ -259,7 +268,7 @@ namespace SystemX.Product.TRA.UIControl
private void SetDetailDataView()
{
if(nCurrentRowSelected != int.MaxValue)
if (nCurrentRowSelected != int.MaxValue)
{
var dvRow = gridViewMain.GetRow(nCurrentRowSelected);
DataRow dtRow = (dvRow as DataRowView).Row;
@ -308,7 +317,7 @@ namespace SystemX.Product.TRA.UIControl
List<DetailTestDataCollection> vDetailData = new List<DetailTestDataCollection>();
GridView view = gridViewMain as GridView;
for(int i=0; i<view.RowCount; i++)
for (int i = 0; i < view.RowCount; i++)
{
DataRow dtRow = (view.GetRow(i) as DataRowView).Row;
DetailTestDataCollection dtContent = GetSearchInfo(dtRow);
@ -318,7 +327,7 @@ namespace SystemX.Product.TRA.UIControl
return vDetailData;
}
public string CreateExportFileName()
{
string strFileName = $"{this.ContentsType.ToString()}_{SelectedData.ProductNo}_{SelectedData.TestCode}_{SelectedData.StationName}";
@ -345,7 +354,7 @@ namespace SystemX.Product.TRA.UIControl
option.ExportMode = XlsxExportMode.SingleFile;
option.SheetName = "Test History";
gridControlMain.ExportToXlsx(strFile, option);
}
}
@ -363,7 +372,7 @@ namespace SystemX.Product.TRA.UIControl
{
e.Merge = false;
e.Handled = true;
}
}
}
private void gridViewMain_RowStyle(object sender, RowStyleEventArgs e)
@ -376,5 +385,10 @@ namespace SystemX.Product.TRA.UIControl
e.HighPriority = true;
}
}
private void groupControl1_Paint(object sender, PaintEventArgs e)
{
}
}
}