Bladeren bron

溯源基础界面

cxs 2 jaren geleden
bovenliggende
commit
4afbed68de

+ 26 - 0
OTS.sln

@@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSExtremum", "OTSExtremum\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSCommon", "OTSCommon\OTSCommon.csproj", "{3B7695AA-8231-45AC-B493-84390A945D02}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSInclusionsTraceability", "OTSInclusionsTraceability\OTSInclusionsTraceability.csproj", "{83412BF0-F802-456C-8A33-7C6CD5B6704D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CleannessRelease|Any CPU = CleannessRelease|Any CPU
@@ -460,6 +462,30 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x64.Build.0 = Release|x64
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release|x86.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|Any CPU.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x64.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x64.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x86.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.CleannessRelease|x86.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|x64.Build.0 = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Debug|x86.Build.0 = Debug|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|Any CPU.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|Any CPU.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|x64.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|x64.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|x86.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release_oxford50|x86.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x64.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x64.Build.0 = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x86.ActiveCfg = Release|Any CPU
+		{83412BF0-F802-456C-8A33-7C6CD5B6704D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 18 - 5
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.Designer.cs

@@ -73,6 +73,7 @@
             this.ImportSTDDb = new System.Windows.Forms.ToolStripMenuItem();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.dgV_ParticlesDevidePage = new System.Windows.Forms.DataGridView();
+            this.bn_InclusionsTraceability = new System.Windows.Forms.Button();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.contextMenuStrip1.SuspendLayout();
@@ -82,6 +83,7 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.bn_InclusionsTraceability);
             this.panel2.Controls.Add(this.label_Condition);
             this.panel2.Controls.Add(this.tbx_Type);
             this.panel2.Controls.Add(this.btn_ReMeasure);
@@ -122,7 +124,7 @@
             // 
             // btn_ReMeasure
             // 
-            this.btn_ReMeasure.Location = new System.Drawing.Point(595, 7);
+            this.btn_ReMeasure.Location = new System.Drawing.Point(676, 10);
             this.btn_ReMeasure.Name = "btn_ReMeasure";
             this.btn_ReMeasure.Size = new System.Drawing.Size(80, 23);
             this.btn_ReMeasure.TabIndex = 33;
@@ -133,7 +135,7 @@
             // 
             // btn_Sel
             // 
-            this.btn_Sel.Location = new System.Drawing.Point(535, 8);
+            this.btn_Sel.Location = new System.Drawing.Point(535, 9);
             this.btn_Sel.Name = "btn_Sel";
             this.btn_Sel.Size = new System.Drawing.Size(54, 23);
             this.btn_Sel.TabIndex = 33;
@@ -222,7 +224,7 @@
             // 
             this.cbB_order.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbB_order.FormattingEnabled = true;
-            this.cbB_order.Location = new System.Drawing.Point(768, 10);
+            this.cbB_order.Location = new System.Drawing.Point(1381, 12);
             this.cbB_order.Name = "cbB_order";
             this.cbB_order.Size = new System.Drawing.Size(108, 20);
             this.cbB_order.TabIndex = 1;
@@ -232,7 +234,7 @@
             // label_order
             // 
             this.label_order.AutoSize = true;
-            this.label_order.Location = new System.Drawing.Point(710, 13);
+            this.label_order.Location = new System.Drawing.Point(1327, 15);
             this.label_order.Name = "label_order";
             this.label_order.Size = new System.Drawing.Size(59, 12);
             this.label_order.TabIndex = 0;
@@ -401,7 +403,7 @@
             this.ToolStripMenuItemDelete_Particle,
             this.ImportSTDDb});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(219, 332);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(219, 310);
             // 
             // ToolStripMenuItem1
             // 
@@ -522,6 +524,16 @@
             this.dgV_ParticlesDevidePage.TabIndex = 5;
             this.dgV_ParticlesDevidePage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dgV_ParticlesDevidePage_MouseDown);
             // 
+            // bn_InclusionsTraceability
+            // 
+            this.bn_InclusionsTraceability.Location = new System.Drawing.Point(595, 10);
+            this.bn_InclusionsTraceability.Name = "bn_InclusionsTraceability";
+            this.bn_InclusionsTraceability.Size = new System.Drawing.Size(75, 23);
+            this.bn_InclusionsTraceability.TabIndex = 36;
+            this.bn_InclusionsTraceability.Text = "夹杂物溯源";
+            this.bn_InclusionsTraceability.UseVisualStyleBackColor = true;
+            this.bn_InclusionsTraceability.Click += new System.EventHandler(this.bn_InclusionsTraceability_Click);
+            // 
             // ParticlesGridDevidePage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -586,5 +598,6 @@
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemDelete_Particle;
         private System.Windows.Forms.Button btn_ReMeasure;
         private System.Windows.Forms.ToolStripMenuItem ImportSTDDb;
+        private System.Windows.Forms.Button bn_InclusionsTraceability;
     }
 }

+ 13 - 0
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -2459,6 +2459,19 @@ namespace OTSIncAReportGrids
                 }
             }
         }
+
+        private void bn_InclusionsTraceability_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                System.Diagnostics.Process p = System.Diagnostics.Process.Start(".\\OTSInclusionsTraceability.exe", resultFile.FilePath);
+                p.WaitForExit();
+            }
+            catch (Exception ex)
+            {
+                log.Error("InclusionsTraceability :" + ex.ToString());
+            }
+        }
     }
 }