默认勾选项目

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -768,6 +768,8 @@ namespace UAS_MES_NEW.Make
             // CheckBattery
             // 
             this.CheckBattery.AutoSize = true;
+            this.CheckBattery.Checked = true;
+            this.CheckBattery.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckBattery.Location = new System.Drawing.Point(495, 170);
             this.CheckBattery.Name = "CheckBattery";
             this.CheckBattery.Size = new System.Drawing.Size(28, 27);
@@ -777,6 +779,8 @@ namespace UAS_MES_NEW.Make
             // CheckSoft
             // 
             this.CheckSoft.AutoSize = true;
+            this.CheckSoft.Checked = true;
+            this.CheckSoft.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckSoft.Location = new System.Drawing.Point(495, 231);
             this.CheckSoft.Name = "CheckSoft";
             this.CheckSoft.Size = new System.Drawing.Size(28, 27);
@@ -786,6 +790,8 @@ namespace UAS_MES_NEW.Make
             // CheckRom
             // 
             this.CheckRom.AutoSize = true;
+            this.CheckRom.Checked = true;
+            this.CheckRom.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckRom.Location = new System.Drawing.Point(495, 293);
             this.CheckRom.Name = "CheckRom";
             this.CheckRom.Size = new System.Drawing.Size(28, 27);
@@ -804,6 +810,8 @@ namespace UAS_MES_NEW.Make
             // CheckMac
             // 
             this.CheckMac.AutoSize = true;
+            this.CheckMac.Checked = true;
+            this.CheckMac.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckMac.Location = new System.Drawing.Point(23, 113);
             this.CheckMac.Name = "CheckMac";
             this.CheckMac.Size = new System.Drawing.Size(28, 27);
@@ -813,6 +821,8 @@ namespace UAS_MES_NEW.Make
             // CheckBt
             // 
             this.CheckBt.AutoSize = true;
+            this.CheckBt.Checked = true;
+            this.CheckBt.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckBt.Location = new System.Drawing.Point(23, 172);
             this.CheckBt.Name = "CheckBt";
             this.CheckBt.Size = new System.Drawing.Size(28, 27);
@@ -831,6 +841,8 @@ namespace UAS_MES_NEW.Make
             // CheckRam
             // 
             this.CheckRam.AutoSize = true;
+            this.CheckRam.Checked = true;
+            this.CheckRam.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckRam.Location = new System.Drawing.Point(23, 295);
             this.CheckRam.Name = "CheckRam";
             this.CheckRam.Size = new System.Drawing.Size(28, 27);
@@ -840,6 +852,8 @@ namespace UAS_MES_NEW.Make
             // CheckSn
             // 
             this.CheckSn.AutoSize = true;
+            this.CheckSn.Checked = true;
+            this.CheckSn.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckSn.Location = new System.Drawing.Point(23, 57);
             this.CheckSn.Name = "CheckSn";
             this.CheckSn.Size = new System.Drawing.Size(28, 27);
@@ -878,11 +892,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.groupBox1.ResumeLayout(true);
+            this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(true);
+            this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.cs

@@ -358,15 +358,9 @@ namespace UAS_MES_NEW.Make
                             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);
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                            SetCheck set = new SetCheck("OK", Color.Green);
-                            BaseUtil.SetFormCenter(set);
-                            set.ShowDialog();
                             if (ReSet.Checked)
                             {
                                 BaseUtil.GetDataFromDevice("RESET");
@@ -398,14 +392,6 @@ namespace UAS_MES_NEW.Make
                                 //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
                             {
@@ -414,7 +400,6 @@ namespace UAS_MES_NEW.Make
                         }
                         else
                         {
-                            //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
                             OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
                         }
                     }