修改读取安卓系统数据

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -44,6 +44,22 @@ namespace UAS_MES_NEW.Make
             this.CheckItemDGV = new System.Windows.Forms.DataGridView();
             this.label6 = new System.Windows.Forms.Label();
             this.WatchPath = new System.Windows.Forms.TextBox();
+            this.PSN = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.MAC = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.BT = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.IMEI1 = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
+            this.IMEI2 = new System.Windows.Forms.Label();
+            this.label17 = new System.Windows.Forms.Label();
+            this.GoogleKey = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.Aging = new System.Windows.Forms.Label();
+            this.label21 = new System.Windows.Forms.Label();
+            this.Version = new System.Windows.Forms.Label();
+            this.label23 = 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();
@@ -51,6 +67,9 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ReSet = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
             this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -59,6 +78,9 @@ namespace UAS_MES_NEW.Make
             this.std_bt = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.std_imei1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.std_imei2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_googlekey = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_videotest = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_version = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
@@ -69,7 +91,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(1258, 38);
+            this.pr_detail.Location = new System.Drawing.Point(1258, 11);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -90,7 +112,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(204, 130);
+            this.remain_qty.Location = new System.Drawing.Point(204, 103);
             this.remain_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.remain_qty.Name = "remain_qty";
             this.remain_qty.Size = new System.Drawing.Size(0, 41);
@@ -100,7 +122,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.mcd_okqty.Location = new System.Drawing.Point(724, 130);
+            this.mcd_okqty.Location = new System.Drawing.Point(724, 103);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(0, 41);
@@ -110,7 +132,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(724, 38);
+            this.ma_prodcode.Location = new System.Drawing.Point(724, 11);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 41);
@@ -120,7 +142,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(204, 38);
+            this.ma_code.Location = new System.Drawing.Point(204, 11);
             this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code.Name = "ma_code";
             this.ma_code.Size = new System.Drawing.Size(0, 41);
@@ -130,7 +152,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(574, 130);
+            this.label5.Location = new System.Drawing.Point(574, 103);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(210, 41);
@@ -141,7 +163,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label4.Location = new System.Drawing.Point(54, 130);
+            this.label4.Location = new System.Drawing.Point(54, 103);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(114, 41);
@@ -152,7 +174,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(1102, 38);
+            this.label3.Location = new System.Drawing.Point(1102, 11);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
@@ -163,7 +185,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label2.Location = new System.Drawing.Point(570, 38);
+            this.label2.Location = new System.Drawing.Point(570, 11);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(146, 41);
@@ -174,7 +196,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(50, 38);
+            this.label1.Location = new System.Drawing.Point(50, 11);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -192,11 +214,14 @@ namespace UAS_MES_NEW.Make
             this.std_mac,
             this.std_bt,
             this.std_imei1,
-            this.std_imei2});
-            this.CheckItemDGV.Location = new System.Drawing.Point(57, 199);
+            this.std_imei2,
+            this.std_googlekey,
+            this.std_videotest,
+            this.std_version});
+            this.CheckItemDGV.Location = new System.Drawing.Point(12, 154);
             this.CheckItemDGV.Name = "CheckItemDGV";
             this.CheckItemDGV.RowTemplate.Height = 37;
-            this.CheckItemDGV.Size = new System.Drawing.Size(1128, 562);
+            this.CheckItemDGV.Size = new System.Drawing.Size(712, 607);
             this.CheckItemDGV.TabIndex = 33;
             this.CheckItemDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.CheckItemDGV_CellPainting);
             // 
@@ -219,6 +244,175 @@ namespace UAS_MES_NEW.Make
             this.WatchPath.TabIndex = 36;
             this.WatchPath.Text = "/storage/emulated/0/elink/";
             // 
+            // PSN
+            // 
+            this.PSN.AutoSize = true;
+            this.PSN.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.PSN.Location = new System.Drawing.Point(980, 161);
+            this.PSN.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PSN.Name = "PSN";
+            this.PSN.Size = new System.Drawing.Size(0, 41);
+            this.PSN.TabIndex = 39;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label8.Location = new System.Drawing.Point(761, 161);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(62, 41);
+            this.label8.TabIndex = 38;
+            this.label8.Text = "SN";
+            // 
+            // MAC
+            // 
+            this.MAC.AutoSize = true;
+            this.MAC.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.MAC.Location = new System.Drawing.Point(980, 234);
+            this.MAC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.MAC.Name = "MAC";
+            this.MAC.Size = new System.Drawing.Size(0, 41);
+            this.MAC.TabIndex = 41;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label11.Location = new System.Drawing.Point(761, 234);
+            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(93, 41);
+            this.label11.TabIndex = 40;
+            this.label11.Text = "MAC";
+            // 
+            // BT
+            // 
+            this.BT.AutoSize = true;
+            this.BT.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.BT.Location = new System.Drawing.Point(980, 312);
+            this.BT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BT.Name = "BT";
+            this.BT.Size = new System.Drawing.Size(0, 41);
+            this.BT.TabIndex = 43;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label13.Location = new System.Drawing.Point(761, 312);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(56, 41);
+            this.label13.TabIndex = 42;
+            this.label13.Text = "BT";
+            // 
+            // IMEI1
+            // 
+            this.IMEI1.AutoSize = true;
+            this.IMEI1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.IMEI1.Location = new System.Drawing.Point(980, 386);
+            this.IMEI1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.IMEI1.Name = "IMEI1";
+            this.IMEI1.Size = new System.Drawing.Size(0, 41);
+            this.IMEI1.TabIndex = 45;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label15.Location = new System.Drawing.Point(761, 386);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(104, 41);
+            this.label15.TabIndex = 44;
+            this.label15.Text = "IMEI1";
+            // 
+            // IMEI2
+            // 
+            this.IMEI2.AutoSize = true;
+            this.IMEI2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.IMEI2.Location = new System.Drawing.Point(980, 458);
+            this.IMEI2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.IMEI2.Name = "IMEI2";
+            this.IMEI2.Size = new System.Drawing.Size(0, 41);
+            this.IMEI2.TabIndex = 47;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label17.Location = new System.Drawing.Point(761, 458);
+            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(104, 41);
+            this.label17.TabIndex = 46;
+            this.label17.Text = "IMEI2";
+            // 
+            // GoogleKey
+            // 
+            this.GoogleKey.AutoSize = true;
+            this.GoogleKey.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.GoogleKey.Location = new System.Drawing.Point(980, 529);
+            this.GoogleKey.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.GoogleKey.Name = "GoogleKey";
+            this.GoogleKey.Size = new System.Drawing.Size(0, 41);
+            this.GoogleKey.TabIndex = 49;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label19.Location = new System.Drawing.Point(761, 529);
+            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(184, 41);
+            this.label19.TabIndex = 48;
+            this.label19.Text = "GoogleKey";
+            // 
+            // Aging
+            // 
+            this.Aging.AutoSize = true;
+            this.Aging.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Aging.Location = new System.Drawing.Point(980, 603);
+            this.Aging.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Aging.Name = "Aging";
+            this.Aging.Size = new System.Drawing.Size(0, 41);
+            this.Aging.TabIndex = 51;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label21.Location = new System.Drawing.Point(761, 603);
+            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(146, 41);
+            this.label21.TabIndex = 50;
+            this.label21.Text = "老化时长";
+            // 
+            // Version
+            // 
+            this.Version.AutoSize = true;
+            this.Version.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Version.Location = new System.Drawing.Point(981, 668);
+            this.Version.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Version.MaximumSize = new System.Drawing.Size(360, 0);
+            this.Version.Name = "Version";
+            this.Version.Size = new System.Drawing.Size(0, 41);
+            this.Version.TabIndex = 53;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label23.Location = new System.Drawing.Point(761, 668);
+            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(146, 41);
+            this.label23.TabIndex = 52;
+            this.label23.Text = "软件版本";
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@@ -245,6 +439,7 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn3.MinimumWidth = 460;
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
             this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Visible = false;
             // 
             // dataGridViewTextBoxColumn4
             // 
@@ -252,6 +447,7 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn4.HeaderText = "故障代码";
             this.dataGridViewTextBoxColumn4.MinimumWidth = 200;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Visible = false;
             this.dataGridViewTextBoxColumn4.Width = 200;
             // 
             // dataGridViewTextBoxColumn5
@@ -260,6 +456,7 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn5.HeaderText = "BT";
             this.dataGridViewTextBoxColumn5.MinimumWidth = 100;
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Visible = false;
             this.dataGridViewTextBoxColumn5.Width = 200;
             // 
             // dataGridViewTextBoxColumn6
@@ -268,6 +465,7 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn6.HeaderText = "IMEI1";
             this.dataGridViewTextBoxColumn6.MinimumWidth = 100;
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Visible = false;
             // 
             // dataGridViewTextBoxColumn7
             // 
@@ -275,6 +473,28 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn7.HeaderText = "IMEI2";
             this.dataGridViewTextBoxColumn7.MinimumWidth = 100;
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "std_googlekey";
+            this.dataGridViewTextBoxColumn8.HeaderText = "GoogleKey";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "std_videotest";
+            this.dataGridViewTextBoxColumn9.HeaderText = "老化测试";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "std_version";
+            this.dataGridViewTextBoxColumn10.HeaderText = "软件版本";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.Visible = false;
             // 
             // ReSet
             // 
@@ -311,6 +531,7 @@ namespace UAS_MES_NEW.Make
             this.std_sn.MinimumWidth = 100;
             this.std_sn.Name = "std_sn";
             this.std_sn.ReadOnly = true;
+            this.std_sn.Visible = false;
             this.std_sn.Width = 200;
             // 
             // std_mac
@@ -319,6 +540,7 @@ namespace UAS_MES_NEW.Make
             this.std_mac.HeaderText = "MAC";
             this.std_mac.MinimumWidth = 100;
             this.std_mac.Name = "std_mac";
+            this.std_mac.Visible = false;
             this.std_mac.Width = 200;
             // 
             // std_bt
@@ -327,6 +549,7 @@ namespace UAS_MES_NEW.Make
             this.std_bt.HeaderText = "BT";
             this.std_bt.MinimumWidth = 100;
             this.std_bt.Name = "std_bt";
+            this.std_bt.Visible = false;
             this.std_bt.Width = 200;
             // 
             // std_imei1
@@ -335,6 +558,7 @@ namespace UAS_MES_NEW.Make
             this.std_imei1.HeaderText = "IMEI1";
             this.std_imei1.MinimumWidth = 100;
             this.std_imei1.Name = "std_imei1";
+            this.std_imei1.Visible = false;
             // 
             // std_imei2
             // 
@@ -342,11 +566,33 @@ namespace UAS_MES_NEW.Make
             this.std_imei2.HeaderText = "IMEI2";
             this.std_imei2.MinimumWidth = 100;
             this.std_imei2.Name = "std_imei2";
+            this.std_imei2.Visible = false;
+            // 
+            // std_googlekey
+            // 
+            this.std_googlekey.DataPropertyName = "std_googlekey";
+            this.std_googlekey.HeaderText = "GoogleKey";
+            this.std_googlekey.Name = "std_googlekey";
+            this.std_googlekey.Visible = false;
+            // 
+            // std_videotest
+            // 
+            this.std_videotest.DataPropertyName = "std_videotest";
+            this.std_videotest.HeaderText = "老化测试";
+            this.std_videotest.Name = "std_videotest";
+            this.std_videotest.Visible = false;
+            // 
+            // std_version
+            // 
+            this.std_version.DataPropertyName = "std_version";
+            this.std_version.HeaderText = "软件版本";
+            this.std_version.Name = "std_version";
+            this.std_version.Visible = false;
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1102, 130);
+            this.StepCount.Location = new System.Drawing.Point(1109, 100);
             this.StepCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StepCount.Name = "StepCount";
             this.StepCount.Size = new System.Drawing.Size(176, 44);
@@ -373,10 +619,10 @@ namespace UAS_MES_NEW.Make
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1204, 199);
+            this.OperateResult.Location = new System.Drawing.Point(1477, 154);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(538, 562);
+            this.OperateResult.Size = new System.Drawing.Size(282, 607);
             this.OperateResult.TabIndex = 27;
             this.OperateResult.Text = "";
             // 
@@ -385,6 +631,22 @@ namespace UAS_MES_NEW.Make
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1772, 866);
+            this.Controls.Add(this.Version);
+            this.Controls.Add(this.label23);
+            this.Controls.Add(this.Aging);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.GoogleKey);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.IMEI2);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.IMEI1);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.BT);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.MAC);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.PSN);
+            this.Controls.Add(this.label8);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.WatchPath);
             this.Controls.Add(this.ReSet);
@@ -438,6 +700,28 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.TextBox WatchPath;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.Label PSN;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label MAC;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label BT;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label IMEI1;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.Label IMEI2;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label GoogleKey;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.Label Aging;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.Label Version;
+        private System.Windows.Forms.Label label23;
         private System.Windows.Forms.DataGridViewTextBoxColumn std_class;
         private System.Windows.Forms.DataGridViewTextBoxColumn std_testresult;
         private System.Windows.Forms.DataGridViewTextBoxColumn std_sn;
@@ -445,8 +729,8 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.DataGridViewTextBoxColumn std_bt;
         private System.Windows.Forms.DataGridViewTextBoxColumn std_imei1;
         private System.Windows.Forms.DataGridViewTextBoxColumn std_imei2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_googlekey;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_videotest;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_version;
     }
 }

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.cs

@@ -55,6 +55,16 @@ namespace UAS_MES_NEW.Make
             asc.controlAutoSize(this);
         }
 
+        private void LoadCollectedNum()
+        {
+            sql.Clear();
+            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+            sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.SetFormValue(Controls, dt);
+        }
+
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
             //判断是enter事件
@@ -69,6 +79,8 @@ namespace UAS_MES_NEW.Make
                 {
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                     {
+                        ma_code.Text = omakeCode;
+                        LoadCollectedNum();
                         string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
                         DataTable dt = new DataTable();
                         BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
@@ -84,29 +96,37 @@ namespace UAS_MES_NEW.Make
                         dt.Columns[4].ColumnName = "std_bt";
                         dt.Columns[5].ColumnName = "std_imei1";
                         dt.Columns[6].ColumnName = "std_imei2";
+                        dt.Columns[7].ColumnName = "std_googlekey";
+                        dt.Columns[8].ColumnName = "std_videotest";
+                        dt.Columns[9].ColumnName = "std_version";
+                        dt.DefaultView.Sort = "std_testresult";
                         CheckItemDGV.DataSource = dt;
                         bool Result = true;
-                        string MAC = "";
-                        string BT = "";
-                        string IMEI1 = "";
-                        string IMEI2 = "";
-                        string PSN = "";
+
                         for (int i = 0; i < dt.Rows.Count; i++)
                         {
-                            PSN = dt.Rows[0]["std_sn"].ToString();
-                            MAC = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
-                            BT = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
-                            IMEI1 = dt.Rows[0]["std_imei1"].ToString().Replace("null", "");
-                            IMEI2 = dt.Rows[0]["std_imei2"].ToString().Replace("null", "");
+                            PSN.Text = dt.Rows[0]["std_sn"].ToString();
+                            MAC.Text = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
+                            BT.Text = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
+                            IMEI1.Text = dt.Rows[0]["std_imei1"].ToString().Replace("null", "").Replace("unknow", "");
+                            IMEI2.Text = dt.Rows[0]["std_imei2"].ToString().Replace("null", "").Replace("unknow", "");
+                            GoogleKey.Text = dt.Rows[0]["std_googlekey"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
+                            Aging.Text = dt.Rows[0]["std_videotest"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
+                            Version.Text = dt.Rows[0]["std_version"].ToString().Replace("null", "").Replace("unknow", "");
                             if (dt.Rows[i]["std_testresult"].ToString() != "OK" || dt.Rows[i]["std_testresult"].ToString() == "NOTEST")
                             {
                                 Result = false;
                             }
                             dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','','" + dt.Rows[i]["std_testresult"].ToString() + "','')", "insert");
                         }
+                        if (Aging.Text == "")
+                        {
+                            OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
+                            return;
+                        }
                         if (Result)
                         {
-                            if (LogicHandler.snChangeAndBurn(sncode.Text, PSN, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1, IMEI2, "", "", "", "", "", "", "", MAC, BT, "", "", "", out oErrorMessage))
+                            if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
                             {
                                 //提示正确返回时传递的信息
                                 if (oErrorMessage.Contains("AFTERSUCCESS"))
@@ -124,7 +144,7 @@ namespace UAS_MES_NEW.Make
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
                                 //SN核对成功
                                 //>> 请输入SN
-                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN + "\n", Color.Green, sncode);
+                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN.Text + "\n", Color.Green, sncode);
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 SetCheck set = new SetCheck("OK", Color.Green);
                                 BaseUtil.SetFormCenter(set);

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.resx

@@ -138,25 +138,13 @@
   <metadata name="std_imei2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="std_class.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="std_testresult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_googlekey.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="std_sn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="std_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_videotest.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="std_bt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="std_imei1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="std_imei2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>