修改SN核对功能

UAS_MES_PNE/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -167,7 +167,7 @@ namespace UAS_MES_NEW.Make
                                             string fp_path = label.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
                                             fp_name = label.Rows[0]["fp_name"].ToString();
                                             WebClient wc = new WebClient();
-                                            wc.DownloadFile("http://192.168.15.168:8099/" + fp_path, @"C:\打印标签\" + fp_name);
+                                            wc.DownloadFile("http://10.1.81.208:8099/" + fp_path, @"C:\打印标签\" + fp_name);
                                         }
                                     }
                                 }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -61,6 +61,14 @@ namespace UAS_MES_NEW.Make
             this.label23 = new System.Windows.Forms.Label();
             this.MTK = new System.Windows.Forms.RadioButton();
             this.ZHANXUN = new System.Windows.Forms.RadioButton();
+            this.ReSet = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
+            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();
+            this.rom = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.ram = new System.Windows.Forms.Label();
+            this.label14 = 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();
@@ -71,14 +79,18 @@ namespace UAS_MES_NEW.Make
             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.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();
-            this.rom = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.ram = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.ma_rom = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.ma_softversion = new System.Windows.Forms.Label();
+            this.label18 = new System.Windows.Forms.Label();
+            this.ma_battery = new System.Windows.Forms.Label();
+            this.label22 = new System.Windows.Forms.Label();
+            this.ma_ram = new System.Windows.Forms.Label();
+            this.label25 = new System.Windows.Forms.Label();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -221,7 +233,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(253, 170);
+            this.PSN.Location = new System.Drawing.Point(230, 45);
             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);
@@ -231,7 +243,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(59, 170);
+            this.label8.Location = new System.Drawing.Point(36, 45);
             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);
@@ -242,7 +254,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(253, 243);
+            this.MAC.Location = new System.Drawing.Point(230, 102);
             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);
@@ -252,7 +264,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(59, 243);
+            this.label11.Location = new System.Drawing.Point(36, 102);
             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);
@@ -263,7 +275,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(253, 308);
+            this.BT.Location = new System.Drawing.Point(230, 161);
             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);
@@ -273,7 +285,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(59, 308);
+            this.label13.Location = new System.Drawing.Point(36, 161);
             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);
@@ -284,7 +296,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(253, 380);
+            this.IMEI1.Location = new System.Drawing.Point(230, 229);
             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);
@@ -294,7 +306,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(59, 374);
+            this.label15.Location = new System.Drawing.Point(36, 223);
             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);
@@ -305,7 +317,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(803, 184);
+            this.IMEI2.Location = new System.Drawing.Point(750, 59);
             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);
@@ -315,7 +327,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(574, 170);
+            this.label17.Location = new System.Drawing.Point(521, 45);
             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);
@@ -326,7 +338,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(803, 255);
+            this.GoogleKey.Location = new System.Drawing.Point(750, 104);
             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);
@@ -336,7 +348,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label19.AutoSize = true;
             this.label19.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label19.Location = new System.Drawing.Point(574, 245);
+            this.label19.Location = new System.Drawing.Point(521, 104);
             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);
@@ -347,7 +359,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.battery.AutoSize = true;
             this.battery.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.battery.Location = new System.Drawing.Point(803, 308);
+            this.battery.Location = new System.Drawing.Point(750, 161);
             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);
@@ -357,7 +369,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label21.AutoSize = true;
             this.label21.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label21.Location = new System.Drawing.Point(574, 308);
+            this.label21.Location = new System.Drawing.Point(521, 161);
             this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(82, 41);
@@ -368,7 +380,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.Version.AutoSize = true;
             this.Version.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Version.Location = new System.Drawing.Point(804, 380);
+            this.Version.Location = new System.Drawing.Point(751, 229);
             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";
@@ -379,7 +391,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(574, 374);
+            this.label23.Location = new System.Drawing.Point(521, 223);
             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);
@@ -411,6 +423,97 @@ namespace UAS_MES_NEW.Make
             this.ZHANXUN.UseVisualStyleBackColor = true;
             this.ZHANXUN.Visible = false;
             // 
+            // ReSet
+            // 
+            this.ReSet.AutoSize = true;
+            this.ReSet.Location = new System.Drawing.Point(999, 787);
+            this.ReSet.Name = "ReSet";
+            this.ReSet.Size = new System.Drawing.Size(186, 28);
+            this.ReSet.TabIndex = 34;
+            this.ReSet.Text = "恢复出厂设置";
+            this.ReSet.UseVisualStyleBackColor = true;
+            this.ReSet.Visible = false;
+            // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            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);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 32;
+            // 
+            // sncode
+            // 
+            this.sncode.AllPower = null;
+            this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.ID = null;
+            this.sncode.Location = new System.Drawing.Point(144, 781);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Name = "sncode";
+            this.sncode.Power = null;
+            this.sncode.Size = new System.Drawing.Size(334, 35);
+            this.sncode.Str = null;
+            this.sncode.Str1 = null;
+            this.sncode.Str2 = null;
+            this.sncode.TabIndex = 29;
+            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
+            // 
+            // 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(61, 517);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1698, 244);
+            this.OperateResult.TabIndex = 27;
+            this.OperateResult.Text = "";
+            // 
+            // rom
+            // 
+            this.rom.AutoSize = true;
+            this.rom.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.rom.Location = new System.Drawing.Point(751, 283);
+            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";
+            this.rom.Size = new System.Drawing.Size(0, 41);
+            this.rom.TabIndex = 59;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label9.Location = new System.Drawing.Point(521, 283);
+            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);
+            this.label9.TabIndex = 58;
+            this.label9.Text = "存储内存";
+            // 
+            // ram
+            // 
+            this.ram.AutoSize = true;
+            this.ram.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ram.Location = new System.Drawing.Point(230, 283);
+            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);
+            this.ram.TabIndex = 57;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label14.Location = new System.Drawing.Point(36, 283);
+            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);
+            this.label14.TabIndex = 56;
+            this.label14.Text = "运行内存";
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@@ -502,124 +605,147 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn10.Visible = false;
             this.dataGridViewTextBoxColumn10.Width = 200;
             // 
-            // ReSet
-            // 
-            this.ReSet.AutoSize = true;
-            this.ReSet.Location = new System.Drawing.Point(999, 787);
-            this.ReSet.Name = "ReSet";
-            this.ReSet.Size = new System.Drawing.Size(186, 28);
-            this.ReSet.TabIndex = 34;
-            this.ReSet.Text = "恢复出厂设置";
-            this.ReSet.UseVisualStyleBackColor = true;
-            this.ReSet.Visible = false;
-            // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            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);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 32;
-            // 
-            // sncode
-            // 
-            this.sncode.AllPower = null;
-            this.sncode.BackColor = System.Drawing.Color.White;
-            this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(144, 781);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
-            this.sncode.Name = "sncode";
-            this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(334, 35);
-            this.sncode.Str = null;
-            this.sncode.Str1 = null;
-            this.sncode.Str2 = null;
-            this.sncode.TabIndex = 29;
-            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
-            // 
-            // 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(61, 475);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1698, 286);
-            this.OperateResult.TabIndex = 27;
-            this.OperateResult.Text = "";
-            // 
-            // rom
-            // 
-            this.rom.AutoSize = true;
-            this.rom.Font = new System.Drawing.Font("微软雅黑", 12F);
-            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";
-            this.rom.Size = new System.Drawing.Size(0, 41);
-            this.rom.TabIndex = 59;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            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);
-            this.label9.TabIndex = 58;
-            this.label9.Text = "存储内存";
-            // 
-            // ram
-            // 
-            this.ram.AutoSize = true;
-            this.ram.Font = new System.Drawing.Font("微软雅黑", 12F);
-            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);
-            this.ram.TabIndex = 57;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F);
-            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);
-            this.label14.TabIndex = 56;
-            this.label14.Text = "运行内存";
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.ma_ram);
+            this.groupBox1.Controls.Add(this.ma_rom);
+            this.groupBox1.Controls.Add(this.label25);
+            this.groupBox1.Controls.Add(this.label18);
+            this.groupBox1.Controls.Add(this.label12);
+            this.groupBox1.Controls.Add(this.label22);
+            this.groupBox1.Controls.Add(this.ma_softversion);
+            this.groupBox1.Controls.Add(this.ma_battery);
+            this.groupBox1.Location = new System.Drawing.Point(57, 170);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(707, 340);
+            this.groupBox1.TabIndex = 60;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "工单维护信息";
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.PSN);
+            this.groupBox2.Controls.Add(this.rom);
+            this.groupBox2.Controls.Add(this.label11);
+            this.groupBox2.Controls.Add(this.label9);
+            this.groupBox2.Controls.Add(this.MAC);
+            this.groupBox2.Controls.Add(this.ram);
+            this.groupBox2.Controls.Add(this.label13);
+            this.groupBox2.Controls.Add(this.label14);
+            this.groupBox2.Controls.Add(this.BT);
+            this.groupBox2.Controls.Add(this.label15);
+            this.groupBox2.Controls.Add(this.IMEI1);
+            this.groupBox2.Controls.Add(this.Version);
+            this.groupBox2.Controls.Add(this.label17);
+            this.groupBox2.Controls.Add(this.label23);
+            this.groupBox2.Controls.Add(this.IMEI2);
+            this.groupBox2.Controls.Add(this.battery);
+            this.groupBox2.Controls.Add(this.label19);
+            this.groupBox2.Controls.Add(this.label21);
+            this.groupBox2.Controls.Add(this.GoogleKey);
+            this.groupBox2.Location = new System.Drawing.Point(802, 170);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(945, 340);
+            this.groupBox2.TabIndex = 61;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "设备读取信息";
+            // 
+            // ma_rom
+            // 
+            this.ma_rom.AutoSize = true;
+            this.ma_rom.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ma_rom.Location = new System.Drawing.Point(285, 264);
+            this.ma_rom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_rom.MaximumSize = new System.Drawing.Size(360, 0);
+            this.ma_rom.Name = "ma_rom";
+            this.ma_rom.Size = new System.Drawing.Size(0, 41);
+            this.ma_rom.TabIndex = 65;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label12.Location = new System.Drawing.Point(55, 264);
+            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(146, 41);
+            this.label12.TabIndex = 64;
+            this.label12.Text = "存储内存";
+            // 
+            // ma_softversion
+            // 
+            this.ma_softversion.AutoSize = true;
+            this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ma_softversion.Location = new System.Drawing.Point(285, 210);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_softversion.MaximumSize = new System.Drawing.Size(360, 0);
+            this.ma_softversion.Name = "ma_softversion";
+            this.ma_softversion.Size = new System.Drawing.Size(0, 41);
+            this.ma_softversion.TabIndex = 63;
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label18.Location = new System.Drawing.Point(55, 204);
+            this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(146, 41);
+            this.label18.TabIndex = 62;
+            this.label18.Text = "软件版本";
+            // 
+            // ma_battery
+            // 
+            this.ma_battery.AutoSize = true;
+            this.ma_battery.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ma_battery.Location = new System.Drawing.Point(284, 142);
+            this.ma_battery.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_battery.Name = "ma_battery";
+            this.ma_battery.Size = new System.Drawing.Size(0, 41);
+            this.ma_battery.TabIndex = 61;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label22.Location = new System.Drawing.Point(55, 142);
+            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(82, 41);
+            this.label22.TabIndex = 60;
+            this.label22.Text = "电量";
+            // 
+            // ma_ram
+            // 
+            this.ma_ram.AutoSize = true;
+            this.ma_ram.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ma_ram.Location = new System.Drawing.Point(284, 83);
+            this.ma_ram.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_ram.Name = "ma_ram";
+            this.ma_ram.Size = new System.Drawing.Size(0, 41);
+            this.ma_ram.TabIndex = 61;
+            // 
+            // label25
+            // 
+            this.label25.AutoSize = true;
+            this.label25.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label25.Location = new System.Drawing.Point(55, 83);
+            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(146, 41);
+            this.label25.TabIndex = 60;
+            this.label25.Text = "运行内存";
             // 
             // Make_GetTestFileData
             // 
             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.rom);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.ram);
-            this.Controls.Add(this.label14);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.ZHANXUN);
             this.Controls.Add(this.MTK);
-            this.Controls.Add(this.Version);
-            this.Controls.Add(this.label23);
-            this.Controls.Add(this.battery);
-            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);
@@ -643,7 +769,11 @@ 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);
-            this.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(true);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(true);
+            this.groupBox2.PerformLayout();
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -698,5 +828,15 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label ram;
         private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label ma_ram;
+        private System.Windows.Forms.Label ma_rom;
+        private System.Windows.Forms.Label label25;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label ma_softversion;
+        private System.Windows.Forms.Label ma_battery;
     }
 }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.cs

@@ -58,7 +58,7 @@ namespace UAS_MES_NEW.Make
         private void LoadCollectedNum()
         {
             sql.Clear();
-            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+            sql.Append("select ma_ram,ma_rom,ma_battery,ma_softversion,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");
@@ -84,223 +84,247 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText("序列号" + sncode.Text + "不存在\n", Color.Red);
                         return;
                     }
-                    //if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
-                    //{
-                    ma_code.Text = omakeCode;
-                    LoadCollectedNum();
-                    //发送对应平台的指令
-                    //if (MTK.Checked)
-                    //{
-                    //    BaseUtil.GetDataFromDevice("MTK");
-                    //}
-                    //else
-                    //{
-                    //    BaseUtil.GetDataFromDevice("ZHANXUN");
-                    //}
-                    string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
-                    DataTable dt = new DataTable();
-                    if (Directory.Exists(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text))
+                    if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                     {
-                        DirectoryInfo di = new DirectoryInfo(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
-                        FileInfo[] file = di.GetFiles();
-                        for (int i = 0; i < file.Length; i++)
-                        {
-                            File.Delete(file[i].FullName);
-                        }
-                    }
-                    BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + " ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
-                    string[] files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text + "", "*.csv");
-                    if (files.Length == 0)
-                    {
-                        files = Directory.GetFiles(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text + "/factory", "*.csv");
-                    }
-                    if (!BaseUtil.OpenCSVFile(ref dt, files[0]))
-                    {
-                        if (files.Length > 1)
-                        {
-                            dt = new DataTable();
-                            BaseUtil.OpenCSVFile(ref dt, files[1]);
-                        }
-                    }
-                    //移除标题行
-                    dt.Rows.RemoveAt(0);
-                    if (dt.Columns.Count == 10)
-                    {
-                        //设置列名绑定数据
-                        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)
+                        ma_code.Text = omakeCode;
+
+                        LoadCollectedNum();
+                        //发送对应平台的指令
+                        //if (MTK.Checked)
+                        //{
+                        //    BaseUtil.GetDataFromDevice("MTK");
+                        //}
+                        //else
+                        //{
+                        //    BaseUtil.GetDataFromDevice("ZHANXUN");
+                        //}
+                        string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsid + "'").ToString();
+                        DataTable dt = new DataTable();
+                        if (Directory.Exists(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text))
                         {
-                            PSN.Text = dt.Rows[0]["std_sn"].ToString();
-                            if (sncode.Text != PSN.Text)
+                            DirectoryInfo di = new DirectoryInfo(Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text);
+                            FileInfo[] file = di.GetFiles();
+                            for (int i = 0; i < file.Length; i++)
                             {
-                                OperateResult.AppendText("扫描SN【" + sncode.Text + "】和设备读取SN【" + PSN.Text + "不相符】\n", Color.Red);
-                                BaseUtil.CleanControls(this.Controls);
-                                WatchPath.Text = "/sdcard/factory";
-                                return;
+                                File.Delete(file[i].FullName);
                             }
-                            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();
-                            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", "");
-                        }
-                    }
-                    DataView dv = dt.DefaultView;
-                    dv.Sort = "std_testresult Asc";
-                    dt = dv.ToTable();
-               
-                    //IMEI核对
-                    dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_imei2 from makeimeilist where mil_psn='" + PSN.Text + "'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        string imei1 = dt.Rows[0]["mil_imei1"].ToString();
-                        string imei2 = dt.Rows[0]["mil_imei2"].ToString();
-                        if (IMEI1.Text == imei1 && IMEI1.Text != "")
-                        {
-                            OperateResult.AppendText(PSN.Text + "【IMEI1】比对成功\n", Color.Green);
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(PSN.Text + "读取【IMEI1】:" + IMEI1.Text + ",系统导入:" + imei1 + ",比对失败\n", Color.Red);
                         }
-                        if (IMEI2.Text == imei2 && IMEI2.Text != "")
+                        BaseUtil.GetDataFromDevice("GETFILE", WatchPath.Text + "/" + sncode.Text + ".csv ./" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text + ".csv");
+                        if (!BaseUtil.OpenCSVFile(ref dt, Application.StartupPath + "/" + DateTime.Now.ToString("yyyy-MM-dd") + @"/" + sncode.Text + ".csv"))
                         {
-                            OperateResult.AppendText(PSN.Text + "【IMEI2】比对成功\n", Color.Green);
+
                         }
-                        else
+                        //移除标题行
+                        dt.Rows.RemoveAt(0);
+                        if (dt.Columns.Count == 10)
                         {
-                            OperateResult.AppendText(PSN.Text + "读取【IMEI2】:" + IMEI2.Text + ",系统导入:" + imei2 + ",比对失败\n", Color.Red);
+                            //设置列名绑定数据
+                            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();
+                                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();
+                                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();
+                                battery.Text = dt.Rows[0]["std_battery"].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", "");
+                            }
                         }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(PSN.Text + "未导入IMEI\n", Color.Red);
-                    }
-                    //MAC核对
-                    dt = (DataTable)dh.ExecuteSql("select mal_mac,mal_bt from makeaddresslist where mal_sncode='" + PSN.Text + "'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        string mac = dt.Rows[0]["mal_mac"].ToString();
-                        string bt = dt.Rows[0]["mal_bt"].ToString();
-                        if (MAC.Text == mac && MAC.Text != "")
+                        //DataView dv = dt.DefaultView;
+                        //dv.Sort = "std_testresult Asc";
+                        //dt = dv.ToTable();
+
+                        //IMEI核对
+                        dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_imei2,mil_othid1,mil_othid2 from makeimeilist where mil_psn='" + PSN.Text + "'", "select");
+                        bool allcheck = true;
+                        if (dt.Rows.Count > 0)
                         {
-                            OperateResult.AppendText(PSN.Text + "【MAC】比对成功\n", Color.Green);
+                            string imei1 = dt.Rows[0]["mil_imei1"].ToString();
+                            string imei2 = dt.Rows[0]["mil_imei2"].ToString();
+                            string mac = dt.Rows[0]["mil_othid1"].ToString();
+                            string bt = dt.Rows[0]["mil_othid2"].ToString();
+                            if (IMEI1.Text == imei1 && IMEI1.Text != "")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【IMEI1】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【IMEI1】:" + IMEI1.Text + ",系统导入:" + imei1 + ",比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (IMEI2.Text == imei2 && IMEI2.Text != "")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【IMEI2】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【IMEI2】:" + IMEI2.Text + ",系统导入:" + imei2 + ",比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (MAC.Text == mac && MAC.Text != "")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【MAC】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【MAC】:" + MAC.Text + ",系统导入:" + mac + ",比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (BT.Text == bt && BT.Text != "")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【BT】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【BT】:" + BT.Text + ",系统导入:" + bt + ",比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (GoogleKey.Text != "" && GoogleKey.Text == "OK")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【GoogleKey】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【GoogleKey】比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (ma_ram.Text != "" && ram.Text != "" && ma_ram.Text == ram.Text)
+                            {
+                                OperateResult.AppendText(PSN.Text + "【GoogleKey】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【GoogleKey】比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (ma_rom.Text != "" && rom.Text != "" && ma_rom.Text == rom.Text)
+                            {
+                                OperateResult.AppendText(PSN.Text + "【存储内存】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【存储内存】比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
+                            if (ma_softversion.Text != "" && Version.Text != "" && ma_softversion.Text == Version.Text)
+                            {
+                                OperateResult.AppendText(PSN.Text + "【软件版本】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(PSN.Text + "读取【软件版本】比对失败\n", Color.Red);
+                                allcheck = false;
+                            }
                         }
                         else
                         {
-                            OperateResult.AppendText(PSN.Text + "读取【MAC】:" + MAC.Text + ",系统导入:" + mac + ",比对失败\n", Color.Red);
+                            OperateResult.AppendText(PSN.Text + "未导入IMEI\n", Color.Red);
+                            return;
                         }
-                        if (BT.Text == bt && BT.Text != "")
+                        //if (Aging.Text == "")
+                        //{
+                        //    OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
+                        //    return;
+                        //}
+                        if (allcheck)
                         {
-                            OperateResult.AppendText(PSN.Text + "【BT】比对成功\n", Color.Green);
+                            //提示正确返回时传递的信息
+                            if (oErrorMessage.Contains("AFTERSUCCESS"))
+                                OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                            //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                            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 + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            BaseUtil.SetFormValue(Controls, dt);
+                            //将SN,时间，结果记录在页面1
+                            //记录日志
+                            //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
+                            //SN核对成功
+                            //>> 请输入SN
+                            OperateResult.AppendText("<<" + sncode.Text + "信息核对完成\n", Color.Green, sncode);
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                            SetCheck set = new SetCheck("OK", Color.Green);
+                            BaseUtil.SetFormCenter(set);
+                            set.ShowDialog();
+                            if (ReSet.Checked)
+                            {
+                                BaseUtil.GetDataFromDevice("RESET");
+                            }
+                            //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
+                            //{
+
+                            //}
+                            //else
+                            //{
+                            //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                            //}
+                            if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
+                            {
+                                //提示正确返回时传递的信息
+                                if (oErrorMessage.Contains("AFTERSUCCESS"))
+                                    OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                                //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                                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 + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                BaseUtil.SetFormValue(Controls, dt);
+                                //将SN,时间，结果记录在页面
+                                //记录日志
+                                //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
+                                //SN核对成功
+                                //>> 请输入SN
+                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
+                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                set = new SetCheck("OK", Color.Green);
+                                BaseUtil.SetFormCenter(set);
+                                set.ShowDialog();
+                                if (ReSet.Checked)
+                                {
+                                    BaseUtil.GetDataFromDevice("RESET");
+                                }
+                            }
+                            else
+                            {
+                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                            }
                         }
                         else
                         {
-                            OperateResult.AppendText(PSN.Text + "读取【BT】:" + BT.Text + ",系统导入:" + bt + ",比对失败\n", Color.Red);
-                        }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(PSN.Text + "未导入MAC/BT\n", Color.Red);
-                    }
-
-                    //if (Aging.Text == "")
-                    //{
-                    //    OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
-                    //    return;
-                    //}
-                    if (true)
-                    {
-                        //提示正确返回时传递的信息
-                        if (oErrorMessage.Contains("AFTERSUCCESS"))
-                            OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                        //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                        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 + "'");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        BaseUtil.SetFormValue(Controls, dt);
-                        //将SN,时间，结果记录在页面1
-                        //记录日志
-                        //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
-                        //SN核对成功
-                        //>> 请输入SN
-                        OperateResult.AppendText("<<" + sncode.Text + "信息核对完成\n", Color.Green, sncode);
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        SetCheck set = new SetCheck("OK", Color.Green);
-                        BaseUtil.SetFormCenter(set);
-                        set.ShowDialog();
-                        if (ReSet.Checked)
-                        {
-                            BaseUtil.GetDataFromDevice("RESET");
+                            //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                            OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
                         }
-                        //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
-                        //{
-
-                        //}
-                        //else
-                        //{
-                        //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                        //}
-                        //if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
-                        //{
-                        //    //提示正确返回时传递的信息
-                        //    if (oErrorMessage.Contains("AFTERSUCCESS"))
-                        //        OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                        //    //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                        //    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 + "'");
-                        //    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        //    BaseUtil.SetFormValue(Controls, dt);
-                        //    //将SN,时间，结果记录在页面
-                        //    //记录日志
-                        //    //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                        //    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
-                        //    //SN核对成功
-                        //    //>> 请输入SN
-                        //    OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
-                        //    OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        //    SetCheck set = new SetCheck("OK", Color.Green);
-                        //    BaseUtil.SetFormCenter(set);
-                        //    set.ShowDialog();
-                        //    if (ReSet.Checked)
-                        //    {
-                        //        BaseUtil.GetDataFromDevice("RESET");
-                        //    }
-                        //}
-                        //else
-                        //{
-                        //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                        //}
                     }
                     else
                     {
-                        //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                        OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                     }
                 }
-                //else
-                //{
-                //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                //}
-                //}
                 else
                 {
                     OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);