diff --git a/Analysis/CjlrForm/FileSorter.cs b/Analysis/CjlrForm/FileSorter.cs
index 995e6bf..3ce8b10 100644
--- a/Analysis/CjlrForm/FileSorter.cs
+++ b/Analysis/CjlrForm/FileSorter.cs
@@ -119,6 +119,9 @@ namespace NSAnalysis
if (MatchCsvValue(file, matchStr, readRowIndex, readColIndex))
{
+ // 记录日志,匹配到
+ Trace($"匹配成功,准备移动文件: {file} -> {targetDir}");
+
string destFile = Path.Combine(targetDir, Path.GetFileName(file));
if (File.Exists(destFile))
{
@@ -334,7 +337,7 @@ namespace NSAnalysis
}
// 跳过前两行(如果有标题行或其他非数据行),理论应该有19列
- if (values.Length < 19)
+ if (values.Length < 22)
{
MyBase.TraceWriteLine("CSV行数据不完整,跳过该行:" + line);
continue; // 跳过不完整的行
@@ -365,10 +368,13 @@ namespace NSAnalysis
ToleranceName0 = values[12],
ToleranceLower0 = values[13],
ToleranceUpper0 = values[14],
- NominalValue = values[15],
- MeasureDate = DateTime.ParseExact(values[16], "yyyyMMdd", CultureInfo.InvariantCulture),
- MeasureTime = TimeSpan.ParseExact(values[17], "hhmmss", CultureInfo.InvariantCulture),
- SequenceNum = int.Parse(values[18])
+ ToleranceName1 = values[15],
+ ToleranceLower1 = values[16],
+ ToleranceUpper1 = values[17],
+ NominalValue = values[18],
+ MeasureDate = DateTime.ParseExact(values[19], "yyyyMMdd", CultureInfo.InvariantCulture),
+ MeasureTime = TimeSpan.ParseExact(values[20], "hhmmss", CultureInfo.InvariantCulture),
+ SequenceNum = int.Parse(values[21])
};
records.Add(record);
diff --git a/Analysis/DAL/CjlrDAL.cs b/Analysis/DAL/CjlrDAL.cs
index ef44258..1fe26c8 100644
--- a/Analysis/DAL/CjlrDAL.cs
+++ b/Analysis/DAL/CjlrDAL.cs
@@ -430,6 +430,9 @@ NULLIF(
ToleranceName0 = @ToleranceName0,
ToleranceLower0 = @ToleranceLower0,
ToleranceUpper0 = @ToleranceUpper0,
+ ToleranceName1 = @ToleranceName1,
+ ToleranceLower1 = @ToleranceLower1,
+ ToleranceUpper1 = @ToleranceUpper1,
NominalValue = @MeasPointNominal,
SequenceNum = @SeqNr,
CreatedAt = @CreatedAt
@@ -448,6 +451,9 @@ NULLIF(
new SqlParameter("@ToleranceName0", record.ToleranceName0 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower0", record.ToleranceLower0),
new SqlParameter("@ToleranceUpper0", record.ToleranceUpper0),
+ new SqlParameter("@ToleranceName1", record.ToleranceName1 ?? (object)DBNull.Value),
+ new SqlParameter("@ToleranceLower1", record.ToleranceLower1),
+ new SqlParameter("@ToleranceUpper1", record.ToleranceUpper1),
new SqlParameter("@MeasPointNominal", record.NominalValue),
new SqlParameter("@SeqNr", record.SequenceNum),
new SqlParameter("@CreatedAt", DateTime.Now),
@@ -463,12 +469,14 @@ NULLIF(
PointName, GroupName, ProductNum, Model, Station, Method,
Standard, DimensionName, DimensionValue, DimensionUnit,
IsManual, Classification, ToleranceName0,
- ToleranceLower0, ToleranceUpper0, NominalValue, MeasureDate, MeasureTime, SequenceNum,CreatedAt
+ ToleranceLower0, ToleranceUpper0,ToleranceName1,
+ ToleranceLower1, ToleranceUpper1, NominalValue, MeasureDate, MeasureTime, SequenceNum,CreatedAt
) VALUES (
@MeasPointName, @MeasGroupName, @ProdNum, @Model, @Station, @MeasMethod,
@TestStandard, @DimensionName, @DimensionValue, @DimensionUnit,
@DimensionManualOverride, @DimensionClassification, @ToleranceName0,
- @ToleranceLower0, @ToleranceUpper0,@MeasPointNominal, @Date, @Time, @SeqNr,@CreatedAt
+ @ToleranceLower0, @ToleranceUpper0,@ToleranceName1,
+ @ToleranceLower1, @ToleranceUpper1,@MeasPointNominal, @Date, @Time, @SeqNr,@CreatedAt
)";
SqlParameter[] insertParas = new SqlParameter[]
{
@@ -487,6 +495,9 @@ NULLIF(
new SqlParameter("@ToleranceName0", record.ToleranceName0 ?? (object)DBNull.Value),
new SqlParameter("@ToleranceLower0", record.ToleranceLower0),
new SqlParameter("@ToleranceUpper0", record.ToleranceUpper0),
+ new SqlParameter("@ToleranceName1", record.ToleranceName1 ?? (object)DBNull.Value),
+ new SqlParameter("@ToleranceLower1", record.ToleranceLower1),
+ new SqlParameter("@ToleranceUpper1", record.ToleranceUpper1),
new SqlParameter("@MeasPointNominal", record.NominalValue),
new SqlParameter("@Date", record.MeasureDate == DateTime.MinValue ? DateTime.Now : record.MeasureDate),
new SqlParameter("@Time", record.MeasureTime == TimeSpan.Zero ? DateTime.Now.TimeOfDay : record.MeasureTime),
diff --git a/Analysis/FormMain.designer.cs b/Analysis/FormMain.designer.cs
index 6865c8a..7fff5e1 100644
--- a/Analysis/FormMain.designer.cs
+++ b/Analysis/FormMain.designer.cs
@@ -32,22 +32,22 @@ namespace NSAnalysis
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
- Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem();
- Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem();
- Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem();
- Telerik.WinControls.UI.RadListDataItem radListDataItem8 = new Telerik.WinControls.UI.RadListDataItem();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
- System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
- System.Windows.Forms.DataVisualization.Charting.Title title2 = new System.Windows.Forms.DataVisualization.Charting.Title();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ Telerik.WinControls.UI.RadListDataItem radListDataItem1 = new Telerik.WinControls.UI.RadListDataItem();
+ Telerik.WinControls.UI.RadListDataItem radListDataItem2 = new Telerik.WinControls.UI.RadListDataItem();
+ Telerik.WinControls.UI.RadListDataItem radListDataItem3 = new Telerik.WinControls.UI.RadListDataItem();
+ Telerik.WinControls.UI.RadListDataItem radListDataItem4 = new Telerik.WinControls.UI.RadListDataItem();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
+ System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
this.label2 = new System.Windows.Forms.Label();
this.labTitle = new System.Windows.Forms.Label();
@@ -113,6 +113,16 @@ namespace NSAnalysis
this.radLabel1 = new Telerik.WinControls.UI.RadLabel();
this.radLabel11 = new Telerik.WinControls.UI.RadLabel();
this.dgvSelectMeasureData = new System.Windows.Forms.DataGridView();
+ this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Model = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dgvFPYResult = new System.Windows.Forms.DataGridView();
this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -128,16 +138,6 @@ namespace NSAnalysis
this.lpcSoftwareSetup = new UserControlClass.LabPictureControl();
this.lpcAboutSoftware = new UserControlClass.LabPictureControl();
this.tmSystem = new System.Windows.Forms.Timer(this.components);
- this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.Model = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.MeasureItemResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit();
this.radTitleBar1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radStatusStrip1)).BeginInit();
@@ -334,7 +334,7 @@ namespace NSAnalysis
this.RPV.ItemSizeMode = ((Telerik.WinControls.UI.PageViewItemSizeMode)((Telerik.WinControls.UI.PageViewItemSizeMode.EqualWidth | Telerik.WinControls.UI.PageViewItemSizeMode.EqualHeight)));
this.RPV.Location = new System.Drawing.Point(1, 38);
this.RPV.Name = "RPV";
- this.RPV.SelectedPage = this.rpvpAnalysis;
+ this.RPV.SelectedPage = this.rpvpSearch;
this.RPV.Size = new System.Drawing.Size(1543, 770);
this.RPV.TabIndex = 127;
this.RPV.ViewMode = Telerik.WinControls.UI.PageViewMode.NavigationView;
@@ -417,7 +417,7 @@ namespace NSAnalysis
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).HorizontalLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
- ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 分析主界面";
+ ((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).Text = " 查询界面";
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).FocusBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(135)))), ((int)(((byte)(161)))));
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.White;
((Telerik.WinControls.UI.NavigationViewHeaderElement)(this.RPV.GetChildAt(0).GetChildAt(2))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
@@ -660,14 +660,14 @@ namespace NSAnalysis
this.dgvMeasureContent.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvMeasureContent.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvMeasureContent.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle10.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvMeasureContent.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dgvMeasureContent.ColumnHeadersHeight = 38;
this.dgvMeasureContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.PointName,
@@ -685,20 +685,20 @@ namespace NSAnalysis
this.dgvMeasureContent.Name = "dgvMeasureContent";
this.dgvMeasureContent.ReadOnly = true;
this.dgvMeasureContent.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle11.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvMeasureContent.RowHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvMeasureContent.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
- dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle12.Font = new System.Drawing.Font("Segoe UI", 10F);
- dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 10F);
+ dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ this.dgvMeasureContent.RowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvMeasureContent.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Segoe UI", 10F);
this.dgvMeasureContent.RowTemplate.Height = 38;
this.dgvMeasureContent.Size = new System.Drawing.Size(1019, 561);
@@ -831,14 +831,14 @@ namespace NSAnalysis
this.rddlPageRecorderCount.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
this.rddlPageRecorderCount.Font = new System.Drawing.Font("Segoe UI", 12F);
this.rddlPageRecorderCount.ForeColor = System.Drawing.Color.White;
- radListDataItem5.Text = "20";
- radListDataItem6.Text = "50";
- radListDataItem7.Text = "100";
- radListDataItem8.Text = "200";
- this.rddlPageRecorderCount.Items.Add(radListDataItem5);
- this.rddlPageRecorderCount.Items.Add(radListDataItem6);
- this.rddlPageRecorderCount.Items.Add(radListDataItem7);
- this.rddlPageRecorderCount.Items.Add(radListDataItem8);
+ radListDataItem1.Text = "20";
+ radListDataItem2.Text = "50";
+ radListDataItem3.Text = "100";
+ radListDataItem4.Text = "200";
+ this.rddlPageRecorderCount.Items.Add(radListDataItem1);
+ this.rddlPageRecorderCount.Items.Add(radListDataItem2);
+ this.rddlPageRecorderCount.Items.Add(radListDataItem3);
+ this.rddlPageRecorderCount.Items.Add(radListDataItem4);
this.rddlPageRecorderCount.Location = new System.Drawing.Point(718, 9);
this.rddlPageRecorderCount.Name = "rddlPageRecorderCount";
//
@@ -1169,43 +1169,43 @@ namespace NSAnalysis
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.chartFPYLine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
- chartArea2.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
- chartArea2.AxisX.LineColor = System.Drawing.Color.White;
- chartArea2.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
- chartArea2.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
- chartArea2.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
- chartArea2.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
- chartArea2.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
- chartArea2.AxisX.TitleForeColor = System.Drawing.Color.White;
- chartArea2.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
- chartArea2.AxisY.LineColor = System.Drawing.Color.White;
- chartArea2.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
- chartArea2.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
- chartArea2.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
- chartArea2.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
- chartArea2.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
- chartArea2.AxisY.TitleForeColor = System.Drawing.Color.White;
- chartArea2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
- chartArea2.Name = "ChartArea1";
- this.chartFPYLine.ChartAreas.Add(chartArea2);
+ chartArea1.AxisX.LabelStyle.ForeColor = System.Drawing.Color.White;
+ chartArea1.AxisX.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisX.MajorGrid.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisX.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.NotSet;
+ chartArea1.AxisX.MajorTickMark.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisX.MinorGrid.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisX.MinorTickMark.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisX.TitleForeColor = System.Drawing.Color.White;
+ chartArea1.AxisY.LabelStyle.ForeColor = System.Drawing.Color.White;
+ chartArea1.AxisY.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisY.MajorGrid.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisY.MajorGrid.LineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Dash;
+ chartArea1.AxisY.MajorTickMark.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisY.MinorGrid.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisY.MinorTickMark.LineColor = System.Drawing.Color.White;
+ chartArea1.AxisY.TitleForeColor = System.Drawing.Color.White;
+ chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+ chartArea1.Name = "ChartArea1";
+ this.chartFPYLine.ChartAreas.Add(chartArea1);
this.chartFPYLine.Location = new System.Drawing.Point(1434, 29);
this.chartFPYLine.Name = "chartFPYLine";
- series2.BorderWidth = 3;
- series2.ChartArea = "ChartArea1";
- series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
- series2.Color = System.Drawing.Color.Lime;
- series2.MarkerSize = 9;
- series2.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
- series2.Name = "Series1";
- this.chartFPYLine.Series.Add(series2);
+ series1.BorderWidth = 3;
+ series1.ChartArea = "ChartArea1";
+ series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line;
+ series1.Color = System.Drawing.Color.Lime;
+ series1.MarkerSize = 9;
+ series1.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
+ series1.Name = "Series1";
+ this.chartFPYLine.Series.Add(series1);
this.chartFPYLine.Size = new System.Drawing.Size(49, 48);
this.chartFPYLine.TabIndex = 77;
this.chartFPYLine.Text = "chartFPY";
- title2.Font = new System.Drawing.Font("微软雅黑", 12F);
- title2.ForeColor = System.Drawing.Color.White;
- title2.Name = "Title1";
- title2.Text = "合格率";
- this.chartFPYLine.Titles.Add(title2);
+ title1.Font = new System.Drawing.Font("微软雅黑", 12F);
+ title1.ForeColor = System.Drawing.Color.White;
+ title1.Name = "Title1";
+ title1.Text = "合格率";
+ this.chartFPYLine.Titles.Add(title1);
this.chartFPYLine.Visible = false;
//
// rdtpStartTime
@@ -1445,14 +1445,14 @@ namespace NSAnalysis
this.dgvSelectMeasureData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvSelectMeasureData.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvSelectMeasureData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvSelectMeasureData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvSelectMeasureData.ColumnHeadersHeight = 37;
this.dgvSelectMeasureData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column2,
@@ -1471,25 +1471,104 @@ namespace NSAnalysis
this.dgvSelectMeasureData.Name = "dgvSelectMeasureData";
this.dgvSelectMeasureData.ReadOnly = true;
this.dgvSelectMeasureData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvSelectMeasureData.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dgvSelectMeasureData.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
- dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10F);
- dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10F);
+ dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ this.dgvSelectMeasureData.RowsDefaultCellStyle = dataGridViewCellStyle6;
this.dgvSelectMeasureData.RowTemplate.Height = 37;
this.dgvSelectMeasureData.Size = new System.Drawing.Size(1483, 566);
this.dgvSelectMeasureData.TabIndex = 174;
this.dgvSelectMeasureData.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvSelectMeasureData_RowStateChanged);
//
+ // Column2
+ //
+ this.Column2.DataPropertyName = "ProductNum";
+ this.Column2.HeaderText = "车身编号";
+ this.Column2.Name = "Column2";
+ this.Column2.ReadOnly = true;
+ this.Column2.Width = 170;
+ //
+ // Model
+ //
+ this.Model.DataPropertyName = "Model";
+ this.Model.HeaderText = "车型";
+ this.Model.Name = "Model";
+ this.Model.ReadOnly = true;
+ //
+ // dataGridViewTextBoxColumn1
+ //
+ this.dataGridViewTextBoxColumn1.DataPropertyName = "PointName";
+ this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称";
+ this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+ this.dataGridViewTextBoxColumn1.ReadOnly = true;
+ this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ //
+ // dataGridViewTextBoxColumn2
+ //
+ this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName";
+ this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名";
+ this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+ this.dataGridViewTextBoxColumn2.ReadOnly = true;
+ this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ this.dataGridViewTextBoxColumn2.Width = 80;
+ //
+ // dataGridViewTextBoxColumn3
+ //
+ this.dataGridViewTextBoxColumn3.DataPropertyName = "NominalValue";
+ this.dataGridViewTextBoxColumn3.HeaderText = "理论值";
+ this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+ this.dataGridViewTextBoxColumn3.ReadOnly = true;
+ this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ //
+ // dataGridViewTextBoxColumn4
+ //
+ this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerLimit";
+ this.dataGridViewTextBoxColumn4.HeaderText = "下公差";
+ this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+ this.dataGridViewTextBoxColumn4.ReadOnly = true;
+ this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ //
+ // dataGridViewTextBoxColumn5
+ //
+ this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperLimit";
+ this.dataGridViewTextBoxColumn5.HeaderText = "上公差";
+ this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+ this.dataGridViewTextBoxColumn5.ReadOnly = true;
+ this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ //
+ // dataGridViewTextBoxColumn6
+ //
+ this.dataGridViewTextBoxColumn6.DataPropertyName = "DimensionValue";
+ this.dataGridViewTextBoxColumn6.HeaderText = "实测值";
+ this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+ this.dataGridViewTextBoxColumn6.ReadOnly = true;
+ this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+ //
+ // MeasureItemResult
+ //
+ this.MeasureItemResult.DataPropertyName = "Classification";
+ this.MeasureItemResult.HeaderText = "结果";
+ this.MeasureItemResult.Name = "MeasureItemResult";
+ this.MeasureItemResult.ReadOnly = true;
+ //
+ // dataGridViewTextBoxColumn7
+ //
+ this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDateTime";
+ this.dataGridViewTextBoxColumn7.HeaderText = "测量时间";
+ this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+ this.dataGridViewTextBoxColumn7.ReadOnly = true;
+ this.dataGridViewTextBoxColumn7.Width = 190;
+ //
// dgvFPYResult
//
this.dgvFPYResult.AllowUserToAddRows = false;
@@ -1500,14 +1579,14 @@ namespace NSAnalysis
this.dgvFPYResult.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
this.dgvFPYResult.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvFPYResult.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvFPYResult.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dgvFPYResult.ColumnHeadersHeight = 37;
this.dgvFPYResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn9,
@@ -1524,20 +1603,20 @@ namespace NSAnalysis
this.dgvFPYResult.Name = "dgvFPYResult";
this.dgvFPYResult.ReadOnly = true;
this.dgvFPYResult.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvFPYResult.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
this.dgvFPYResult.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
- dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
- dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10F);
- dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
- this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
+ dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10F);
+ dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
+ this.dgvFPYResult.RowsDefaultCellStyle = dataGridViewCellStyle9;
this.dgvFPYResult.RowTemplate.Height = 37;
this.dgvFPYResult.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvFPYResult.Size = new System.Drawing.Size(1487, 566);
@@ -1689,85 +1768,6 @@ namespace NSAnalysis
this.tmSystem.Interval = 1000;
this.tmSystem.Tick += new System.EventHandler(this.tmSystem_Tick);
//
- // Column2
- //
- this.Column2.DataPropertyName = "ProductNum";
- this.Column2.HeaderText = "车身编号";
- this.Column2.Name = "Column2";
- this.Column2.ReadOnly = true;
- this.Column2.Width = 170;
- //
- // Model
- //
- this.Model.DataPropertyName = "Model";
- this.Model.HeaderText = "车型";
- this.Model.Name = "Model";
- this.Model.ReadOnly = true;
- //
- // dataGridViewTextBoxColumn1
- //
- this.dataGridViewTextBoxColumn1.DataPropertyName = "PointName";
- this.dataGridViewTextBoxColumn1.HeaderText = "测量点名称";
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- this.dataGridViewTextBoxColumn1.ReadOnly = true;
- this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // dataGridViewTextBoxColumn2
- //
- this.dataGridViewTextBoxColumn2.DataPropertyName = "DimensionName";
- this.dataGridViewTextBoxColumn2.HeaderText = "尺寸名";
- this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
- this.dataGridViewTextBoxColumn2.ReadOnly = true;
- this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- this.dataGridViewTextBoxColumn2.Width = 80;
- //
- // dataGridViewTextBoxColumn3
- //
- this.dataGridViewTextBoxColumn3.DataPropertyName = "NominalValue";
- this.dataGridViewTextBoxColumn3.HeaderText = "理论值";
- this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
- this.dataGridViewTextBoxColumn3.ReadOnly = true;
- this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // dataGridViewTextBoxColumn4
- //
- this.dataGridViewTextBoxColumn4.DataPropertyName = "LowerLimit";
- this.dataGridViewTextBoxColumn4.HeaderText = "下公差";
- this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
- this.dataGridViewTextBoxColumn4.ReadOnly = true;
- this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // dataGridViewTextBoxColumn5
- //
- this.dataGridViewTextBoxColumn5.DataPropertyName = "UpperLimit";
- this.dataGridViewTextBoxColumn5.HeaderText = "上公差";
- this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
- this.dataGridViewTextBoxColumn5.ReadOnly = true;
- this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // dataGridViewTextBoxColumn6
- //
- this.dataGridViewTextBoxColumn6.DataPropertyName = "DimensionValue";
- this.dataGridViewTextBoxColumn6.HeaderText = "实测值";
- this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
- this.dataGridViewTextBoxColumn6.ReadOnly = true;
- this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
- //
- // MeasureItemResult
- //
- this.MeasureItemResult.DataPropertyName = "Classification";
- this.MeasureItemResult.HeaderText = "结果";
- this.MeasureItemResult.Name = "MeasureItemResult";
- this.MeasureItemResult.ReadOnly = true;
- //
- // dataGridViewTextBoxColumn7
- //
- this.dataGridViewTextBoxColumn7.DataPropertyName = "MeasureDateTime";
- this.dataGridViewTextBoxColumn7.HeaderText = "测量时间";
- this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
- this.dataGridViewTextBoxColumn7.ReadOnly = true;
- this.dataGridViewTextBoxColumn7.Width = 190;
- //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
diff --git a/Analysis/FormMain.resx b/Analysis/FormMain.resx
index 64b6c4e..c4caaea 100644
--- a/Analysis/FormMain.resx
+++ b/Analysis/FormMain.resx
@@ -150,65 +150,6 @@
IHTCfZQWuRBGlIrQoi/wc3unYB2yIezXtu/xFw+lctWAOpr3s5YWKFgAon3/xnp3cjPKCDsamCTUelHG
M5zL/kBDiUN9j/R9EOdzZ+k8yb/At2NlgydJjTKiVtSdVKk/m/kVANjAPs34ScEaMJfVMw3t6bm6s6lp
qEc4R0mJ+26dgwn6qipE706fjsJ1VnvEI8VA/PC3/lOjX79/AdonQT85iOsDAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
- SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
- iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
- f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
- X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
- y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
- rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
- f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
- upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
- 5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
- GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
- C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
- WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
- YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
- 9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
- ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
- eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
- 5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
- 8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
- aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
- ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
- aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
- WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
- 613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
- Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
- 4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
- z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
- Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
- uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
- dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
- qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
- fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
- E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
- d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
- okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
- DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
- LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
- bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
- 8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
- n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
- f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
- ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
@@ -235,11 +176,21 @@
True
-
+
- iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
- RU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
+ SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
+ iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
+ f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
+ X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
+ y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
+ rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
+ f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
+ upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
+ 5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
+ GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
+ C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
@@ -303,6 +254,48 @@
True
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
+ WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
+ YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
+ 9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
+ ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
+ eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
+ 5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
+ 8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
+ aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
+ ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
+ aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
+ WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
+ 613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
+ Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
+ 4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
+ z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
+ Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
+ uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
+ dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
+ qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
+ fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
+ E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
+ d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
+ okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
+ DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
+ LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
+ bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
+ 8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
+ n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
+ f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
+ ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
+
+
17, 17
diff --git a/Analysis/bin/x64/Debug/Debug.txt b/Analysis/bin/x64/Debug/Debug.txt
index 2697650..8276c09 100644
--- a/Analysis/bin/x64/Debug/Debug.txt
+++ b/Analysis/bin/x64/Debug/Debug.txt
@@ -1,66 +1,42 @@
-2025-08-28 21:40:46.762----软件Program Main函数开始执行--
-2025-08-28 21:40:46.763--加载配置文件——>开始
-2025-08-28 21:40:46.778--数据库连接 SqlServerName:127.0.0.1
-2025-08-28 21:40:46.779--数据库连接 SqlUserName:sa
-2025-08-28 21:40:46.779--数据库连接 SqlPassword:Hexagon123
-2025-08-28 21:40:46.780--数据库连接 SqlDbName:CJLR
-2025-08-28 21:40:46.780--加载配置文件——>完成
-2025-08-28 21:40:46.781--Log in using the original authorization mode.
-2025-08-28 21:40:47.993--软件授权成功
-2025-08-28 21:40:49.060--数据库连接 SqlServerName:127.0.0.1
-2025-08-28 21:40:49.061--数据库连接 SqlUserName:sa
-2025-08-28 21:40:49.062--数据库连接 SqlPassword:Hexagon123
-2025-08-28 21:40:49.063--数据库连接 SqlDbName:CJLR
-2025-08-28 21:40:49.063--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
-2025-08-28 21:40:49.503---------------海克斯康面隙分析软件程序启动---------------------
-2025-08-28 21:41:04.522--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:41:04.524--匹配文件特征符: E0Y_R
-2025-08-28 21:41:04.526--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:41:04.526--匹配文件特征符: E0Y_L
-2025-08-28 21:41:19.496--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:41:19.497--匹配文件特征符: E0Y_R
-2025-08-28 21:41:19.497--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:41:19.498--匹配文件特征符: E0Y_L
-2025-08-28 21:41:19.499--正在处理文件 : D:\CJLR\DATA\Input\LLL\SX541625.csv
-2025-08-28 21:41:19.508--已备份文件到: D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\Backup\SX541625.csv
-2025-08-28 21:41:22.758--测量时间:2025-08-28 11:38:37
-2025-08-28 21:41:22.758----------------------------------------------------------
-2025-08-28 21:41:22.759--车号:SX541625
-2025-08-28 21:41:22.760--车型:E0Y
-2025-08-28 21:41:22.761--组名:E0Y_L20250828
-2025-08-28 21:41:22.762--位置:L
-2025-08-28 21:41:22.762--测量时间:2025-08-28 11:38:37
-2025-08-28 21:41:22.790--CSV文件导入到数据库成功!
-2025-08-28 21:41:22.796--将总结果插入数据库完毕。
-2025-08-28 21:41:22.803----------------------------------------------------------
-2025-08-28 21:41:22.804--触发事件,车号: SX541625 位置: L
-2025-08-28 21:41:24.534--双侧测量结果已完成,开始生成客户报告。
-2025-08-28 21:41:24.552--客户报告已生成: D:\QMLTest\SX541625_20250828214124.csv
-2025-08-28 21:41:24.664--[MatchCsvValue] 检查文件: D:\CJLR\DATA\Input\LLL\SX541625.csv, 行索引: 2, 列索引: 1, 目标值: E0Y_L
-2025-08-28 21:41:24.667--目标文件已存在,已重命名为备份文件: D:\CJLR\DATA\Output\X540R\SX541625.csv.bak_20250828_214124
-2025-08-28 21:41:24.669--移动完成,: D:\CJLR\DATA\Input\LLL\SX541625.csv -> D:\CJLR\DATA\Output\X540R\SX541625.csv
-2025-08-28 21:41:34.500--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:41:34.501--匹配文件特征符: E0Y_R
-2025-08-28 21:41:34.502--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:41:34.503--匹配文件特征符: E0Y_L
-2025-08-28 21:41:49.511--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:41:49.513--匹配文件特征符: E0Y_R
-2025-08-28 21:41:49.515--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:41:49.516--匹配文件特征符: E0Y_L
-2025-08-28 21:42:04.504--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:42:04.505--匹配文件特征符: E0Y_R
-2025-08-28 21:42:04.506--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:42:04.507--匹配文件特征符: E0Y_L
-2025-08-28 21:42:19.500--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:42:19.502--匹配文件特征符: E0Y_R
-2025-08-28 21:42:19.504--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:42:19.505--匹配文件特征符: E0Y_L
-2025-08-28 21:42:34.497--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:42:34.498--匹配文件特征符: E0Y_R
-2025-08-28 21:42:34.499--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:42:34.500--匹配文件特征符: E0Y_L
-2025-08-28 21:42:49.503--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
-2025-08-28 21:42:49.504--匹配文件特征符: E0Y_R
-2025-08-28 21:42:49.505--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
-2025-08-28 21:42:49.506--匹配文件特征符: E0Y_L
-2025-08-28 21:42:51.464---------------海克斯康面隙分析软件程序关闭---------------------
+2025-08-31 15:00:31.702----软件Program Main函数开始执行--
+2025-08-31 15:00:31.707--加载配置文件——>开始
+2025-08-31 15:00:31.728--数据库连接 SqlServerName:127.0.0.1
+2025-08-31 15:00:31.731--数据库连接 SqlUserName:sa
+2025-08-31 15:00:31.733--数据库连接 SqlPassword:Hexagon123
+2025-08-31 15:00:31.736--数据库连接 SqlDbName:CJLR
+2025-08-31 15:00:31.739--加载配置文件——>完成
+2025-08-31 15:00:31.742--Log in using the original authorization mode.
+2025-08-31 15:00:34.140--软件授权成功
+2025-08-31 15:00:35.816--数据库连接 SqlServerName:127.0.0.1
+2025-08-31 15:00:35.821--数据库连接 SqlUserName:sa
+2025-08-31 15:00:35.825--数据库连接 SqlPassword:Hexagon123
+2025-08-31 15:00:35.828--数据库连接 SqlDbName:CJLR
+2025-08-31 15:00:35.829--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
+2025-08-31 15:00:36.701---------------海克斯康面隙分析软件程序启动---------------------
+2025-08-31 15:00:39.610--数据库连接 SqlServerName:127.0.0.1
+2025-08-31 15:00:39.614--数据库连接 SqlUserName:sa
+2025-08-31 15:00:39.617--数据库连接 SqlPassword:Hexagon123
+2025-08-31 15:00:39.620--数据库连接 SqlDbName:CJLR
+2025-08-31 15:00:39.622--数据库连接字符串:Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
+2025-08-31 15:00:51.851--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
+2025-08-31 15:00:51.874--匹配文件特征符: E0Y_R
+2025-08-31 15:00:51.882--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
+2025-08-31 15:00:51.886--匹配文件特征符: E0Y_L
+2025-08-31 15:01:06.703--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
+2025-08-31 15:01:06.709--匹配文件特征符: E0Y_R
+2025-08-31 15:01:06.716--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
+2025-08-31 15:01:06.719--匹配文件特征符: E0Y_L
+2025-08-31 15:01:21.702--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
+2025-08-31 15:01:21.709--匹配文件特征符: E0Y_R
+2025-08-31 15:01:21.713--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
+2025-08-31 15:01:21.719--匹配文件特征符: E0Y_L
+2025-08-31 15:01:36.692--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
+2025-08-31 15:01:36.697--匹配文件特征符: E0Y_R
+2025-08-31 15:01:36.702--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
+2025-08-31 15:01:36.707--匹配文件特征符: E0Y_L
+2025-08-31 15:01:51.707--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\RRR, 目标路径: D:\CJLR\DATA\Output\X540L, 匹配字符: E0Y 位置:R
+2025-08-31 15:01:51.711--匹配文件特征符: E0Y_R
+2025-08-31 15:01:51.717--[ProcessFiles] 正在执行分发任务 - 源路径: D:\CJLR\DATA\Input\LLL, 目标路径: D:\CJLR\DATA\Output\X540R, 匹配字符: E0Y 位置:L
+2025-08-31 15:01:51.722--匹配文件特征符: E0Y_L
+2025-08-31 15:01:51.728--正在处理文件 : D:\CJLR\DATA\Input\LLL\S8540702.csv
+2025-08-31 15:01:51.755--已备份文件到: D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\bin\x64\Debug\Backup\S8540702.csv
diff --git a/Analysis/bin/x64/Debug/NSAnalysis.exe b/Analysis/bin/x64/Debug/NSAnalysis.exe
index 72b88cf..37a3fdb 100644
Binary files a/Analysis/bin/x64/Debug/NSAnalysis.exe and b/Analysis/bin/x64/Debug/NSAnalysis.exe differ
diff --git a/Analysis/bin/x64/Debug/NSAnalysis.pdb b/Analysis/bin/x64/Debug/NSAnalysis.pdb
index 8d069c2..39a6ce4 100644
Binary files a/Analysis/bin/x64/Debug/NSAnalysis.pdb and b/Analysis/bin/x64/Debug/NSAnalysis.pdb differ