测试文件上传修改

UAS_AutoUpdate/CheckUpdateWindow.cs

@@ -54,7 +54,7 @@ namespace UAS_AutoUpdate
             try
             {
                 WebClient wc = new WebClient();
-                wc.Credentials = new NetworkCredential("vsftpd", "vsftpd5cd39046UJ");
+                wc.Credentials = new NetworkCredential("vsftpd", "vsftpd2cd68017bf");
                 wc.DownloadFile(new Uri(GetCacheData(ConfigFile, "ServerConfigPath").ToString()), ServerConfigFile);
                 //服务器获取的配置文件
                 Version ver1 = new Version(GetCacheData(ServerConfigFile, "Version").ToString());

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -41,17 +41,6 @@ namespace UAS_MES_NEW.Make
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.CheckItemDGV = new System.Windows.Forms.DataGridView();
-            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_sn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            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.label6 = new System.Windows.Forms.Label();
             this.WatchPath = new System.Windows.Forms.TextBox();
             this.PSN = new System.Windows.Forms.Label();
@@ -66,7 +55,7 @@ namespace UAS_MES_NEW.Make
             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.battery = 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();
@@ -90,7 +79,6 @@ namespace UAS_MES_NEW.Make
             this.label9 = new System.Windows.Forms.Label();
             this.ram = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).BeginInit();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -209,120 +197,6 @@ namespace UAS_MES_NEW.Make
             this.label1.TabIndex = 18;
             this.label1.Text = "工单编号";
             // 
-            // CheckItemDGV
-            // 
-            this.CheckItemDGV.AllowUserToAddRows = false;
-            this.CheckItemDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.CheckItemDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.std_class,
-            this.std_testresult,
-            this.std_sn,
-            this.std_mac,
-            this.std_bt,
-            this.std_imei1,
-            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.RowHeadersWidth = 82;
-            this.CheckItemDGV.RowTemplate.Height = 37;
-            this.CheckItemDGV.Size = new System.Drawing.Size(712, 607);
-            this.CheckItemDGV.TabIndex = 33;
-            this.CheckItemDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.CheckItemDGV_CellPainting);
-            // 
-            // std_class
-            // 
-            this.std_class.DataPropertyName = "std_class";
-            this.std_class.HeaderText = "检测项";
-            this.std_class.MinimumWidth = 140;
-            this.std_class.Name = "std_class";
-            this.std_class.ReadOnly = true;
-            this.std_class.Width = 150;
-            // 
-            // std_testresult
-            // 
-            this.std_testresult.DataPropertyName = "std_testresult";
-            this.std_testresult.HeaderText = "测试结果";
-            this.std_testresult.MinimumWidth = 150;
-            this.std_testresult.Name = "std_testresult";
-            this.std_testresult.ReadOnly = true;
-            this.std_testresult.Width = 150;
-            // 
-            // std_sn
-            // 
-            this.std_sn.DataPropertyName = "std_sn";
-            this.std_sn.HeaderText = "SN";
-            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
-            // 
-            this.std_mac.DataPropertyName = "std_mac";
-            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
-            // 
-            this.std_bt.DataPropertyName = "std_bt";
-            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
-            // 
-            this.std_imei1.DataPropertyName = "std_imei1";
-            this.std_imei1.HeaderText = "IMEI1";
-            this.std_imei1.MinimumWidth = 100;
-            this.std_imei1.Name = "std_imei1";
-            this.std_imei1.Visible = false;
-            this.std_imei1.Width = 200;
-            // 
-            // std_imei2
-            // 
-            this.std_imei2.DataPropertyName = "std_imei2";
-            this.std_imei2.HeaderText = "IMEI2";
-            this.std_imei2.MinimumWidth = 100;
-            this.std_imei2.Name = "std_imei2";
-            this.std_imei2.Visible = false;
-            this.std_imei2.Width = 200;
-            // 
-            // std_googlekey
-            // 
-            this.std_googlekey.DataPropertyName = "std_googlekey";
-            this.std_googlekey.HeaderText = "GoogleKey";
-            this.std_googlekey.MinimumWidth = 10;
-            this.std_googlekey.Name = "std_googlekey";
-            this.std_googlekey.Visible = false;
-            this.std_googlekey.Width = 200;
-            // 
-            // std_videotest
-            // 
-            this.std_videotest.DataPropertyName = "std_videotest";
-            this.std_videotest.HeaderText = "老化测试";
-            this.std_videotest.MinimumWidth = 10;
-            this.std_videotest.Name = "std_videotest";
-            this.std_videotest.Visible = false;
-            this.std_videotest.Width = 200;
-            // 
-            // std_version
-            // 
-            this.std_version.DataPropertyName = "std_version";
-            this.std_version.HeaderText = "软件版本";
-            this.std_version.MinimumWidth = 10;
-            this.std_version.Name = "std_version";
-            this.std_version.Visible = false;
-            this.std_version.Width = 200;
-            // 
             // label6
             // 
             this.label6.AutoSize = true;
@@ -347,7 +221,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.PSN.AutoSize = true;
             this.PSN.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PSN.Location = new System.Drawing.Point(955, 161);
+            this.PSN.Location = new System.Drawing.Point(253, 170);
             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);
@@ -357,7 +231,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(761, 161);
+            this.label8.Location = new System.Drawing.Point(59, 170);
             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);
@@ -368,7 +242,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.MAC.AutoSize = true;
             this.MAC.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.MAC.Location = new System.Drawing.Point(955, 234);
+            this.MAC.Location = new System.Drawing.Point(253, 243);
             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);
@@ -378,7 +252,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label11.Location = new System.Drawing.Point(761, 234);
+            this.label11.Location = new System.Drawing.Point(59, 243);
             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);
@@ -389,7 +263,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.BT.AutoSize = true;
             this.BT.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.BT.Location = new System.Drawing.Point(955, 299);
+            this.BT.Location = new System.Drawing.Point(253, 308);
             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);
@@ -399,7 +273,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label13.Location = new System.Drawing.Point(761, 299);
+            this.label13.Location = new System.Drawing.Point(59, 308);
             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);
@@ -410,7 +284,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.IMEI1.AutoSize = true;
             this.IMEI1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.IMEI1.Location = new System.Drawing.Point(955, 371);
+            this.IMEI1.Location = new System.Drawing.Point(253, 380);
             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);
@@ -420,7 +294,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label15.Location = new System.Drawing.Point(761, 365);
+            this.label15.Location = new System.Drawing.Point(59, 374);
             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);
@@ -431,7 +305,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.IMEI2.AutoSize = true;
             this.IMEI2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.IMEI2.Location = new System.Drawing.Point(1505, 175);
+            this.IMEI2.Location = new System.Drawing.Point(803, 184);
             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);
@@ -441,7 +315,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label17.Location = new System.Drawing.Point(1276, 161);
+            this.label17.Location = new System.Drawing.Point(574, 170);
             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);
@@ -452,7 +326,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.GoogleKey.AutoSize = true;
             this.GoogleKey.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.GoogleKey.Location = new System.Drawing.Point(1505, 246);
+            this.GoogleKey.Location = new System.Drawing.Point(803, 255);
             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);
@@ -462,39 +336,39 @@ namespace UAS_MES_NEW.Make
             // 
             this.label19.AutoSize = true;
             this.label19.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label19.Location = new System.Drawing.Point(1276, 236);
+            this.label19.Location = new System.Drawing.Point(574, 245);
             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
+            // battery
             // 
-            this.Aging.AutoSize = true;
-            this.Aging.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Aging.Location = new System.Drawing.Point(1505, 299);
-            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;
+            this.battery.AutoSize = true;
+            this.battery.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.battery.Location = new System.Drawing.Point(803, 308);
+            this.battery.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.battery.Name = "battery";
+            this.battery.Size = new System.Drawing.Size(0, 41);
+            this.battery.TabIndex = 51;
             // 
             // label21
             // 
             this.label21.AutoSize = true;
             this.label21.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label21.Location = new System.Drawing.Point(1276, 299);
+            this.label21.Location = new System.Drawing.Point(574, 308);
             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.Size = new System.Drawing.Size(82, 41);
             this.label21.TabIndex = 50;
-            this.label21.Text = "老化时长";
+            this.label21.Text = "电量";
             // 
             // Version
             // 
             this.Version.AutoSize = true;
             this.Version.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Version.Location = new System.Drawing.Point(1506, 371);
+            this.Version.Location = new System.Drawing.Point(804, 380);
             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";
@@ -505,7 +379,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label23.AutoSize = true;
             this.label23.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label23.Location = new System.Drawing.Point(1276, 365);
+            this.label23.Location = new System.Drawing.Point(574, 374);
             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);
@@ -669,10 +543,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(768, 475);
+            this.OperateResult.Location = new System.Drawing.Point(61, 475);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(991, 286);
+            this.OperateResult.Size = new System.Drawing.Size(1698, 286);
             this.OperateResult.TabIndex = 27;
             this.OperateResult.Text = "";
             // 
@@ -680,7 +554,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.rom.AutoSize = true;
             this.rom.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.rom.Location = new System.Drawing.Point(1506, 423);
+            this.rom.Location = new System.Drawing.Point(804, 432);
             this.rom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.rom.MaximumSize = new System.Drawing.Size(360, 0);
             this.rom.Name = "rom";
@@ -691,7 +565,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(1276, 423);
+            this.label9.Location = new System.Drawing.Point(574, 432);
             this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(146, 41);
@@ -702,7 +576,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.ram.AutoSize = true;
             this.ram.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ram.Location = new System.Drawing.Point(955, 423);
+            this.ram.Location = new System.Drawing.Point(253, 432);
             this.ram.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ram.Name = "ram";
             this.ram.Size = new System.Drawing.Size(0, 41);
@@ -712,7 +586,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label14.Location = new System.Drawing.Point(761, 423);
+            this.label14.Location = new System.Drawing.Point(59, 432);
             this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(146, 41);
@@ -732,7 +606,7 @@ namespace UAS_MES_NEW.Make
             this.Controls.Add(this.MTK);
             this.Controls.Add(this.Version);
             this.Controls.Add(this.label23);
-            this.Controls.Add(this.Aging);
+            this.Controls.Add(this.battery);
             this.Controls.Add(this.label21);
             this.Controls.Add(this.GoogleKey);
             this.Controls.Add(this.label19);
@@ -749,7 +623,6 @@ namespace UAS_MES_NEW.Make
             this.Controls.Add(this.label6);
             this.Controls.Add(this.WatchPath);
             this.Controls.Add(this.ReSet);
-            this.Controls.Add(this.CheckItemDGV);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.sncode);
@@ -770,7 +643,6 @@ namespace UAS_MES_NEW.Make
             this.Tag = "Make!ReadWriteInfo";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
-            ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -791,7 +663,6 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label label1;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private System.Windows.Forms.DataGridView CheckItemDGV;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
@@ -817,20 +688,10 @@ namespace UAS_MES_NEW.Make
         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 battery;
         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;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_mac;
-        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 std_googlekey;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_videotest;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_version;
         private System.Windows.Forms.RadioButton MTK;
         private System.Windows.Forms.RadioButton ZHANXUN;
         private System.Windows.Forms.Label rom;

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.cs

@@ -127,18 +127,16 @@ namespace UAS_MES_NEW.Make
                     if (dt.Columns.Count == 10)
                     {
                         //设置列名绑定数据
-                        dt.Columns[0].ColumnName = "std_class";
-                        dt.Columns[1].ColumnName = "std_testresult";
-                        dt.Columns[2].ColumnName = "std_sn";
-                        dt.Columns[3].ColumnName = "std_mac";
-                        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.Columns[10].ColumnName = "std_rom";
-                        dt.Columns[11].ColumnName = "std_ram";
+                        dt.Columns[0].ColumnName = "std_sn";
+                        dt.Columns[1].ColumnName = "std_mac";
+                        dt.Columns[2].ColumnName = "std_bt";
+                        dt.Columns[3].ColumnName = "std_imei1";
+                        dt.Columns[4].ColumnName = "std_imei2";
+                        dt.Columns[5].ColumnName = "std_googlekey";
+                        dt.Columns[6].ColumnName = "std_version";
+                        dt.Columns[7].ColumnName = "std_rom";
+                        dt.Columns[8].ColumnName = "std_ram";
+                        dt.Columns[9].ColumnName = "std_battery";
                         if (dt.Rows.Count > 0)
                         {
                             PSN.Text = dt.Rows[0]["std_sn"].ToString();
@@ -154,35 +152,7 @@ namespace UAS_MES_NEW.Make
                             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", "");
-                            ram.Text = dt.Rows[0]["std_ram"].ToString().Replace("null", "").Replace("unknow", "");
-                            rom.Text = dt.Rows[0]["std_rom"].ToString().Replace("null", "").Replace("unknow", "");
-                        }
-                    }
-                    if (dt.Columns.Count == 9 || dt.Columns.Count == 8)
-                    {
-                        //设置列名绑定数据
-                        dt.Columns[0].ColumnName = "std_class";
-                        dt.Columns[1].ColumnName = "std_testresult";
-                        dt.Columns[2].ColumnName = "std_sn";
-                        dt.Columns[3].ColumnName = "std_mac";
-                        dt.Columns[4].ColumnName = "std_bt";
-                        dt.Columns[5].ColumnName = "std_version";
-                        dt.Columns[6].ColumnName = "std_rom";
-                        dt.Columns[7].ColumnName = "std_ram";
-                        if (dt.Rows.Count > 0)
-                        {
-                            PSN.Text = dt.Rows[0]["std_sn"].ToString();
-                            if (sncode.Text != PSN.Text)
-                            {
-                                OperateResult.AppendText("扫描SN【" + sncode.Text + "】和设备读取SN【" + PSN.Text + "不相符】\n", Color.Red);
-                                BaseUtil.CleanControls(this.Controls);
-                                WatchPath.Text = "/sdcard/factory";
-                                return;
-                            }
-                            MAC.Text = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
-                            BT.Text = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
+                            battery.Text = dt.Rows[0]["std_videotest"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
                             Version.Text = dt.Rows[0]["std_version"].ToString().Replace("null", "").Replace("unknow", "");
                             ram.Text = dt.Rows[0]["std_ram"].ToString().Replace("null", "").Replace("unknow", "");
                             rom.Text = dt.Rows[0]["std_rom"].ToString().Replace("null", "").Replace("unknow", "");
@@ -191,16 +161,7 @@ namespace UAS_MES_NEW.Make
                     DataView dv = dt.DefaultView;
                     dv.Sort = "std_testresult Asc";
                     dt = dv.ToTable();
-                    CheckItemDGV.DataSource = dt;
-                    bool Result = true;
-                    for (int i = 0; i < dt.Rows.Count; i++)
-                    {
-                        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");
-                    }
+               
                     //IMEI核对
                     dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_imei2 from makeimeilist where mil_psn='" + PSN.Text + "'", "select");
                     if (dt.Rows.Count > 0)
@@ -351,37 +312,5 @@ namespace UAS_MES_NEW.Make
         {
 
         }
-
-        private void CheckItemDGV_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
-        {
-            //系统值和
-            if (e.ColumnIndex >= 0)
-            {
-                if (CheckItemDGV.Columns[e.ColumnIndex].Name == "std_testresult")
-                {
-                    if (e.RowIndex >= 0)
-                    {
-                        if (CheckItemDGV.Rows[e.RowIndex].Cells["std_testresult"].Value != null && (CheckItemDGV.Rows[e.RowIndex].Cells["std_testresult"].Value.ToString() == "OK"))
-                        {
-                            e.Graphics.FillRectangle(Brushes.ForestGreen, e.CellBounds);
-                            Rectangle border = e.CellBounds;
-                            border.Width -= 1;
-                            e.Graphics.DrawRectangle(Pens.Black, border);
-                            e.PaintContent(e.CellBounds);
-                            e.Handled = true;
-                        }
-                        else
-                        {
-                            e.Graphics.FillRectangle(Brushes.OrangeRed, e.CellBounds);
-                            Rectangle border = e.CellBounds;
-                            border.Width -= 1;
-                            e.Graphics.DrawRectangle(Pens.Black, border);
-                            e.PaintContent(e.CellBounds);
-                            e.Handled = true;
-                        }
-                    }
-                }
-            }
-        }
     }
 }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.resx

@@ -117,34 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <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">
-    <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">
-    <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">
-    <value>True</value>
-  </metadata>
-  <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_videotest.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="std_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>