优化交互

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.Designer.cs

@@ -60,6 +60,8 @@
             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();
@@ -67,6 +69,7 @@
             this.result_box.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
             this.panel4.SuspendLayout();
+            this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
@@ -74,20 +77,18 @@
             this.panel1.Controls.Add(this.snDetail);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(2104, 291);
+            this.panel1.Size = new System.Drawing.Size(1578, 164);
             this.panel1.TabIndex = 132;
             // 
             // snDetail
             // 
             this.snDetail.Controls.Add(this.tableLayoutPanel1);
+            this.snDetail.Dock = System.Windows.Forms.DockStyle.Top;
             this.snDetail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.snDetail.Location = new System.Drawing.Point(16, 29);
-            this.snDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.snDetail.Location = new System.Drawing.Point(0, 0);
             this.snDetail.Name = "snDetail";
-            this.snDetail.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.snDetail.Size = new System.Drawing.Size(2496, 211);
+            this.snDetail.Size = new System.Drawing.Size(1578, 158);
             this.snDetail.TabIndex = 0;
             this.snDetail.TabStop = false;
             this.snDetail.Text = "工单信息";
@@ -112,12 +113,11 @@
             this.tableLayoutPanel1.Controls.Add(this.wo_lab, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.woVal, 1, 0);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 47);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 35);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 1;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(2488, 160);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1572, 120);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // prodNameVal
@@ -125,10 +125,10 @@
             this.prodNameVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.prodNameVal.AutoSize = true;
             this.prodNameVal.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.prodNameVal.Location = new System.Drawing.Point(1943, 59);
-            this.prodNameVal.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.prodNameVal.Location = new System.Drawing.Point(1228, 44);
+            this.prodNameVal.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.prodNameVal.Name = "prodNameVal";
-            this.prodNameVal.Size = new System.Drawing.Size(0, 41);
+            this.prodNameVal.Size = new System.Drawing.Size(0, 31);
             this.prodNameVal.TabIndex = 66;
             // 
             // prodVal
@@ -136,10 +136,10 @@
             this.prodVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.prodVal.AutoSize = true;
             this.prodVal.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.prodVal.Location = new System.Drawing.Point(1322, 59);
-            this.prodVal.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.prodVal.Location = new System.Drawing.Point(836, 44);
+            this.prodVal.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.prodVal.Name = "prodVal";
-            this.prodVal.Size = new System.Drawing.Size(0, 41);
+            this.prodVal.Size = new System.Drawing.Size(0, 31);
             this.prodVal.TabIndex = 65;
             // 
             // snVal
@@ -147,10 +147,10 @@
             this.snVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.snVal.AutoSize = true;
             this.snVal.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.snVal.Location = new System.Drawing.Point(701, 59);
-            this.snVal.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.snVal.Location = new System.Drawing.Point(444, 44);
+            this.snVal.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.snVal.Name = "snVal";
-            this.snVal.Size = new System.Drawing.Size(0, 41);
+            this.snVal.Size = new System.Drawing.Size(0, 31);
             this.snVal.TabIndex = 64;
             // 
             // prodName_lab
@@ -158,10 +158,10 @@
             this.prodName_lab.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.prodName_lab.AutoSize = true;
             this.prodName_lab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.prodName_lab.Location = new System.Drawing.Point(1769, 59);
-            this.prodName_lab.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.prodName_lab.Location = new System.Drawing.Point(1126, 29);
+            this.prodName_lab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.prodName_lab.Name = "prodName_lab";
-            this.prodName_lab.Size = new System.Drawing.Size(163, 41);
+            this.prodName_lab.Size = new System.Drawing.Size(86, 62);
             this.prodName_lab.TabIndex = 61;
             this.prodName_lab.Text = "产品名称 :";
             // 
@@ -170,10 +170,10 @@
             this.prod_lab.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.prod_lab.AutoSize = true;
             this.prod_lab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.prod_lab.Location = new System.Drawing.Point(1148, 59);
-            this.prod_lab.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.prod_lab.Location = new System.Drawing.Point(734, 29);
+            this.prod_lab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.prod_lab.Name = "prod_lab";
-            this.prod_lab.Size = new System.Drawing.Size(163, 41);
+            this.prod_lab.Size = new System.Drawing.Size(86, 62);
             this.prod_lab.TabIndex = 62;
             this.prod_lab.Text = "产品编号 :";
             // 
@@ -182,10 +182,10 @@
             this.sn_lab.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.sn_lab.AutoSize = true;
             this.sn_lab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_lab.Location = new System.Drawing.Point(543, 59);
-            this.sn_lab.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.sn_lab.Location = new System.Drawing.Point(335, 44);
+            this.sn_lab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_lab.Name = "sn_lab";
-            this.sn_lab.Size = new System.Drawing.Size(131, 41);
+            this.sn_lab.Size = new System.Drawing.Size(99, 31);
             this.sn_lab.TabIndex = 38;
             this.sn_lab.Text = "序列号 :";
             // 
@@ -194,10 +194,10 @@
             this.wo_lab.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.wo_lab.AutoSize = true;
             this.wo_lab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.wo_lab.Location = new System.Drawing.Point(21, 59);
-            this.wo_lab.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.wo_lab.Location = new System.Drawing.Point(5, 44);
+            this.wo_lab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.wo_lab.Name = "wo_lab";
-            this.wo_lab.Size = new System.Drawing.Size(131, 41);
+            this.wo_lab.Size = new System.Drawing.Size(99, 31);
             this.wo_lab.TabIndex = 37;
             this.wo_lab.Text = "工单号 :";
             // 
@@ -206,10 +206,10 @@
             this.woVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.woVal.AutoSize = true;
             this.woVal.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.woVal.Location = new System.Drawing.Point(179, 59);
-            this.woVal.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.woVal.Location = new System.Drawing.Point(114, 44);
+            this.woVal.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.woVal.Name = "woVal";
-            this.woVal.Size = new System.Drawing.Size(0, 41);
+            this.woVal.Size = new System.Drawing.Size(0, 31);
             this.woVal.TabIndex = 63;
             // 
             // panel3
@@ -220,10 +220,9 @@
             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, 291);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel3.Location = new System.Drawing.Point(0, 164);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1305, 866);
+            this.panel3.Size = new System.Drawing.Size(979, 704);
             this.panel3.TabIndex = 134;
             // 
             // Query
@@ -235,13 +234,13 @@
             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(809, 779);
-            this.Query.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Query.Location = new System.Drawing.Point(607, 584);
+            this.Query.Margin = new System.Windows.Forms.Padding(4);
             this.Query.MoveImage = ((System.Drawing.Image)(resources.GetObject("Query.MoveImage")));
             this.Query.Name = "Query";
             this.Query.NormalImage = ((System.Drawing.Image)(resources.GetObject("Query.NormalImage")));
             this.Query.Power = null;
-            this.Query.Size = new System.Drawing.Size(207, 49);
+            this.Query.Size = new System.Drawing.Size(155, 37);
             this.Query.TabIndex = 137;
             this.Query.Tag = "IfRead";
             this.Query.Text = "获取测试结果";
@@ -256,11 +255,11 @@
             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(175, 780);
-            this.GetSNCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.GetSNCode.Location = new System.Drawing.Point(131, 585);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
-            this.GetSNCode.Size = new System.Drawing.Size(548, 44);
+            this.GetSNCode.Size = new System.Drawing.Size(412, 35);
             this.GetSNCode.Str = null;
             this.GetSNCode.Str1 = null;
             this.GetSNCode.Str2 = null;
@@ -274,31 +273,30 @@
             | 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(27, 783);
-            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            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(114, 41);
+            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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.result_box.Name = "result_box";
-            this.result_box.Size = new System.Drawing.Size(1305, 756);
+            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(48, 81);
-            this.res.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.res.Location = new System.Drawing.Point(36, 61);
             this.res.Name = "res";
-            this.res.Size = new System.Drawing.Size(1193, 292);
+            this.res.Size = new System.Drawing.Size(896, 220);
             this.res.TabIndex = 0;
             this.res.UseCompatibleStateImageBehavior = false;
             // 
@@ -316,12 +314,11 @@
             this.result});
             this.dgv.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
             this.dgv.Location = new System.Drawing.Point(0, 0);
-            this.dgv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgv.Name = "dgv";
             this.dgv.ReadOnly = true;
             this.dgv.RowHeadersWidth = 62;
             this.dgv.RowTemplate.Height = 30;
-            this.dgv.Size = new System.Drawing.Size(1305, 756);
+            this.dgv.Size = new System.Drawing.Size(979, 567);
             this.dgv.TabIndex = 136;
             this.dgv.Visible = false;
             // 
@@ -356,7 +353,7 @@
             this.testName.MinimumWidth = 8;
             this.testName.Name = "testName";
             this.testName.ReadOnly = true;
-            this.testName.Width = 118;
+            this.testName.Width = 91;
             // 
             // result
             // 
@@ -365,17 +362,16 @@
             this.result.MinimumWidth = 8;
             this.result.Name = "result";
             this.result.ReadOnly = true;
-            this.result.Width = 118;
+            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(1305, 291);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Location = new System.Drawing.Point(979, 164);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(799, 866);
+            this.panel4.Size = new System.Drawing.Size(599, 704);
             this.panel4.TabIndex = 138;
             // 
             // OperatResult
@@ -384,9 +380,9 @@
             this.OperatResult.Dock = System.Windows.Forms.DockStyle.Top;
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperatResult.Location = new System.Drawing.Point(0, 0);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(799, 755);
+            this.OperatResult.Size = new System.Drawing.Size(599, 567);
             this.OperatResult.TabIndex = 133;
             this.OperatResult.Text = "";
             // 
@@ -399,13 +395,13 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(336, 776);
-            this.Clean.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Clean.Location = new System.Drawing.Point(252, 582);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(139, 51);
+            this.Clean.Size = new System.Drawing.Size(104, 38);
             this.Clean.TabIndex = 132;
             this.Clean.Tag = "IfRead";
             this.Clean.Text = "清除";
@@ -418,7 +414,7 @@
             this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
             this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.Width = 200;
+            this.dataGridViewTextBoxColumn1.Width = 150;
             // 
             // dataGridViewTextBoxColumn2
             // 
@@ -426,7 +422,7 @@
             this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
             this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Width = 200;
+            this.dataGridViewTextBoxColumn2.Width = 150;
             // 
             // dataGridViewTextBoxColumn3
             // 
@@ -434,7 +430,7 @@
             this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
             this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Width = 200;
+            this.dataGridViewTextBoxColumn3.Width = 150;
             // 
             // dataGridViewTextBoxColumn4
             // 
@@ -442,7 +438,7 @@
             this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
             this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Width = 200;
+            this.dataGridViewTextBoxColumn4.Width = 150;
             // 
             // dataGridViewTextBoxColumn5
             // 
@@ -451,17 +447,36 @@
             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;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(2104, 1157);
+            this.ClientSize = new System.Drawing.Size(1578, 868);
             this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel4);
             this.Controls.Add(this.panel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_QueryMac";
             this.Text = "Make_WirelessTest";
             this.Load += new System.EventHandler(this.Make_WirelessTest_Load);
@@ -474,6 +489,7 @@
             this.result_box.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
             this.panel4.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -510,5 +526,7 @@
         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;
     }
 }

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.cs

@@ -99,6 +99,8 @@ namespace UAS_MES_NEW.Make
 
                 GetSNCode.Focus();
                 GetSNCode.SelectAll();
+
+                Query_Click(null, null);
             }
         }
         
@@ -144,10 +146,16 @@ namespace UAS_MES_NEW.Make
             ExecuteAdbCommand(adbPath, readMac, ref output, ref error);
             if (!string.IsNullOrEmpty(error))
             {
+                MsgBox.Text = "Fail";
+                MsgBox.BackColor = Color.Red;
+
                 ShowMsg(0, $"获取MAC异常: {error}");
                 return;
             }
 
+            MsgBox.Text = "Pass";
+            MsgBox.BackColor = Color.LawnGreen;
+
             res.Items.Clear();
             res.Items.Add(output);
 

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.resx

@@ -120,43 +120,46 @@
   <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">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Query.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
-        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
-        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
-        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
-        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
-        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
-        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="Query.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
-        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
-        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
-        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
-        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
-        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
-        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
-        RK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="Query.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
-        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
-        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
-        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
-        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
-        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
-        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
-        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="MacDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -174,42 +177,57 @@
   <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
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
-        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
-        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
-        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
-        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
-        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
-        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="Clean.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
-        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
-        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
-        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
-        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
-        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
-        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
-        RK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="Clean.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
-        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
-        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
-        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
-        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
-        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
-        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
-        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>