优化mac比对

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.Designer.cs

@@ -41,35 +41,37 @@
             this.wo_lab = new System.Windows.Forms.Label();
             this.woVal = new System.Windows.Forms.Label();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.Query = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.GetSNCode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.GetSNCode_Label = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.MsgBox = new System.Windows.Forms.Label();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.dgv = new System.Windows.Forms.DataGridView();
             this.result_box = new System.Windows.Forms.Panel();
             this.res = new System.Windows.Forms.ListView();
-            this.dgv = new System.Windows.Forms.DataGridView();
+            this.label1 = new System.Windows.Forms.Label();
+            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.snCollectionBox1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.Query = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.GetSNCode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.MacDetail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.testNameChinese = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.isCheck = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.testName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.result = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.panel4 = new System.Windows.Forms.Panel();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            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.MsgBox = new System.Windows.Forms.Label();
-            this.panel2 = new System.Windows.Forms.Panel();
             this.panel1.SuspendLayout();
             this.snDetail.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel3.SuspendLayout();
-            this.result_box.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
-            this.panel4.SuspendLayout();
             this.panel2.SuspendLayout();
+            this.panel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
+            this.result_box.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
@@ -214,10 +216,13 @@
             // 
             // panel3
             // 
+            this.panel3.Controls.Add(this.snCollectionBox1);
+            this.panel3.Controls.Add(this.label1);
+            this.panel3.Controls.Add(this.result_box);
+            this.panel3.Controls.Add(this.res);
             this.panel3.Controls.Add(this.Query);
             this.panel3.Controls.Add(this.GetSNCode);
             this.panel3.Controls.Add(this.GetSNCode_Label);
-            this.panel3.Controls.Add(this.result_box);
             this.panel3.Controls.Add(this.dgv);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel3.Location = new System.Drawing.Point(0, 164);
@@ -225,6 +230,164 @@
             this.panel3.Size = new System.Drawing.Size(979, 704);
             this.panel3.TabIndex = 134;
             // 
+            // GetSNCode_Label
+            // 
+            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.GetSNCode_Label.AutoSize = true;
+            this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.GetSNCode_Label.Location = new System.Drawing.Point(20, 587);
+            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.GetSNCode_Label.Name = "GetSNCode_Label";
+            this.GetSNCode_Label.Size = new System.Drawing.Size(92, 31);
+            this.GetSNCode_Label.TabIndex = 134;
+            this.GetSNCode_Label.Text = "序列号:";
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.MsgBox);
+            this.panel2.Location = new System.Drawing.Point(453, 34);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(200, 100);
+            this.panel2.TabIndex = 2;
+            // 
+            // MsgBox
+            // 
+            this.MsgBox.BackColor = System.Drawing.Color.LawnGreen;
+            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.MsgBox.Location = new System.Drawing.Point(0, 0);
+            this.MsgBox.Name = "MsgBox";
+            this.MsgBox.Size = new System.Drawing.Size(200, 100);
+            this.MsgBox.TabIndex = 1;
+            this.MsgBox.Text = "Pass";
+            this.MsgBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.OperatResult);
+            this.panel4.Controls.Add(this.Clean);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel4.Location = new System.Drawing.Point(979, 164);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(599, 704);
+            this.panel4.TabIndex = 138;
+            // 
+            // dgv
+            // 
+            this.dgv.AllowUserToAddRows = false;
+            this.dgv.AllowUserToDeleteRows = false;
+            this.dgv.BackgroundColor = System.Drawing.SystemColors.Control;
+            this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.MacDetail,
+            this.testNameChinese,
+            this.isCheck,
+            this.testName,
+            this.result});
+            this.dgv.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.dgv.Location = new System.Drawing.Point(0, 0);
+            this.dgv.Name = "dgv";
+            this.dgv.ReadOnly = true;
+            this.dgv.RowHeadersWidth = 62;
+            this.dgv.RowTemplate.Height = 30;
+            this.dgv.Size = new System.Drawing.Size(979, 494);
+            this.dgv.TabIndex = 136;
+            this.dgv.Visible = false;
+            // 
+            // result_box
+            // 
+            this.result_box.Controls.Add(this.panel2);
+            this.result_box.Dock = System.Windows.Forms.DockStyle.Top;
+            this.result_box.Location = new System.Drawing.Point(0, 0);
+            this.result_box.Name = "result_box";
+            this.result_box.Size = new System.Drawing.Size(979, 472);
+            this.result_box.TabIndex = 138;
+            // 
+            // res
+            // 
+            this.res.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.res.HideSelection = false;
+            this.res.Location = new System.Drawing.Point(52, 113);
+            this.res.Name = "res";
+            this.res.Size = new System.Drawing.Size(896, 220);
+            this.res.TabIndex = 0;
+            this.res.UseCompatibleStateImageBehavior = false;
+            this.res.Visible = false;
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(20, 524);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(92, 31);
+            this.label1.TabIndex = 139;
+            this.label1.Text = "机身标:";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 91;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 91;
+            // 
+            // snCollectionBox1
+            // 
+            this.snCollectionBox1.AllPower = null;
+            this.snCollectionBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.snCollectionBox1.BackColor = System.Drawing.Color.White;
+            this.snCollectionBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.snCollectionBox1.ID = null;
+            this.snCollectionBox1.Location = new System.Drawing.Point(114, 524);
+            this.snCollectionBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.snCollectionBox1.Name = "snCollectionBox1";
+            this.snCollectionBox1.Power = null;
+            this.snCollectionBox1.Size = new System.Drawing.Size(412, 35);
+            this.snCollectionBox1.Str = null;
+            this.snCollectionBox1.Str1 = null;
+            this.snCollectionBox1.Str2 = null;
+            this.snCollectionBox1.TabIndex = 140;
+            this.snCollectionBox1.Tag = "Read";
+            this.snCollectionBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.snCollectionBox1_KeyDown);
+            // 
             // Query
             // 
             this.Query.AllPower = null;
@@ -234,7 +397,7 @@
             this.Query.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Query.Image = null;
             this.Query.IsShowBorder = true;
-            this.Query.Location = new System.Drawing.Point(607, 584);
+            this.Query.Location = new System.Drawing.Point(575, 587);
             this.Query.Margin = new System.Windows.Forms.Padding(4);
             this.Query.MoveImage = ((System.Drawing.Image)(resources.GetObject("Query.MoveImage")));
             this.Query.Name = "Query";
@@ -255,7 +418,7 @@
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(131, 585);
+            this.GetSNCode.Location = new System.Drawing.Point(114, 587);
             this.GetSNCode.Margin = new System.Windows.Forms.Padding(4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
@@ -267,61 +430,6 @@
             this.GetSNCode.Tag = "Read";
             this.GetSNCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.GetSNCode_KeyDown);
             // 
-            // GetSNCode_Label
-            // 
-            this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.GetSNCode_Label.AutoSize = true;
-            this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetSNCode_Label.Location = new System.Drawing.Point(20, 587);
-            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.GetSNCode_Label.Name = "GetSNCode_Label";
-            this.GetSNCode_Label.Size = new System.Drawing.Size(86, 31);
-            this.GetSNCode_Label.TabIndex = 134;
-            this.GetSNCode_Label.Text = "序列号";
-            // 
-            // result_box
-            // 
-            this.result_box.Controls.Add(this.panel2);
-            this.result_box.Controls.Add(this.res);
-            this.result_box.Dock = System.Windows.Forms.DockStyle.Top;
-            this.result_box.Location = new System.Drawing.Point(0, 0);
-            this.result_box.Name = "result_box";
-            this.result_box.Size = new System.Drawing.Size(979, 567);
-            this.result_box.TabIndex = 138;
-            // 
-            // res
-            // 
-            this.res.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.res.HideSelection = false;
-            this.res.Location = new System.Drawing.Point(36, 61);
-            this.res.Name = "res";
-            this.res.Size = new System.Drawing.Size(896, 220);
-            this.res.TabIndex = 0;
-            this.res.UseCompatibleStateImageBehavior = false;
-            // 
-            // dgv
-            // 
-            this.dgv.AllowUserToAddRows = false;
-            this.dgv.AllowUserToDeleteRows = false;
-            this.dgv.BackgroundColor = System.Drawing.SystemColors.Control;
-            this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.MacDetail,
-            this.testNameChinese,
-            this.isCheck,
-            this.testName,
-            this.result});
-            this.dgv.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.dgv.Location = new System.Drawing.Point(0, 0);
-            this.dgv.Name = "dgv";
-            this.dgv.ReadOnly = true;
-            this.dgv.RowHeadersWidth = 62;
-            this.dgv.RowTemplate.Height = 30;
-            this.dgv.Size = new System.Drawing.Size(979, 567);
-            this.dgv.TabIndex = 136;
-            this.dgv.Visible = false;
-            // 
             // MacDetail
             // 
             this.MacDetail.HeaderText = "MAC信息";
@@ -353,7 +461,7 @@
             this.testName.MinimumWidth = 8;
             this.testName.Name = "testName";
             this.testName.ReadOnly = true;
-            this.testName.Width = 91;
+            this.testName.Width = 116;
             // 
             // result
             // 
@@ -362,17 +470,7 @@
             this.result.MinimumWidth = 8;
             this.result.Name = "result";
             this.result.ReadOnly = true;
-            this.result.Width = 91;
-            // 
-            // panel4
-            // 
-            this.panel4.Controls.Add(this.OperatResult);
-            this.panel4.Controls.Add(this.Clean);
-            this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel4.Location = new System.Drawing.Point(979, 164);
-            this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(599, 704);
-            this.panel4.TabIndex = 138;
+            this.result.Width = 116;
             // 
             // OperatResult
             // 
@@ -408,65 +506,6 @@
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
-            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
-            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Width = 150;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
-            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.Width = 150;
-            // 
-            // MsgBox
-            // 
-            this.MsgBox.BackColor = System.Drawing.Color.LawnGreen;
-            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MsgBox.Location = new System.Drawing.Point(0, 0);
-            this.MsgBox.Name = "MsgBox";
-            this.MsgBox.Size = new System.Drawing.Size(200, 100);
-            this.MsgBox.TabIndex = 1;
-            this.MsgBox.Text = "Pass";
-            this.MsgBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // panel2
-            // 
-            this.panel2.Controls.Add(this.MsgBox);
-            this.panel2.Location = new System.Drawing.Point(364, 411);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(200, 100);
-            this.panel2.TabIndex = 2;
-            // 
             // Make_QueryMac
             // 
             this.AllowDrop = true;
@@ -486,10 +525,10 @@
             this.tableLayoutPanel1.PerformLayout();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
-            this.result_box.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
-            this.panel4.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
+            this.panel4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
+            this.result_box.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -504,7 +543,6 @@
         private System.Windows.Forms.Panel panel3;
         private CustomControl.TextBoxWithIcon.SnCollectionBox GetSNCode;
         private System.Windows.Forms.Label GetSNCode_Label;
-        private System.Windows.Forms.DataGridView dgv;
         private CustomControl.ButtonUtil.NormalButton Query;
         private System.Windows.Forms.Panel panel4;
         private CustomControl.ButtonUtil.NormalButton Clean;
@@ -519,14 +557,17 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.Label MsgBox;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel result_box;
+        private System.Windows.Forms.ListView res;
+        private System.Windows.Forms.DataGridView dgv;
         private System.Windows.Forms.DataGridViewTextBoxColumn MacDetail;
         private System.Windows.Forms.DataGridViewTextBoxColumn testNameChinese;
         private System.Windows.Forms.DataGridViewTextBoxColumn isCheck;
         private System.Windows.Forms.DataGridViewTextBoxColumn testName;
         private System.Windows.Forms.DataGridViewTextBoxColumn result;
-        private System.Windows.Forms.Panel result_box;
-        private System.Windows.Forms.ListView res;
-        private System.Windows.Forms.Label MsgBox;
-        private System.Windows.Forms.Panel panel2;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox snCollectionBox1;
+        private System.Windows.Forms.Label label1;
     }
 }

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.cs

@@ -1,4 +1,5 @@
 using DevExpress.Printing.Core.PdfExport.Metafile;
+using DevExpress.Utils.Drawing.Helpers;
 using NPOI.SS.Formula.Eval;
 using System;
 using System.Collections;
@@ -11,6 +12,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
 using UAS_MES_NEW.DataOperate;
@@ -35,6 +37,8 @@ namespace UAS_MES_NEW.Make
         string output = "", error = "";
         string SN,MAC,WO = "";
 
+        string resultType = "NG";
+
         List<TestItem> TestObj = new List<TestItem> { };
 
         public Make_QueryMac()
@@ -145,19 +149,51 @@ namespace UAS_MES_NEW.Make
             string readMac = "shell ip addr show wlan0";
             ExecuteAdbCommand(adbPath, readMac, ref output, ref error);
             if (!string.IsNullOrEmpty(error))
+            {
+                ShowMsg(0, $"获取MAC异常: {error}");
+                return;
+            }
+            if (string.IsNullOrEmpty(output))
+            {
+                Match match = Regex.Match(output, @"link/ether\s+([0-9a-fA-F:]{17})");
+                if (match.Success)
+                {
+                    MAC = match.Groups[1].Value.Trim().ToUpper().Replace(":","");
+                    ShowMsg(1, $"解析结果: {MAC}");
+                }
+            }
+
+            if(MAC == snCollectionBox1.Text)
+            {
+                MsgBox.Text = "Pass";
+                MsgBox.BackColor = Color.LawnGreen;
+                resultType = "OK";
+
+                snCollectionBox1.Focus();
+                snCollectionBox1.SelectAll();
+            }
+            else
             {
                 MsgBox.Text = "Fail";
                 MsgBox.BackColor = Color.Red;
+                resultType = "NG";
 
-                ShowMsg(0, $"获取MAC异常: {error}");
-                return;
+                snCollectionBox1.Focus();
+                snCollectionBox1.SelectAll();
             }
 
-            MsgBox.Text = "Pass";
-            MsgBox.BackColor = Color.LawnGreen;
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, woVal.Text, User.UserLineCode, User.UserSourceCode, "MAC比对", "", SN, "");
+
+            sql.Clear();
+            sql.Append($@"INSERT INTO steptestdetail (std_id,std_sn,std_makecode,std_date,std_indate,
+                                std_rescode,std_stepcode,std_class,std_value1,STD_VALUE2,STD_TESTRESULT) values 
+                                (steptestdetail_seq.NEXTVAL,'{SN}','{woVal.Text}',sysdate,sysdate,
+                                '{User.UserSourceCode}','{User.CurrentStepCode}','MAC比对','{snCollectionBox1.Text}','{MAC}','{resultType}')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            ShowMsg(1, $"MAC核对成功，已上传测试结果");
 
-            res.Items.Clear();
-            res.Items.Add(output);
+            /*res.Items.Clear();
+            res.Items.Add(output);*/
 
             /*string install = $"install -r {apkPath}";
             ExecuteAdbCommand(adbPath, install, ref output, ref error);
@@ -166,30 +202,41 @@ namespace UAS_MES_NEW.Make
                 return;
             }*/
 
-            //string readMac = "shell cat /sys/class/net/wlan0/address";
-            //ExecuteAdbCommand(adbPath, readMac, ref output, ref error);
-            //if (!string.IsNullOrEmpty(error))
-            //{
-            //    ShowMsg(0, $"获取MAC异常: {error}");
-            //    return;
-            //}
+            /*string readMac = "shell cat /sys/class/net/wlan0/address";
+            ExecuteAdbCommand(adbPath, readMac, ref output, ref error);
+            if (!string.IsNullOrEmpty(error))
+            {
+                ShowMsg(0, $"获取MAC异常: {error}");
+                return;
+            }
 
-            //MAC = output.Replace("\r\n", "").Replace(":", "").ToUpper();
-            //macPath = Path.Combine(fullPath, MAC);
-            //if (!Directory.Exists(macPath))
-            //{
-            //    Directory.CreateDirectory(macPath);
-            //}
+            MAC = output.Replace("\r\n", "").Replace(":", "").ToUpper();
+            macPath = Path.Combine(fullPath, MAC);
+            if (!Directory.Exists(macPath))
+            {
+                Directory.CreateDirectory(macPath);
+            }
 
-            //string command = $"pull sdcard/Download/FactoryTest_result.xml {macPath}";
-            //ExecuteAdbCommand(adbPath, command, ref output, ref error);
-            //if (!string.IsNullOrEmpty(error))
-            //{
-            //    ShowMsg(0, $"提取测试记录异常: {error}");
-            //    return;
-            //}
-            //string path = Path.Combine(macPath, "FactoryTest_result.xml");
-            //ParseXml(path);
+            string command = $"pull sdcard/Download/FactoryTest_result.xml {macPath}";
+            ExecuteAdbCommand(adbPath, command, ref output, ref error);
+            if (!string.IsNullOrEmpty(error))
+            {
+                ShowMsg(0, $"提取测试记录异常: {error}");
+                return;
+            }
+            string path = Path.Combine(macPath, "FactoryTest_result.xml");
+            ParseXml(path);*/
+        }
+
+        private void snCollectionBox1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            GetSNCode.Focus();
+            GetSNCode.SelectAll();
+
+            MsgBox.Text = "Pass";
+            MsgBox.BackColor = Color.LawnGreen;
         }
 
         private void ParseXml(string path)

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.resx

@@ -120,7 +120,19 @@
   <metadata name="tableLayoutPanel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="tableLayoutPanel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="MacDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="testNameChinese.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="isCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="testName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -177,21 +189,6 @@
   <metadata name="result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="MacDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="testNameChinese.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="isCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="testName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m