查号勾选项读取修改

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -89,6 +89,16 @@ namespace UAS_MES_NEW.Make
             this.ma_softversion = new System.Windows.Forms.Label();
             this.ma_battery = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.CheckGoogle = new System.Windows.Forms.CheckBox();
+            this.CheckBattery = new System.Windows.Forms.CheckBox();
+            this.CheckSoft = new System.Windows.Forms.CheckBox();
+            this.CheckRom = new System.Windows.Forms.CheckBox();
+            this.CheckImei2 = new System.Windows.Forms.CheckBox();
+            this.CheckMac = new System.Windows.Forms.CheckBox();
+            this.CheckBt = new System.Windows.Forms.CheckBox();
+            this.CheckImei1 = new System.Windows.Forms.CheckBox();
+            this.CheckRam = new System.Windows.Forms.CheckBox();
+            this.CheckSn = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
@@ -233,7 +243,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(230, 45);
+            this.PSN.Location = new System.Drawing.Point(219, 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);
@@ -243,7 +253,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(36, 45);
+            this.label8.Location = new System.Drawing.Point(58, 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);
@@ -254,7 +264,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(230, 102);
+            this.MAC.Location = new System.Drawing.Point(219, 103);
             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);
@@ -264,7 +274,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(36, 102);
+            this.label11.Location = new System.Drawing.Point(58, 103);
             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);
@@ -275,7 +285,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(230, 161);
+            this.BT.Location = new System.Drawing.Point(219, 165);
             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);
@@ -285,7 +295,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(36, 161);
+            this.label13.Location = new System.Drawing.Point(58, 165);
             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);
@@ -296,7 +306,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(230, 229);
+            this.IMEI1.Location = new System.Drawing.Point(219, 233);
             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);
@@ -306,7 +316,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(36, 223);
+            this.label15.Location = new System.Drawing.Point(58, 227);
             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);
@@ -317,7 +327,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(750, 59);
+            this.IMEI2.Location = new System.Drawing.Point(725, 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);
@@ -327,7 +337,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(521, 45);
+            this.label17.Location = new System.Drawing.Point(526, 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);
@@ -338,7 +348,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(750, 104);
+            this.GoogleKey.Location = new System.Drawing.Point(725, 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);
@@ -348,7 +358,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(521, 104);
+            this.label19.Location = new System.Drawing.Point(526, 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);
@@ -359,7 +369,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(750, 161);
+            this.battery.Location = new System.Drawing.Point(725, 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);
@@ -369,7 +379,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(521, 161);
+            this.label21.Location = new System.Drawing.Point(526, 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);
@@ -380,7 +390,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(751, 229);
+            this.Version.Location = new System.Drawing.Point(726, 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";
@@ -391,7 +401,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(521, 223);
+            this.label23.Location = new System.Drawing.Point(526, 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);
@@ -474,7 +484,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(751, 283);
+            this.rom.Location = new System.Drawing.Point(726, 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";
@@ -485,7 +495,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(521, 283);
+            this.label9.Location = new System.Drawing.Point(526, 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);
@@ -496,7 +506,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(230, 283);
+            this.ram.Location = new System.Drawing.Point(219, 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);
@@ -506,7 +516,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(36, 283);
+            this.label14.Location = new System.Drawing.Point(58, 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);
@@ -709,6 +719,16 @@ namespace UAS_MES_NEW.Make
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.CheckGoogle);
+            this.groupBox2.Controls.Add(this.CheckBattery);
+            this.groupBox2.Controls.Add(this.CheckSoft);
+            this.groupBox2.Controls.Add(this.CheckRom);
+            this.groupBox2.Controls.Add(this.CheckImei2);
+            this.groupBox2.Controls.Add(this.CheckMac);
+            this.groupBox2.Controls.Add(this.CheckBt);
+            this.groupBox2.Controls.Add(this.CheckImei1);
+            this.groupBox2.Controls.Add(this.CheckRam);
+            this.groupBox2.Controls.Add(this.CheckSn);
             this.groupBox2.Controls.Add(this.label8);
             this.groupBox2.Controls.Add(this.PSN);
             this.groupBox2.Controls.Add(this.rom);
@@ -736,6 +756,96 @@ namespace UAS_MES_NEW.Make
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "设备读取信息";
             // 
+            // CheckGoogle
+            // 
+            this.CheckGoogle.AutoSize = true;
+            this.CheckGoogle.Location = new System.Drawing.Point(495, 111);
+            this.CheckGoogle.Name = "CheckGoogle";
+            this.CheckGoogle.Size = new System.Drawing.Size(28, 27);
+            this.CheckGoogle.TabIndex = 71;
+            this.CheckGoogle.UseVisualStyleBackColor = true;
+            // 
+            // CheckBattery
+            // 
+            this.CheckBattery.AutoSize = true;
+            this.CheckBattery.Location = new System.Drawing.Point(495, 170);
+            this.CheckBattery.Name = "CheckBattery";
+            this.CheckBattery.Size = new System.Drawing.Size(28, 27);
+            this.CheckBattery.TabIndex = 70;
+            this.CheckBattery.UseVisualStyleBackColor = true;
+            // 
+            // CheckSoft
+            // 
+            this.CheckSoft.AutoSize = true;
+            this.CheckSoft.Location = new System.Drawing.Point(495, 231);
+            this.CheckSoft.Name = "CheckSoft";
+            this.CheckSoft.Size = new System.Drawing.Size(28, 27);
+            this.CheckSoft.TabIndex = 69;
+            this.CheckSoft.UseVisualStyleBackColor = true;
+            // 
+            // CheckRom
+            // 
+            this.CheckRom.AutoSize = true;
+            this.CheckRom.Location = new System.Drawing.Point(495, 293);
+            this.CheckRom.Name = "CheckRom";
+            this.CheckRom.Size = new System.Drawing.Size(28, 27);
+            this.CheckRom.TabIndex = 68;
+            this.CheckRom.UseVisualStyleBackColor = true;
+            // 
+            // CheckImei2
+            // 
+            this.CheckImei2.AutoSize = true;
+            this.CheckImei2.Location = new System.Drawing.Point(495, 55);
+            this.CheckImei2.Name = "CheckImei2";
+            this.CheckImei2.Size = new System.Drawing.Size(28, 27);
+            this.CheckImei2.TabIndex = 67;
+            this.CheckImei2.UseVisualStyleBackColor = true;
+            // 
+            // CheckMac
+            // 
+            this.CheckMac.AutoSize = true;
+            this.CheckMac.Location = new System.Drawing.Point(23, 113);
+            this.CheckMac.Name = "CheckMac";
+            this.CheckMac.Size = new System.Drawing.Size(28, 27);
+            this.CheckMac.TabIndex = 66;
+            this.CheckMac.UseVisualStyleBackColor = true;
+            // 
+            // CheckBt
+            // 
+            this.CheckBt.AutoSize = true;
+            this.CheckBt.Location = new System.Drawing.Point(23, 172);
+            this.CheckBt.Name = "CheckBt";
+            this.CheckBt.Size = new System.Drawing.Size(28, 27);
+            this.CheckBt.TabIndex = 65;
+            this.CheckBt.UseVisualStyleBackColor = true;
+            // 
+            // CheckImei1
+            // 
+            this.CheckImei1.AutoSize = true;
+            this.CheckImei1.Location = new System.Drawing.Point(23, 233);
+            this.CheckImei1.Name = "CheckImei1";
+            this.CheckImei1.Size = new System.Drawing.Size(28, 27);
+            this.CheckImei1.TabIndex = 64;
+            this.CheckImei1.UseVisualStyleBackColor = true;
+            // 
+            // CheckRam
+            // 
+            this.CheckRam.AutoSize = true;
+            this.CheckRam.Location = new System.Drawing.Point(23, 295);
+            this.CheckRam.Name = "CheckRam";
+            this.CheckRam.Size = new System.Drawing.Size(28, 27);
+            this.CheckRam.TabIndex = 63;
+            this.CheckRam.UseVisualStyleBackColor = true;
+            // 
+            // CheckSn
+            // 
+            this.CheckSn.AutoSize = true;
+            this.CheckSn.Location = new System.Drawing.Point(23, 57);
+            this.CheckSn.Name = "CheckSn";
+            this.CheckSn.Size = new System.Drawing.Size(28, 27);
+            this.CheckSn.TabIndex = 62;
+            this.CheckSn.UseVisualStyleBackColor = true;
+            // 
             // Make_GetTestFileData
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
@@ -837,5 +947,15 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.Label ma_softversion;
         private System.Windows.Forms.Label ma_battery;
+        private System.Windows.Forms.CheckBox CheckSn;
+        private System.Windows.Forms.CheckBox CheckMac;
+        private System.Windows.Forms.CheckBox CheckBt;
+        private System.Windows.Forms.CheckBox CheckImei1;
+        private System.Windows.Forms.CheckBox CheckRam;
+        private System.Windows.Forms.CheckBox CheckGoogle;
+        private System.Windows.Forms.CheckBox CheckBattery;
+        private System.Windows.Forms.CheckBox CheckSoft;
+        private System.Windows.Forms.CheckBox CheckRom;
+        private System.Windows.Forms.CheckBox CheckImei2;
     }
 }

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_ram,ma_rom,ma_battery,ma_softversion,ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+            sql.Append("select ma_ram,ma_rom,nvl(ma_battery,0)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");
@@ -112,11 +112,12 @@ namespace UAS_MES_NEW.Make
                         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("序列号" + sncode.Text + "文件打开异常\n", Color.Red);
+                            return;
                         }
                         //移除标题行
                         dt.Rows.RemoveAt(0);
-                        if (dt.Columns.Count == 10)
+                        if (dt.Columns.Count == 10 || dt.Columns.Count == 11)
                         {
                             //设置列名绑定数据
                             dt.Columns[0].ColumnName = "std_sn";
@@ -155,7 +156,7 @@ namespace UAS_MES_NEW.Make
                         //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");
+                        dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_imei2,mil_othid1,mil_othid2 from makeimeilist where mil_sncode='" + PSN.Text + "'", "select");
                         bool allcheck = true;
                         if (dt.Rows.Count > 0)
                         {
@@ -169,8 +170,11 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【IMEI1】:" + IMEI1.Text + ",系统导入:" + imei1 + ",比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckImei1.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【IMEI1】:" + IMEI1.Text + ",系统导入:" + imei1 + ",比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (IMEI2.Text == imei2 && IMEI2.Text != "")
                             {
@@ -178,8 +182,11 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【IMEI2】:" + IMEI2.Text + ",系统导入:" + imei2 + ",比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckImei2.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【IMEI2】:" + IMEI2.Text + ",系统导入:" + imei2 + ",比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (MAC.Text == mac && MAC.Text != "")
                             {
@@ -187,8 +194,12 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【MAC】:" + MAC.Text + ",系统导入:" + mac + ",比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckMac.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【MAC】:" + MAC.Text + ",系统导入:" + mac + ",比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
+
                             }
                             if (BT.Text == bt && BT.Text != "")
                             {
@@ -196,8 +207,11 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【BT】:" + BT.Text + ",系统导入:" + bt + ",比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckBt.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【BT】:" + BT.Text + ",系统导入:" + bt + ",比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (GoogleKey.Text != "" && GoogleKey.Text == "OK")
                             {
@@ -205,8 +219,11 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【GoogleKey】比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckGoogle.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【GoogleKey】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (ma_ram.Text != "" && ram.Text != "" && ma_ram.Text == ram.Text)
                             {
@@ -214,8 +231,11 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【运行内存】比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckRam.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【运行内存】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (ma_rom.Text != "" && rom.Text != "" && ma_rom.Text == rom.Text)
                             {
@@ -223,8 +243,23 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【存储内存】比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckRom.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【存储内存】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
+                            }
+                            if (ma_battery.Text != "" && ma_battery.Text != "" && double.Parse(ma_battery.Text) <= double.Parse(battery.Text))
+                            {
+                                OperateResult.AppendText(PSN.Text + "【电量】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                if (CheckBattery.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【电量】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                             if (ma_softversion.Text != "" && Version.Text != "" && ma_softversion.Text == Version.Text)
                             {
@@ -232,14 +267,77 @@ namespace UAS_MES_NEW.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(PSN.Text + "读取【软件版本】比对失败\n", Color.Red);
-                                allcheck = false;
+                                if (CheckSoft.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【软件版本】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
                             }
                         }
                         else
                         {
-                            OperateResult.AppendText(PSN.Text + "未导入IMEI\n", Color.Red);
-                            return;
+                            if (GoogleKey.Text != "" && GoogleKey.Text == "OK")
+                            {
+                                OperateResult.AppendText(PSN.Text + "【GoogleKey】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                if (CheckGoogle.Checked)
+                                {
+                                    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 + "【运行内存】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                if (CheckRam.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【运行内存】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
+                            }
+                            if (ma_rom.Text != "" && rom.Text != "" && ma_rom.Text == rom.Text)
+                            {
+                                OperateResult.AppendText(PSN.Text + "【存储内存】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                if (CheckRom.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【存储内存】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
+                            }
+                            if (ma_battery.Text != "" && ma_battery.Text != "" && double.Parse(ma_battery.Text) <= double.Parse(battery.Text))
+                            {
+                                OperateResult.AppendText(PSN.Text + "【电量】比对成功\n", Color.Green);
+                            }
+                            else
+                            {
+                                if (CheckBattery.Checked)
+                                {
+                                    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
+                            {
+                                if (CheckSoft.Checked)
+                                {
+                                    OperateResult.AppendText(PSN.Text + "读取【软件版本】比对失败\n", Color.Red);
+                                    allcheck = false;
+                                }
+                            }
+                            //OperateResult.AppendText(PSN.Text + "未导入IMEI\n", Color.Red);
+                            //return;
                         }
                         //if (Aging.Text == "")
                         //{
@@ -264,7 +362,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 + "信息核对完成\n", Color.Green, sncode);
+                            OperateResult.AppendText("<<" + sncode.Text + "信息核对完成\n", Color.Green);
                             OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             SetCheck set = new SetCheck("OK", Color.Green);
                             BaseUtil.SetFormCenter(set);