Merge repos.ubtob.net:usoft/mes-client

UAS_MES_HYSX/FunctionCode/Make/Make_HandFeedRegistration.Designer.cs

@@ -38,6 +38,18 @@
             this.snVal = new System.Windows.Forms.TextBox();
             this.snLab = new System.Windows.Forms.Label();
             this.dgv = new System.Windows.Forms.DataGridView();
+            this.rn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.isHandReel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ps_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ps_processcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ps_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_bomlocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_baseqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -60,18 +72,6 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = new System.Windows.Forms.Label();
-            this.rn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.isHandReel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_processcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.psl_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.psl_bomlocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.psl_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.psl_baseqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.containerBox.SuspendLayout();
             this.executeBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
@@ -81,12 +81,12 @@
             // 
             // containerBox
             // 
-            this.containerBox.Controls.Add(this.executeBox);
             this.containerBox.Controls.Add(this.dgv);
+            this.containerBox.Controls.Add(this.executeBox);
             this.containerBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.containerBox.Location = new System.Drawing.Point(0, 123);
             this.containerBox.Name = "containerBox";
-            this.containerBox.Size = new System.Drawing.Size(1600, 777);
+            this.containerBox.Size = new System.Drawing.Size(1280, 597);
             this.containerBox.TabIndex = 28;
             // 
             // executeBox
@@ -100,9 +100,9 @@
             this.executeBox.Controls.Add(this.snLab);
             this.executeBox.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.executeBox.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.executeBox.Location = new System.Drawing.Point(0, 647);
+            this.executeBox.Location = new System.Drawing.Point(0, 467);
             this.executeBox.Name = "executeBox";
-            this.executeBox.Size = new System.Drawing.Size(1600, 130);
+            this.executeBox.Size = new System.Drawing.Size(1280, 130);
             this.executeBox.TabIndex = 0;
             // 
             // handCount
@@ -195,16 +195,120 @@
             this.psl_baseqty,
             this.ReelRemark,
             this.ReelNum});
-            this.dgv.Dock = System.Windows.Forms.DockStyle.Top;
+            this.dgv.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgv.Location = new System.Drawing.Point(0, 0);
             this.dgv.Name = "dgv";
             this.dgv.RowHeadersVisible = false;
             this.dgv.RowHeadersWidth = 62;
             this.dgv.RowTemplate.Height = 30;
-            this.dgv.Size = new System.Drawing.Size(1600, 641);
+            this.dgv.Size = new System.Drawing.Size(1280, 467);
             this.dgv.TabIndex = 1;
             this.dgv.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellClick);
             // 
+            // rn
+            // 
+            this.rn.DataPropertyName = "rn";
+            this.rn.HeaderText = "序号";
+            this.rn.MinimumWidth = 8;
+            this.rn.Name = "rn";
+            this.rn.Width = 50;
+            // 
+            // isHandReel
+            // 
+            this.isHandReel.HeaderText = "是否手补料";
+            this.isHandReel.MinimumWidth = 8;
+            this.isHandReel.Name = "isHandReel";
+            this.isHandReel.Width = 50;
+            // 
+            // ms_sncode
+            // 
+            this.ms_sncode.DataPropertyName = "ms_sncode";
+            this.ms_sncode.HeaderText = "序列号";
+            this.ms_sncode.MinimumWidth = 8;
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.ReadOnly = true;
+            this.ms_sncode.Width = 130;
+            // 
+            // ps_linecode
+            // 
+            this.ps_linecode.DataPropertyName = "ps_linecode";
+            this.ps_linecode.HeaderText = "线体";
+            this.ps_linecode.MinimumWidth = 8;
+            this.ps_linecode.Name = "ps_linecode";
+            this.ps_linecode.ReadOnly = true;
+            this.ps_linecode.Width = 150;
+            // 
+            // ps_processcode
+            // 
+            this.ps_processcode.DataPropertyName = "ps_processcode";
+            this.ps_processcode.HeaderText = "机台名称";
+            this.ps_processcode.MinimumWidth = 8;
+            this.ps_processcode.Name = "ps_processcode";
+            this.ps_processcode.ReadOnly = true;
+            this.ps_processcode.Width = 190;
+            // 
+            // ps_table
+            // 
+            this.ps_table.DataPropertyName = "ps_table";
+            this.ps_table.HeaderText = "面别";
+            this.ps_table.MinimumWidth = 8;
+            this.ps_table.Name = "ps_table";
+            this.ps_table.ReadOnly = true;
+            this.ps_table.Width = 50;
+            // 
+            // psl_location
+            // 
+            this.psl_location.DataPropertyName = "psl_location";
+            this.psl_location.HeaderText = "站位编号";
+            this.psl_location.MinimumWidth = 8;
+            this.psl_location.Name = "psl_location";
+            this.psl_location.ReadOnly = true;
+            this.psl_location.Width = 80;
+            // 
+            // psl_bomlocation
+            // 
+            this.psl_bomlocation.DataPropertyName = "psl_bomlocation";
+            this.psl_bomlocation.HeaderText = "元件位置";
+            this.psl_bomlocation.MinimumWidth = 8;
+            this.psl_bomlocation.Name = "psl_bomlocation";
+            this.psl_bomlocation.ReadOnly = true;
+            this.psl_bomlocation.Width = 210;
+            // 
+            // psl_prodcode
+            // 
+            this.psl_prodcode.DataPropertyName = "psl_prodcode";
+            this.psl_prodcode.HeaderText = "物料编号";
+            this.psl_prodcode.MinimumWidth = 8;
+            this.psl_prodcode.Name = "psl_prodcode";
+            this.psl_prodcode.ReadOnly = true;
+            this.psl_prodcode.Width = 140;
+            // 
+            // psl_baseqty
+            // 
+            this.psl_baseqty.DataPropertyName = "psl_baseqty";
+            this.psl_baseqty.HeaderText = "单位用量";
+            this.psl_baseqty.MinimumWidth = 8;
+            this.psl_baseqty.Name = "psl_baseqty";
+            this.psl_baseqty.ReadOnly = true;
+            this.psl_baseqty.Width = 60;
+            // 
+            // ReelRemark
+            // 
+            this.ReelRemark.DataPropertyName = "ReelRemark";
+            this.ReelRemark.HeaderText = "元件信息备注";
+            this.ReelRemark.MinimumWidth = 8;
+            this.ReelRemark.Name = "ReelRemark";
+            this.ReelRemark.Width = 150;
+            // 
+            // ReelNum
+            // 
+            this.ReelNum.DataPropertyName = "ReelNum";
+            this.ReelNum.HeaderText = "补料数量";
+            this.ReelNum.MinimumWidth = 8;
+            this.ReelNum.Name = "ReelNum";
+            this.ReelNum.Visible = false;
+            this.ReelNum.Width = 80;
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "rn";
@@ -316,7 +420,7 @@
             this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.SNDetails.Location = new System.Drawing.Point(0, 0);
             this.SNDetails.Name = "SNDetails";
-            this.SNDetails.Size = new System.Drawing.Size(1600, 123);
+            this.SNDetails.Size = new System.Drawing.Size(1280, 123);
             this.SNDetails.TabIndex = 27;
             this.SNDetails.TabStop = false;
             this.SNDetails.Text = "产品序列信息";
@@ -347,16 +451,16 @@
             this.tableLayoutPanel1.RowCount = 1;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 83F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1594, 83);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1274, 83);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // productName
             // 
             this.productName.AutoSize = true;
             this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(1005, 0);
+            this.productName.Location = new System.Drawing.Point(807, 0);
             this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(586, 83);
+            this.productName.Size = new System.Drawing.Size(464, 83);
             this.productName.TabIndex = 7;
             this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -364,9 +468,9 @@
             // 
             this.productCode.AutoSize = true;
             this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(693, 0);
+            this.productCode.Location = new System.Drawing.Point(557, 0);
             this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(204, 83);
+            this.productCode.Size = new System.Drawing.Size(162, 83);
             this.productCode.TabIndex = 6;
             this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -374,9 +478,9 @@
             // 
             this.workOrder.AutoSize = true;
             this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(399, 0);
+            this.workOrder.Location = new System.Drawing.Point(321, 0);
             this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(186, 83);
+            this.workOrder.Size = new System.Drawing.Size(148, 83);
             this.workOrder.TabIndex = 5;
             this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -384,9 +488,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(903, 0);
+            this.label4.Location = new System.Drawing.Point(725, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(96, 83);
+            this.label4.Size = new System.Drawing.Size(76, 83);
             this.label4.TabIndex = 3;
             this.label4.Text = "产品名称: ";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -397,7 +501,7 @@
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Location = new System.Drawing.Point(3, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(96, 83);
+            this.label1.Size = new System.Drawing.Size(76, 83);
             this.label1.TabIndex = 0;
             this.label1.Text = "序列号: ";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -406,9 +510,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(591, 0);
+            this.label3.Location = new System.Drawing.Point(475, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(96, 83);
+            this.label3.Size = new System.Drawing.Size(76, 83);
             this.label3.TabIndex = 2;
             this.label3.Text = "产品编号: ";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -417,9 +521,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(297, 0);
+            this.label2.Location = new System.Drawing.Point(239, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(96, 83);
+            this.label2.Size = new System.Drawing.Size(76, 83);
             this.label2.TabIndex = 1;
             this.label2.Text = "工单: ";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -428,121 +532,17 @@
             // 
             this.serialNumber.AutoSize = true;
             this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(105, 0);
+            this.serialNumber.Location = new System.Drawing.Point(85, 0);
             this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(186, 83);
+            this.serialNumber.Size = new System.Drawing.Size(148, 83);
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // rn
-            // 
-            this.rn.DataPropertyName = "rn";
-            this.rn.HeaderText = "序号";
-            this.rn.MinimumWidth = 8;
-            this.rn.Name = "rn";
-            this.rn.Width = 50;
-            // 
-            // isHandReel
-            // 
-            this.isHandReel.HeaderText = "是否手补料";
-            this.isHandReel.MinimumWidth = 8;
-            this.isHandReel.Name = "isHandReel";
-            this.isHandReel.Width = 50;
-            // 
-            // ms_sncode
-            // 
-            this.ms_sncode.DataPropertyName = "ms_sncode";
-            this.ms_sncode.HeaderText = "序列号";
-            this.ms_sncode.MinimumWidth = 8;
-            this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.ReadOnly = true;
-            this.ms_sncode.Width = 130;
-            // 
-            // ps_linecode
-            // 
-            this.ps_linecode.DataPropertyName = "ps_linecode";
-            this.ps_linecode.HeaderText = "线体";
-            this.ps_linecode.MinimumWidth = 8;
-            this.ps_linecode.Name = "ps_linecode";
-            this.ps_linecode.ReadOnly = true;
-            this.ps_linecode.Width = 150;
-            // 
-            // ps_processcode
-            // 
-            this.ps_processcode.DataPropertyName = "ps_processcode";
-            this.ps_processcode.HeaderText = "机台名称";
-            this.ps_processcode.MinimumWidth = 8;
-            this.ps_processcode.Name = "ps_processcode";
-            this.ps_processcode.ReadOnly = true;
-            this.ps_processcode.Width = 190;
-            // 
-            // ps_table
-            // 
-            this.ps_table.DataPropertyName = "ps_table";
-            this.ps_table.HeaderText = "面别";
-            this.ps_table.MinimumWidth = 8;
-            this.ps_table.Name = "ps_table";
-            this.ps_table.ReadOnly = true;
-            this.ps_table.Width = 50;
-            // 
-            // psl_location
-            // 
-            this.psl_location.DataPropertyName = "psl_location";
-            this.psl_location.HeaderText = "站位编号";
-            this.psl_location.MinimumWidth = 8;
-            this.psl_location.Name = "psl_location";
-            this.psl_location.ReadOnly = true;
-            this.psl_location.Width = 80;
-            // 
-            // psl_bomlocation
-            // 
-            this.psl_bomlocation.DataPropertyName = "psl_bomlocation";
-            this.psl_bomlocation.HeaderText = "元件位置";
-            this.psl_bomlocation.MinimumWidth = 8;
-            this.psl_bomlocation.Name = "psl_bomlocation";
-            this.psl_bomlocation.ReadOnly = true;
-            this.psl_bomlocation.Width = 210;
-            // 
-            // psl_prodcode
-            // 
-            this.psl_prodcode.DataPropertyName = "psl_prodcode";
-            this.psl_prodcode.HeaderText = "物料编号";
-            this.psl_prodcode.MinimumWidth = 8;
-            this.psl_prodcode.Name = "psl_prodcode";
-            this.psl_prodcode.ReadOnly = true;
-            this.psl_prodcode.Width = 140;
-            // 
-            // psl_baseqty
-            // 
-            this.psl_baseqty.DataPropertyName = "psl_baseqty";
-            this.psl_baseqty.HeaderText = "单位用量";
-            this.psl_baseqty.MinimumWidth = 8;
-            this.psl_baseqty.Name = "psl_baseqty";
-            this.psl_baseqty.ReadOnly = true;
-            this.psl_baseqty.Width = 60;
-            // 
-            // ReelRemark
-            // 
-            this.ReelRemark.DataPropertyName = "ReelRemark";
-            this.ReelRemark.HeaderText = "元件信息备注";
-            this.ReelRemark.MinimumWidth = 8;
-            this.ReelRemark.Name = "ReelRemark";
-            this.ReelRemark.Width = 150;
-            // 
-            // ReelNum
-            // 
-            this.ReelNum.DataPropertyName = "ReelNum";
-            this.ReelNum.HeaderText = "补料数量";
-            this.ReelNum.MinimumWidth = 8;
-            this.ReelNum.Name = "ReelNum";
-            this.ReelNum.Visible = false;
-            this.ReelNum.Width = 80;
-            // 
             // Make_HandFeedRegistration
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1600, 900);
+            this.ClientSize = new System.Drawing.Size(1280, 720);
             this.Controls.Add(this.containerBox);
             this.Controls.Add(this.SNDetails);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));

UAS_MES_JWS/FunctionCode/Make/Make_QueryMac.Designer.cs

@@ -41,32 +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.panel1.SuspendLayout();
             this.snDetail.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel3.SuspendLayout();
-            this.result_box.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
+            this.panel2.SuspendLayout();
             this.panel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
+            this.result_box.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
@@ -74,20 +79,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 +115,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 +127,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 +138,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 +149,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 +160,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 +172,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 +184,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 +196,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,26 +208,186 @@
             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
             // 
+            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, 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;
             // 
+            // 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;
@@ -235,13 +397,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(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";
             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 +418,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(114, 587);
+            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;
@@ -268,63 +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(27, 783);
-            this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.GetSNCode_Label.Name = "GetSNCode_Label";
-            this.GetSNCode_Label.Size = new System.Drawing.Size(114, 41);
-            this.GetSNCode_Label.TabIndex = 134;
-            this.GetSNCode_Label.Text = "序列号";
-            // 
-            // result_box
-            // 
-            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.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.Name = "res";
-            this.res.Size = new System.Drawing.Size(1193, 292);
-            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.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.TabIndex = 136;
-            this.dgv.Visible = false;
-            // 
             // MacDetail
             // 
             this.MacDetail.HeaderText = "MAC信息";
@@ -356,7 +461,7 @@
             this.testName.MinimumWidth = 8;
             this.testName.Name = "testName";
             this.testName.ReadOnly = true;
-            this.testName.Width = 118;
+            this.testName.Width = 116;
             // 
             // result
             // 
@@ -365,18 +470,7 @@
             this.result.MinimumWidth = 8;
             this.result.Name = "result";
             this.result.ReadOnly = true;
-            this.result.Width = 118;
-            // 
-            // 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.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(799, 866);
-            this.panel4.TabIndex = 138;
+            this.result.Width = 116;
             // 
             // OperatResult
             // 
@@ -384,9 +478,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,69 +493,29 @@
             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 = "清除";
             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 = 200;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
-            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
-            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
-            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.Width = 150;
-            // 
             // 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);
@@ -471,9 +525,10 @@
             this.tableLayoutPanel1.PerformLayout();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
-            this.result_box.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
+            this.panel2.ResumeLayout(false);
             this.panel4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
+            this.result_box.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -488,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;
@@ -503,12 +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 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()
@@ -99,6 +103,8 @@ namespace UAS_MES_NEW.Make
 
                 GetSNCode.Focus();
                 GetSNCode.SelectAll();
+
+                Query_Click(null, null);
             }
         }
         
@@ -147,9 +153,47 @@ namespace UAS_MES_NEW.Make
                 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";
+
+                snCollectionBox1.Focus();
+                snCollectionBox1.SelectAll();
+            }
+
+            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);
@@ -158,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,43 +120,58 @@
   <metadata name="tableLayoutPanel1.Locked" 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>
   <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">
@@ -177,39 +192,39 @@
   <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>

UAS_MES_XMW/FunctionCode/Make/Make_ServerListen.Designer.cs

@@ -33,12 +33,12 @@
             this.IpPort = new System.Windows.Forms.TextBox();
             this.IpPortLab = new System.Windows.Forms.Label();
             this.SettingBox = new System.Windows.Forms.Panel();
+            this.Template = new System.Windows.Forms.ComboBox();
+            this.ModelLab = new System.Windows.Forms.Label();
             this.TestPrint = new System.Windows.Forms.Button();
             this.confirmPrint = new System.Windows.Forms.Button();
             this.PrintList = new System.Windows.Forms.ComboBox();
             this.PrintListLab = new System.Windows.Forms.Label();
-            this.ModelLab = new System.Windows.Forms.Label();
-            this.Model = new System.Windows.Forms.ComboBox();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -96,7 +96,7 @@
             // 
             // SettingBox
             // 
-            this.SettingBox.Controls.Add(this.Model);
+            this.SettingBox.Controls.Add(this.Template);
             this.SettingBox.Controls.Add(this.ModelLab);
             this.SettingBox.Controls.Add(this.TestPrint);
             this.SettingBox.Controls.Add(this.confirmPrint);
@@ -112,6 +112,25 @@
             this.SettingBox.Size = new System.Drawing.Size(1280, 194);
             this.SettingBox.TabIndex = 98;
             // 
+            // Template
+            // 
+            this.Template.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Template.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Template.FormattingEnabled = true;
+            this.Template.Location = new System.Drawing.Point(108, 82);
+            this.Template.Name = "Template";
+            this.Template.Size = new System.Drawing.Size(309, 32);
+            this.Template.TabIndex = 99;
+            // 
+            // ModelLab
+            // 
+            this.ModelLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ModelLab.Location = new System.Drawing.Point(22, 84);
+            this.ModelLab.Name = "ModelLab";
+            this.ModelLab.Size = new System.Drawing.Size(117, 28);
+            this.ModelLab.TabIndex = 98;
+            this.ModelLab.Text = "打印模板：";
+            // 
             // TestPrint
             // 
             this.TestPrint.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -153,25 +172,6 @@
             this.PrintListLab.TabIndex = 94;
             this.PrintListLab.Text = "打印机列表：";
             // 
-            // ModelLab
-            // 
-            this.ModelLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ModelLab.Location = new System.Drawing.Point(22, 84);
-            this.ModelLab.Name = "ModelLab";
-            this.ModelLab.Size = new System.Drawing.Size(117, 28);
-            this.ModelLab.TabIndex = 98;
-            this.ModelLab.Text = "打印模板：";
-            // 
-            // Model
-            // 
-            this.Model.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Model.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Model.FormattingEnabled = true;
-            this.Model.Location = new System.Drawing.Point(108, 82);
-            this.Model.Name = "Model";
-            this.Model.Size = new System.Drawing.Size(309, 32);
-            this.Model.TabIndex = 99;
-            // 
             // OperatResult
             // 
             this.OperatResult.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -355,6 +355,6 @@
         private System.Windows.Forms.Button confirmPrint;
         private System.Windows.Forms.Button TestPrint;
         private System.Windows.Forms.Label ModelLab;
-        private System.Windows.Forms.ComboBox Model;
+        private System.Windows.Forms.ComboBox Template;
     }
 }

UAS_MES_XMW/FunctionCode/Make/Make_ServerListen.cs

@@ -34,6 +34,7 @@ namespace UAS_MES_NEW.Make
         private int currCount = 0;
 
         private LabelPrinter _printer;
+        private List<string> pahtArr = new List<string>() { };
 
         private void Make_ServerListen_Load(object sender, EventArgs e)
         {
@@ -49,29 +50,44 @@ namespace UAS_MES_NEW.Make
                 PrintList.Items.Add(printerName);
             }
 
-            StringBuilder strB = new StringBuilder();
-            dt = (DataTable)dh.ExecuteSql($@"SELECT la_softtype FROM label WHERE la_templatetype = '机身标' AND la_statuscode = 'AUDITED'", "select");
-            if (dt.Rows.Count > 0)
+            try
             {
-                foreach (DataRow dr in dt.Rows)
-                {
-                    strB.Append(dr["la_softtype"].ToString());
-                }
-                string[] arr = strB.ToString().Split(';');
-
-                foreach(string s in arr)
+                dt = (DataTable)dh.ExecuteSql($@"SELECT la_softtype FROM label WHERE la_templatetype = '机身标' AND la_statuscode = 'AUDITED'", "select");
+                if (dt.Rows.Count > 0)
                 {
-                    dt = (DataTable)dh.ExecuteSql($"select FP_PATH, FP_DATE, FP_NAME from FILEPATH where fp_id='{s}'", "select");
-                    if (dt.Rows.Count > 0)
+                    foreach (DataRow dr in dt.Rows)
                     {
-                        string fp_path = dt.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
-                        string fp_name = dt.Rows[0]["fp_name"].ToString();
-                        WebClient webCli = new WebClient();
-                        webCli.DownloadFile("http://192.168.1.86:8099/mes/" + fp_path, Application.StartupPath + fp_name);
-                        Model.Items.Add(fp_name);
+                        string[] arr = dr["la_softtype"].ToString().Trim().Split(';');
+
+                        foreach (string s in arr)
+                        {
+                            if (string.IsNullOrEmpty(s)) continue;
+
+                            dt = (DataTable)dh.ExecuteSql($"select FP_PATH, FP_DATE, FP_NAME from FILEPATH where fp_id = '{s}'", "select");
+                            if (dt.Rows.Count > 0)
+                            {
+                                string fp_path = dt.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
+                                string fp_name = dt.Rows[0]["fp_name"].ToString();
+                                Template.Items.Add(fp_name);
+
+                                string outPath = Path.Combine(Application.StartupPath, fp_name);
+                                using (WebClient client = new WebClient())
+                                {
+                                    //client.DownloadFile($"http://192.168.1.86:8099/mes/{fp_path}", outPath);
+                                    //webCli.DownloadFile("http://erp.ubtob.net:11791/" + fp_path, outPath);
+
+                                    pahtArr.Add(outPath);
+                                }
+                            }
+                        }
                     }
                 }
             }
+            catch (Exception ex)
+            {
+                ShowMsg(0, $"获取系统机身标模板失败,请检查上传模板,{ex.Message}");
+            }
+            
 
             try
             {
@@ -149,6 +165,14 @@ namespace UAS_MES_NEW.Make
                 return;
             }*/
 
+            if (Template.SelectedIndex == -1)
+            {
+                Template.Focus();
+                Template.SelectAll();
+                ShowMsg(0, "请选择打印模板");
+                return;
+            }
+
             if (PrintList.SelectedIndex == -1)
             {
                 PrintList.Focus();
@@ -161,8 +185,12 @@ namespace UAS_MES_NEW.Make
             {
                 confirmPrint.Text = "取消打印机";
                 PrintList.Enabled = false;
+                Template.Enabled = false;
+
+                string str1 = Application.StartupPath + "\\机身标 (1).btw";
 
-                _printer = new LabelPrinter(Application.StartupPath + "\\机身标 (1).btw");
+                string str = pahtArr[Template.SelectedIndex];
+                _printer = new LabelPrinter(str);
                 _printer.SetPrinter(PrintList.Text);
                 _printer.PrintError += (s, args) =>
                 {
@@ -183,6 +211,7 @@ namespace UAS_MES_NEW.Make
             {
                 confirmPrint.Text = "确认打印机";
                 PrintList.Enabled = true;
+                Template.Enabled = true;
 
                 if (_printer != null)
                 {
@@ -747,7 +776,7 @@ namespace UAS_MES_NEW.Make
                 get { return _templateFolder; }
                 set
                 {
-                    if (!File.Exists(value)) throw new DirectoryNotFoundException($"模板文件夹不存在: {value}");
+                    if (!File.Exists(value)) throw new DirectoryNotFoundException($"模板文件不存在: {value}");
                     _templateFolder = value;
                 }
             }