对接测试项目

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -30,47 +30,51 @@ namespace UAS_MES_NEW.Make
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_GetTestFileData));
             this.pr_detail = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
+            this.remain_qty = new System.Windows.Forms.Label();
             this.mcd_okqty = new System.Windows.Forms.Label();
             this.ma_prodcode = new System.Windows.Forms.Label();
             this.ma_code = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.CheckItemDGV = new System.Windows.Forms.DataGridView();
-            this.msi_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.msi_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.msi_result = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label9 = new System.Windows.Forms.Label();
-            this.BadInfoSource = new System.Windows.Forms.BindingSource(this.components);
-            this.OK = new System.Windows.Forms.RadioButton();
-            this.NG = new System.Windows.Forms.RadioButton();
+            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_sn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_bt = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_imei1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_imei2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_googlekey = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_videotest = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_version = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label6 = new System.Windows.Forms.Label();
+            this.WatchPath = new System.Windows.Forms.TextBox();
+            this.PSN = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.MAC = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.BT = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.IMEI1 = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
+            this.IMEI2 = new System.Windows.Forms.Label();
+            this.label17 = new System.Windows.Forms.Label();
+            this.GoogleKey = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.Aging = new System.Windows.Forms.Label();
+            this.label21 = new System.Windows.Forms.Label();
+            this.Version = new System.Windows.Forms.Label();
+            this.label23 = new System.Windows.Forms.Label();
+            this.MTK = new System.Windows.Forms.RadioButton();
+            this.ZHANXUN = new System.Windows.Forms.RadioButton();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.BadGroupCode = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
-            this.ChoosedDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewExpand();
-            this.choose1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.WaitChooseDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
-            this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.bg_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ChooseedReject = new UAS_MES_NEW.CustomControl.ButtonUtil.ArrowRightButton();
-            this.WaitReject = new UAS_MES_NEW.CustomControl.ButtonUtil.ArrowLeftButton();
-            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
-            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -78,13 +82,15 @@ 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.bccode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bc_code_label = new System.Windows.Forms.Label();
-            this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            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();
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.BadInfoSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             this.SuspendLayout();
             // 
             // pr_detail
@@ -101,18 +107,28 @@ namespace UAS_MES_NEW.Make
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(43, 949);
+            this.label10.Location = new System.Drawing.Point(64, 781);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(53, 35);
             this.label10.TabIndex = 28;
             this.label10.Text = "SN";
             // 
+            // remain_qty
+            // 
+            this.remain_qty.AutoSize = true;
+            this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.remain_qty.Location = new System.Drawing.Point(204, 103);
+            this.remain_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.remain_qty.Name = "remain_qty";
+            this.remain_qty.Size = new System.Drawing.Size(0, 41);
+            this.remain_qty.TabIndex = 26;
+            // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.mcd_okqty.Location = new System.Drawing.Point(200, 100);
+            this.mcd_okqty.Location = new System.Drawing.Point(724, 103);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
             this.mcd_okqty.Size = new System.Drawing.Size(0, 41);
@@ -142,13 +158,24 @@ namespace UAS_MES_NEW.Make
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(50, 100);
+            this.label5.Location = new System.Drawing.Point(574, 103);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(210, 41);
             this.label5.TabIndex = 22;
             this.label5.Text = "当前工单计数";
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label4.Location = new System.Drawing.Point(54, 103);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(114, 41);
+            this.label4.TabIndex = 21;
+            this.label4.Text = "剩余数";
+            // 
             // label3
             // 
             this.label3.AutoSize = true;
@@ -187,76 +214,328 @@ namespace UAS_MES_NEW.Make
             this.CheckItemDGV.AllowUserToAddRows = false;
             this.CheckItemDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.CheckItemDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.msi_makecode,
-            this.msi_sncode,
-            this.msi_result});
+            this.std_class,
+            this.std_testresult,
+            this.std_sn,
+            this.std_mac,
+            this.std_bt,
+            this.std_imei1,
+            this.std_imei2,
+            this.std_googlekey,
+            this.std_videotest,
+            this.std_version});
             this.CheckItemDGV.Location = new System.Drawing.Point(12, 154);
             this.CheckItemDGV.Name = "CheckItemDGV";
             this.CheckItemDGV.RowHeadersWidth = 82;
             this.CheckItemDGV.RowTemplate.Height = 37;
-            this.CheckItemDGV.Size = new System.Drawing.Size(649, 777);
+            this.CheckItemDGV.Size = new System.Drawing.Size(712, 607);
             this.CheckItemDGV.TabIndex = 33;
             this.CheckItemDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.CheckItemDGV_CellPainting);
             // 
-            // msi_makecode
-            // 
-            this.msi_makecode.DataPropertyName = "msi_makecode";
-            this.msi_makecode.HeaderText = "工单号";
-            this.msi_makecode.MinimumWidth = 140;
-            this.msi_makecode.Name = "msi_makecode";
-            this.msi_makecode.ReadOnly = true;
-            this.msi_makecode.Width = 150;
-            // 
-            // msi_sncode
-            // 
-            this.msi_sncode.DataPropertyName = "msi_sncode";
-            this.msi_sncode.HeaderText = "SN";
-            this.msi_sncode.MinimumWidth = 150;
-            this.msi_sncode.Name = "msi_sncode";
-            this.msi_sncode.ReadOnly = true;
-            this.msi_sncode.Width = 200;
-            // 
-            // msi_result
-            // 
-            this.msi_result.DataPropertyName = "msi_result";
-            this.msi_result.HeaderText = "测试结果";
-            this.msi_result.MinimumWidth = 150;
-            this.msi_result.Name = "msi_result";
-            this.msi_result.ReadOnly = true;
-            this.msi_result.Width = 150;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(732, 166);
-            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(210, 41);
-            this.label9.TabIndex = 220;
-            this.label9.Text = "待选不良分组";
-            // 
-            // OK
-            // 
-            this.OK.AutoSize = true;
-            this.OK.Checked = true;
-            this.OK.Location = new System.Drawing.Point(492, 955);
-            this.OK.Name = "OK";
-            this.OK.Size = new System.Drawing.Size(89, 28);
-            this.OK.TabIndex = 227;
-            this.OK.TabStop = true;
-            this.OK.Text = "良品";
-            this.OK.UseVisualStyleBackColor = true;
-            // 
-            // NG
-            // 
-            this.NG.AutoSize = true;
-            this.NG.Location = new System.Drawing.Point(603, 954);
-            this.NG.Name = "NG";
-            this.NG.Size = new System.Drawing.Size(113, 28);
-            this.NG.TabIndex = 228;
-            this.NG.Text = "不良品";
-            this.NG.UseVisualStyleBackColor = true;
+            // std_class
+            // 
+            this.std_class.DataPropertyName = "std_class";
+            this.std_class.HeaderText = "检测项";
+            this.std_class.MinimumWidth = 140;
+            this.std_class.Name = "std_class";
+            this.std_class.ReadOnly = true;
+            this.std_class.Width = 150;
+            // 
+            // std_testresult
+            // 
+            this.std_testresult.DataPropertyName = "std_testresult";
+            this.std_testresult.HeaderText = "测试结果";
+            this.std_testresult.MinimumWidth = 150;
+            this.std_testresult.Name = "std_testresult";
+            this.std_testresult.ReadOnly = true;
+            this.std_testresult.Width = 150;
+            // 
+            // std_sn
+            // 
+            this.std_sn.DataPropertyName = "std_sn";
+            this.std_sn.HeaderText = "SN";
+            this.std_sn.MinimumWidth = 100;
+            this.std_sn.Name = "std_sn";
+            this.std_sn.ReadOnly = true;
+            this.std_sn.Visible = false;
+            this.std_sn.Width = 200;
+            // 
+            // std_mac
+            // 
+            this.std_mac.DataPropertyName = "std_mac";
+            this.std_mac.HeaderText = "MAC";
+            this.std_mac.MinimumWidth = 100;
+            this.std_mac.Name = "std_mac";
+            this.std_mac.Visible = false;
+            this.std_mac.Width = 200;
+            // 
+            // std_bt
+            // 
+            this.std_bt.DataPropertyName = "std_bt";
+            this.std_bt.HeaderText = "BT";
+            this.std_bt.MinimumWidth = 100;
+            this.std_bt.Name = "std_bt";
+            this.std_bt.Visible = false;
+            this.std_bt.Width = 200;
+            // 
+            // std_imei1
+            // 
+            this.std_imei1.DataPropertyName = "std_imei1";
+            this.std_imei1.HeaderText = "IMEI1";
+            this.std_imei1.MinimumWidth = 100;
+            this.std_imei1.Name = "std_imei1";
+            this.std_imei1.Visible = false;
+            this.std_imei1.Width = 200;
+            // 
+            // std_imei2
+            // 
+            this.std_imei2.DataPropertyName = "std_imei2";
+            this.std_imei2.HeaderText = "IMEI2";
+            this.std_imei2.MinimumWidth = 100;
+            this.std_imei2.Name = "std_imei2";
+            this.std_imei2.Visible = false;
+            this.std_imei2.Width = 200;
+            // 
+            // std_googlekey
+            // 
+            this.std_googlekey.DataPropertyName = "std_googlekey";
+            this.std_googlekey.HeaderText = "GoogleKey";
+            this.std_googlekey.MinimumWidth = 10;
+            this.std_googlekey.Name = "std_googlekey";
+            this.std_googlekey.Visible = false;
+            this.std_googlekey.Width = 200;
+            // 
+            // std_videotest
+            // 
+            this.std_videotest.DataPropertyName = "std_videotest";
+            this.std_videotest.HeaderText = "老化测试";
+            this.std_videotest.MinimumWidth = 10;
+            this.std_videotest.Name = "std_videotest";
+            this.std_videotest.Visible = false;
+            this.std_videotest.Width = 200;
+            // 
+            // std_version
+            // 
+            this.std_version.DataPropertyName = "std_version";
+            this.std_version.HeaderText = "软件版本";
+            this.std_version.MinimumWidth = 10;
+            this.std_version.Name = "std_version";
+            this.std_version.Visible = false;
+            this.std_version.Width = 200;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label6.Location = new System.Drawing.Point(1197, 781);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(146, 41);
+            this.label6.TabIndex = 37;
+            this.label6.Text = "监控路径";
+            // 
+            // WatchPath
+            // 
+            this.WatchPath.Enabled = false;
+            this.WatchPath.Location = new System.Drawing.Point(1367, 785);
+            this.WatchPath.Name = "WatchPath";
+            this.WatchPath.Size = new System.Drawing.Size(258, 35);
+            this.WatchPath.TabIndex = 36;
+            this.WatchPath.Text = "/sdcard/factory";
+            // 
+            // PSN
+            // 
+            this.PSN.AutoSize = true;
+            this.PSN.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.PSN.Location = new System.Drawing.Point(955, 161);
+            this.PSN.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PSN.Name = "PSN";
+            this.PSN.Size = new System.Drawing.Size(0, 41);
+            this.PSN.TabIndex = 39;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label8.Location = new System.Drawing.Point(761, 161);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(62, 41);
+            this.label8.TabIndex = 38;
+            this.label8.Text = "SN";
+            // 
+            // MAC
+            // 
+            this.MAC.AutoSize = true;
+            this.MAC.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.MAC.Location = new System.Drawing.Point(955, 234);
+            this.MAC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.MAC.Name = "MAC";
+            this.MAC.Size = new System.Drawing.Size(0, 41);
+            this.MAC.TabIndex = 41;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label11.Location = new System.Drawing.Point(761, 234);
+            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(93, 41);
+            this.label11.TabIndex = 40;
+            this.label11.Text = "MAC";
+            // 
+            // BT
+            // 
+            this.BT.AutoSize = true;
+            this.BT.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.BT.Location = new System.Drawing.Point(955, 299);
+            this.BT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BT.Name = "BT";
+            this.BT.Size = new System.Drawing.Size(0, 41);
+            this.BT.TabIndex = 43;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label13.Location = new System.Drawing.Point(761, 299);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(56, 41);
+            this.label13.TabIndex = 42;
+            this.label13.Text = "BT";
+            // 
+            // IMEI1
+            // 
+            this.IMEI1.AutoSize = true;
+            this.IMEI1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.IMEI1.Location = new System.Drawing.Point(955, 371);
+            this.IMEI1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.IMEI1.Name = "IMEI1";
+            this.IMEI1.Size = new System.Drawing.Size(0, 41);
+            this.IMEI1.TabIndex = 45;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label15.Location = new System.Drawing.Point(761, 365);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(104, 41);
+            this.label15.TabIndex = 44;
+            this.label15.Text = "IMEI1";
+            // 
+            // IMEI2
+            // 
+            this.IMEI2.AutoSize = true;
+            this.IMEI2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.IMEI2.Location = new System.Drawing.Point(1505, 175);
+            this.IMEI2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.IMEI2.Name = "IMEI2";
+            this.IMEI2.Size = new System.Drawing.Size(0, 41);
+            this.IMEI2.TabIndex = 47;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label17.Location = new System.Drawing.Point(1276, 161);
+            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(104, 41);
+            this.label17.TabIndex = 46;
+            this.label17.Text = "IMEI2";
+            // 
+            // GoogleKey
+            // 
+            this.GoogleKey.AutoSize = true;
+            this.GoogleKey.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.GoogleKey.Location = new System.Drawing.Point(1505, 246);
+            this.GoogleKey.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.GoogleKey.Name = "GoogleKey";
+            this.GoogleKey.Size = new System.Drawing.Size(0, 41);
+            this.GoogleKey.TabIndex = 49;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label19.Location = new System.Drawing.Point(1276, 236);
+            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(184, 41);
+            this.label19.TabIndex = 48;
+            this.label19.Text = "GoogleKey";
+            // 
+            // Aging
+            // 
+            this.Aging.AutoSize = true;
+            this.Aging.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Aging.Location = new System.Drawing.Point(1505, 299);
+            this.Aging.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Aging.Name = "Aging";
+            this.Aging.Size = new System.Drawing.Size(0, 41);
+            this.Aging.TabIndex = 51;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label21.Location = new System.Drawing.Point(1276, 299);
+            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(146, 41);
+            this.label21.TabIndex = 50;
+            this.label21.Text = "老化时长";
+            // 
+            // Version
+            // 
+            this.Version.AutoSize = true;
+            this.Version.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Version.Location = new System.Drawing.Point(1506, 371);
+            this.Version.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Version.MaximumSize = new System.Drawing.Size(360, 0);
+            this.Version.Name = "Version";
+            this.Version.Size = new System.Drawing.Size(0, 41);
+            this.Version.TabIndex = 53;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label23.Location = new System.Drawing.Point(1276, 365);
+            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(146, 41);
+            this.label23.TabIndex = 52;
+            this.label23.Text = "软件版本";
+            // 
+            // MTK
+            // 
+            this.MTK.AutoSize = true;
+            this.MTK.Checked = true;
+            this.MTK.Location = new System.Drawing.Point(516, 786);
+            this.MTK.Name = "MTK";
+            this.MTK.Size = new System.Drawing.Size(77, 28);
+            this.MTK.TabIndex = 54;
+            this.MTK.TabStop = true;
+            this.MTK.Text = "MTK";
+            this.MTK.UseVisualStyleBackColor = true;
+            this.MTK.Visible = false;
+            // 
+            // ZHANXUN
+            // 
+            this.ZHANXUN.AutoSize = true;
+            this.ZHANXUN.Location = new System.Drawing.Point(613, 786);
+            this.ZHANXUN.Name = "ZHANXUN";
+            this.ZHANXUN.Size = new System.Drawing.Size(89, 28);
+            this.ZHANXUN.TabIndex = 55;
+            this.ZHANXUN.TabStop = true;
+            this.ZHANXUN.Text = "展讯";
+            this.ZHANXUN.UseVisualStyleBackColor = true;
+            this.ZHANXUN.Visible = false;
             // 
             // dataGridViewTextBoxColumn1
             // 
@@ -286,213 +565,6 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn3.ReadOnly = true;
             this.dataGridViewTextBoxColumn3.Visible = false;
             // 
-            // OperateResult
-            // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(897, 773);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(856, 214);
-            this.OperateResult.TabIndex = 226;
-            this.OperateResult.Text = "";
-            // 
-            // BadGroupCode
-            // 
-            this.BadGroupCode.FormattingEnabled = true;
-            this.BadGroupCode.Location = new System.Drawing.Point(940, 172);
-            this.BadGroupCode.Margin = new System.Windows.Forms.Padding(4);
-            this.BadGroupCode.Name = "BadGroupCode";
-            this.BadGroupCode.Size = new System.Drawing.Size(258, 32);
-            this.BadGroupCode.TabIndex = 225;
-            this.BadGroupCode.SelectedIndexChanged += new System.EventHandler(this.BadGroupCode_SelectedIndexChanged);
-            // 
-            // ChoosedDGV
-            // 
-            this.ChoosedDGV.AllowUserToAddRows = false;
-            this.ChoosedDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.ChoosedDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.choose1,
-            this.or_id,
-            this.bg_name1,
-            this.bg_code1,
-            this.bc_code1,
-            this.bc_name1});
-            this.ChoosedDGV.Location = new System.Drawing.Point(1291, 225);
-            this.ChoosedDGV.Margin = new System.Windows.Forms.Padding(6);
-            this.ChoosedDGV.Name = "ChoosedDGV";
-            this.ChoosedDGV.RowHeadersWidth = 20;
-            this.ChoosedDGV.RowTemplate.Height = 23;
-            this.ChoosedDGV.Size = new System.Drawing.Size(462, 514);
-            this.ChoosedDGV.TabIndex = 224;
-            // 
-            // choose1
-            // 
-            this.choose1.HeaderText = "勾选";
-            this.choose1.MinimumWidth = 50;
-            this.choose1.Name = "choose1";
-            this.choose1.Width = 50;
-            // 
-            // or_id
-            // 
-            this.or_id.DataPropertyName = "or_id";
-            this.or_id.HeaderText = "or_id";
-            this.or_id.MinimumWidth = 10;
-            this.or_id.Name = "or_id";
-            this.or_id.Visible = false;
-            this.or_id.Width = 200;
-            // 
-            // bg_name1
-            // 
-            this.bg_name1.DataPropertyName = "bg_name";
-            this.bg_name1.HeaderText = "不良组别名称";
-            this.bg_name1.MinimumWidth = 10;
-            this.bg_name1.Name = "bg_name1";
-            this.bg_name1.Visible = false;
-            this.bg_name1.Width = 200;
-            // 
-            // bg_code1
-            // 
-            this.bg_code1.DataPropertyName = "bg_code";
-            this.bg_code1.HeaderText = "不良组别编号";
-            this.bg_code1.MinimumWidth = 10;
-            this.bg_code1.Name = "bg_code1";
-            this.bg_code1.Visible = false;
-            this.bg_code1.Width = 200;
-            // 
-            // bc_code1
-            // 
-            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.bc_code1.DataPropertyName = "bc_code";
-            this.bc_code1.HeaderText = "不良代码";
-            this.bc_code1.MinimumWidth = 10;
-            this.bc_code1.Name = "bc_code1";
-            this.bc_code1.ReadOnly = true;
-            this.bc_code1.Width = 200;
-            // 
-            // bc_name1
-            // 
-            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.bc_name1.DataPropertyName = "bc_name";
-            this.bc_name1.HeaderText = "不良名称 ";
-            this.bc_name1.MinimumWidth = 10;
-            this.bc_name1.Name = "bc_name1";
-            this.bc_name1.ReadOnly = true;
-            // 
-            // WaitChooseDGV
-            // 
-            this.WaitChooseDGV.AllowUserToAddRows = false;
-            this.WaitChooseDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.WaitChooseDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ChooseAll,
-            this.bg_name,
-            this.bg_code,
-            this.bc_code,
-            this.bc_name});
-            this.WaitChooseDGV.Location = new System.Drawing.Point(739, 225);
-            this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(6);
-            this.WaitChooseDGV.Name = "WaitChooseDGV";
-            this.WaitChooseDGV.RowHeadersWidth = 20;
-            this.WaitChooseDGV.RowTemplate.Height = 23;
-            this.WaitChooseDGV.Size = new System.Drawing.Size(415, 512);
-            this.WaitChooseDGV.TabIndex = 223;
-            // 
-            // ChooseAll
-            // 
-            this.ChooseAll.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.ChooseAll.DataPropertyName = "ChooseAll";
-            this.ChooseAll.HeaderText = "勾选";
-            this.ChooseAll.MinimumWidth = 10;
-            this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ChooseAll.Width = 60;
-            // 
-            // bg_name
-            // 
-            this.bg_name.DataPropertyName = "bg_name";
-            this.bg_name.HeaderText = "不良组别名称";
-            this.bg_name.MinimumWidth = 10;
-            this.bg_name.Name = "bg_name";
-            this.bg_name.Visible = false;
-            this.bg_name.Width = 200;
-            // 
-            // bg_code
-            // 
-            this.bg_code.DataPropertyName = "bg_code";
-            this.bg_code.HeaderText = "不良组别编号";
-            this.bg_code.MinimumWidth = 10;
-            this.bg_code.Name = "bg_code";
-            this.bg_code.Visible = false;
-            this.bg_code.Width = 200;
-            // 
-            // bc_code
-            // 
-            this.bc_code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.bc_code.DataPropertyName = "bc_code";
-            this.bc_code.HeaderText = "不良代码";
-            this.bc_code.MinimumWidth = 10;
-            this.bc_code.Name = "bc_code";
-            this.bc_code.ReadOnly = true;
-            this.bc_code.Width = 130;
-            // 
-            // bc_name
-            // 
-            this.bc_name.DataPropertyName = "bc_name";
-            this.bc_name.HeaderText = "不良名称";
-            this.bc_name.MinimumWidth = 10;
-            this.bc_name.Name = "bc_name";
-            this.bc_name.ReadOnly = true;
-            this.bc_name.Width = 200;
-            // 
-            // ChooseedReject
-            // 
-            this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(1169, 407);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(6);
-            this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(100, 46);
-            this.ChooseedReject.TabIndex = 222;
-            this.ChooseedReject.UseVisualStyleBackColor = true;
-            this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
-            // 
-            // WaitReject
-            // 
-            this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(1169, 525);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(6);
-            this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(100, 46);
-            this.WaitReject.TabIndex = 221;
-            this.WaitReject.UseVisualStyleBackColor = true;
-            this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
-            // 
-            // 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;
-            this.StepCount.Load += new System.EventHandler(this.StepCount_Load_1);
-            // 
-            // sncode
-            // 
-            this.sncode.AllPower = null;
-            this.sncode.BackColor = System.Drawing.Color.White;
-            this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(123, 949);
-            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);
-            // 
             // dataGridViewTextBoxColumn4
             // 
             this.dataGridViewTextBoxColumn4.DataPropertyName = "std_badcode";
@@ -556,83 +628,139 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn10.Visible = false;
             this.dataGridViewTextBoxColumn10.Width = 200;
             // 
-            // bccode
-            // 
-            this.bccode.AllPower = null;
-            this.bccode.BackColor = System.Drawing.Color.White;
-            this.bccode.ID = null;
-            this.bccode.Location = new System.Drawing.Point(1463, 172);
-            this.bccode.Margin = new System.Windows.Forms.Padding(6);
-            this.bccode.Name = "bccode";
-            this.bccode.Power = null;
-            this.bccode.Size = new System.Drawing.Size(290, 35);
-            this.bccode.Str = null;
-            this.bccode.Str1 = null;
-            this.bccode.Str2 = null;
-            this.bccode.TabIndex = 230;
-            this.bccode.Tag = "bc_code";
-            this.bccode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bccode_KeyDown);
-            // 
-            // bc_code_label
-            // 
-            this.bc_code_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.bc_code_label.AutoSize = true;
-            this.bc_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_code_label.Location = new System.Drawing.Point(1284, 166);
-            this.bc_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.bc_code_label.Name = "bc_code_label";
-            this.bc_code_label.Size = new System.Drawing.Size(146, 41);
-            this.bc_code_label.TabIndex = 229;
-            this.bc_code_label.Text = "不良代码";
-            // 
-            // Confirm
-            // 
-            this.Confirm.AllPower = "ifall";
-            this.Confirm.BackColor = System.Drawing.Color.Transparent;
-            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
-            this.Confirm.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
-            this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(731, 939);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(6);
-            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
-            this.Confirm.Name = "Confirm";
-            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
-            this.Confirm.Power = "IFREAD";
-            this.Confirm.Size = new System.Drawing.Size(120, 48);
-            this.Confirm.TabIndex = 231;
-            this.Confirm.Tag = "ifread";
-            this.Confirm.Text = "确认";
-            this.Confirm.UseVisualStyleBackColor = true;
-            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 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(768, 475);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(991, 286);
+            this.OperateResult.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(1506, 423);
+            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(1276, 423);
+            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(955, 423);
+            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(761, 423);
+            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 = "运行内存";
             // 
             // Make_GetTestFileData
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1772, 1002);
-            this.Controls.Add(this.Confirm);
-            this.Controls.Add(this.bccode);
-            this.Controls.Add(this.bc_code_label);
-            this.Controls.Add(this.NG);
-            this.Controls.Add(this.OK);
-            this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.BadGroupCode);
-            this.Controls.Add(this.ChoosedDGV);
-            this.Controls.Add(this.WaitChooseDGV);
-            this.Controls.Add(this.ChooseedReject);
-            this.Controls.Add(this.WaitReject);
+            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.ZHANXUN);
+            this.Controls.Add(this.MTK);
+            this.Controls.Add(this.Version);
+            this.Controls.Add(this.label23);
+            this.Controls.Add(this.Aging);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.GoogleKey);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.IMEI2);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.IMEI1);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.BT);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.MAC);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.PSN);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.WatchPath);
+            this.Controls.Add(this.ReSet);
             this.Controls.Add(this.CheckItemDGV);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.label10);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.remain_qty);
             this.Controls.Add(this.mcd_okqty);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.label5);
+            this.Controls.Add(this.label4);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
@@ -643,10 +771,7 @@ namespace UAS_MES_NEW.Make
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.BadInfoSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -655,51 +780,62 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.Label pr_detail;
         private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
         private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label remain_qty;
         private System.Windows.Forms.Label mcd_okqty;
         private System.Windows.Forms.Label ma_prodcode;
         private System.Windows.Forms.Label ma_code;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.DataGridView CheckItemDGV;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private ReSetCheckBox ReSet;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox WatchPath;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
-        private CustomControl.ComBoxWithFocus.ComBoxWithFocus BadGroupCode;
-        private CustomControl.DataGrid_View.DataGridViewExpand ChoosedDGV;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn choose1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn or_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_name1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
-        private CustomControl.DataGrid_View.DataGridViewWithCheckBox WaitChooseDGV;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn ChooseAll;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_name;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_code;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name;
-        private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
-        private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
+        private System.Windows.Forms.Label PSN;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label MAC;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label BT;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label IMEI1;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.Label IMEI2;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label GoogleKey;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.Label Aging;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.Label Version;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_class;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_testresult;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_sn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_mac;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_bt;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_imei1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_imei2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_googlekey;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_videotest;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_version;
+        private System.Windows.Forms.RadioButton MTK;
+        private System.Windows.Forms.RadioButton ZHANXUN;
+        private System.Windows.Forms.Label rom;
         private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.BindingSource BadInfoSource;
-        private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private System.Windows.Forms.RadioButton OK;
-        private System.Windows.Forms.RadioButton NG;
-        private System.Windows.Forms.DataGridViewTextBoxColumn msi_makecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn msi_sncode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn msi_result;
-        private CustomControl.TextBoxWithIcon.EnterTextBox bccode;
-        private System.Windows.Forms.Label bc_code_label;
-        private CustomControl.ButtonUtil.NormalButton Confirm;
+        private System.Windows.Forms.Label ram;
+        private System.Windows.Forms.Label label14;
     }
 }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.cs

@@ -1,5 +1,4 @@
-using HslCommunication;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -41,6 +40,7 @@ namespace UAS_MES_NEW.Make
             //聚焦SN号
             sncode.Focus();
             //打开界面提示用户：请输入SN 
+            OperateResult.AppendText(">>请输入SN\n", Color.Black);
             sql = new LogStringBuilder();
             dh = SystemInf.dh;
             StepCount.StepCode = User.CurrentStepCode;
@@ -48,27 +48,6 @@ namespace UAS_MES_NEW.Make
             StepCount.LineCode = User.UserLineCode;
             StepCount.Dh = dh;
             StepCount.Start();
-
-            sql.Clear();
-            sql.Append("select bg_code,bg_code||':'||bg_name bg_name from PRODUCTBADGROUP left join productkind on ");
-            sql.Append("pk_code= pb_kindcode left join product on pr_kind=pk_name left join ");
-            sql.Append("badgroup on  bg_code=pb_badgroup where pr_code='" + ma_prodcode.Text + "'");
-            DataTable BadCode = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (BadCode.Rows.Count > 0)
-            {
-                BadGroupCode.DisplayMember = "bg_name";
-                BadGroupCode.ValueMember = "bg_code";
-                BadGroupCode.DataSource = BadCode;
-            }
-            else
-            {
-                BadCode = (DataTable)dh.ExecuteSql("select bg_code,bg_name from badgroup where bg_statuscode='AUDITED'", "select");
-                BadGroupCode.DisplayMember = "bg_name";
-                BadGroupCode.ValueMember = "bg_code";
-                BadGroupCode.DataSource = BadCode;
-            }
-            DataTable dt = (DataTable)dh.ExecuteSql("select or_badcode bc_code,or_description bc_name,or_bgcode bg_code,bg_name from OQCNGReason left join badgroup on or_bgcode=bg_code where or_sncode='" + sncode.Text + "'", "select");
-            BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
         }
 
         private void Make_LabelCheck_SizeChanged(object sender, EventArgs e)
@@ -78,12 +57,12 @@ 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("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-            //sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
-            //DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            //BaseUtil.SetFormValue(Controls, dt);
+            sql.Clear();
+            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+            sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.SetFormValue(Controls, dt);
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)
@@ -93,76 +72,286 @@ namespace UAS_MES_NEW.Make
             {
                 if (sncode.Text == "")
                 {
-                    OperateResult.AppendText("SN不允许为空");
+                    OperateResult.AppendText("<<输入不能为空\n", Color.Red);
                     return;
                 }
-                DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_prodcode,pr_detail from makeserial left join product on pr_code=ms_prodcode where ms_sncode='" + sncode.Text + "' order by ms_id desc", "select");
-                if (dt.Rows.Count == 0)
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                 {
-                    OperateResult.AppendText("SN【" + sncode.Text + "】不存在\n", Color.Red);
-                    return;
-                }
-                
-                ma_code.Text = dt.Rows[0]["ms_makecode"].ToString();
-                ma_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
-                pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
+                    DataTable dt1 = new DataTable();
+                    dt1 = (DataTable)dh.ExecuteSql("select 1 from makeserial where ms_sncode='" + sncode.Text + "'", "select");
+                    if (dt1.Rows.Count == 0)
+                    {
+                        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))
+                    {
+                        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_class";
+                        dt.Columns[1].ColumnName = "std_testresult";
+                        dt.Columns[2].ColumnName = "std_sn";
+                        dt.Columns[3].ColumnName = "std_mac";
+                        dt.Columns[4].ColumnName = "std_bt";
+                        dt.Columns[5].ColumnName = "std_imei1";
+                        dt.Columns[6].ColumnName = "std_imei2";
+                        dt.Columns[7].ColumnName = "std_googlekey";
+                        dt.Columns[8].ColumnName = "std_videotest";
+                        dt.Columns[9].ColumnName = "std_version";
+                        dt.Columns[10].ColumnName = "std_rom";
+                        dt.Columns[11].ColumnName = "std_ram";
+                        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();
+                            Aging.Text = dt.Rows[0]["std_videotest"].ToString().Replace("null", "").Replace("unknow", "").ToUpper();
+                            Version.Text = dt.Rows[0]["std_version"].ToString().Replace("null", "").Replace("unknow", "");
+                            ram.Text = dt.Rows[0]["std_ram"].ToString().Replace("null", "").Replace("unknow", "");
+                            rom.Text = dt.Rows[0]["std_rom"].ToString().Replace("null", "").Replace("unknow", "");
+                        }
+                    }
+                    if (dt.Columns.Count == 9 || dt.Columns.Count == 8)
+                    {
+                        //设置列名绑定数据
+                        dt.Columns[0].ColumnName = "std_class";
+                        dt.Columns[1].ColumnName = "std_testresult";
+                        dt.Columns[2].ColumnName = "std_sn";
+                        dt.Columns[3].ColumnName = "std_mac";
+                        dt.Columns[4].ColumnName = "std_bt";
+                        dt.Columns[5].ColumnName = "std_version";
+                        dt.Columns[6].ColumnName = "std_rom";
+                        dt.Columns[7].ColumnName = "std_ram";
+                        if (dt.Rows.Count > 0)
+                        {
+                            PSN.Text = dt.Rows[0]["std_sn"].ToString();
+                            if (sncode.Text != PSN.Text)
+                            {
+                                OperateResult.AppendText("扫描SN【" + sncode.Text + "】和设备读取SN【" + PSN.Text + "不相符】\n", Color.Red);
+                                BaseUtil.CleanControls(this.Controls);
+                                WatchPath.Text = "/sdcard/factory";
+                                return;
+                            }
+                            MAC.Text = dt.Rows[0]["std_mac"].ToString().Replace(":", "").ToUpper();
+                            BT.Text = dt.Rows[0]["std_bt"].ToString().Replace(":", "").ToUpper();
+                            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();
+                    CheckItemDGV.DataSource = dt;
+                    bool Result = true;
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        if (dt.Rows[i]["std_testresult"].ToString() != "OK" || dt.Rows[i]["std_testresult"].ToString() == "NOTEST")
+                        {
+                            Result = false;
+                        }
+                        dh.ExecuteSql("insert into STEPTESTDETAIL(std_id,std_sn,std_indate,std_class,std_testtimes,std_testresult,std_badcode) values(STEPTESTDETAIL_seq.nextval,'" + sncode.Text + "',sysdate,'" + dt.Rows[i]["std_class"].ToString() + "','','" + dt.Rows[i]["std_testresult"].ToString() + "','')", "insert");
+                    }
+                    //IMEI核对
+                    dt = (DataTable)dh.ExecuteSql("select mil_imei1,mil_imei2 from makeimeilist where mil_psn='" + PSN.Text + "'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        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 != "")
+                        {
+                            OperateResult.AppendText(PSN.Text + "【IMEI2】比对成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(PSN.Text + "读取【IMEI2】:" + IMEI2.Text + ",系统导入:" + imei2 + ",比对失败\n", Color.Red);
+                        }
+                    }
+                    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 != "")
+                        {
+                            OperateResult.AppendText(PSN.Text + "【MAC】比对成功\n", Color.Green);
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(PSN.Text + "读取【MAC】:" + MAC.Text + ",系统导入:" + mac + ",比对失败\n", Color.Red);
+                        }
+                        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);
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(PSN.Text + "未导入MAC/BT\n", Color.Red);
+                    }
 
-                dt = (DataTable)dh.ExecuteSql("select msi_result from makeserial_inspect  where msi_sncode='" + sncode.Text + "'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    OperateResult.AppendText("SN【" + sncode.Text + "】已抽检，检验结果为'" + dt.Rows[0]["msi_result"].ToString() + "'\n");
-                    return;
-                }
-                if (OK.Checked)
-                {
-                    dh.ExecuteSql("insert into makeserial_inspect(msi_id,msi_sncode,msi_makecode,msi_indate,msi_result,msi_inman,msi_source)values(makeserial_inspect_seq.nextval,'" + sncode.Text + "','" + ma_code.Text + "',sysdate,'OK','" + User.UserName + "','" + User.UserSourceCode + "')", "insert");
-                    sncode.Text = "";
-                }
-                else
-                {
-                    List<string> bc_code = new List<string>();
-                    List<string> bc_name = new List<string>();
-                    List<string> bg_code = new List<string>();
-                    List<string> bg_name = new List<string>();
-                    for (int i = 0; i < ChoosedDGV.RowCount; i++)
+                    //if (Aging.Text == "")
+                    //{
+                    //    OperateResult.AppendText(">>" + sncode.Text + "设备未进行老化测试\n");
+                    //    return;
+                    //}
+                    if (true)
                     {
-                        bc_code.Add(ChoosedDGV.Rows[i].Cells["bc_code1"].Value.ToString());
-                        bc_name.Add(ChoosedDGV.Rows[i].Cells["bc_name1"].Value.ToString());
-                        bg_code.Add(ChoosedDGV.Rows[i].Cells["bg_code1"].Value.ToString());
-                        bg_name.Add(ChoosedDGV.Rows[i].Cells["bg_name1"].Value.ToString());
+                        //提示正确返回时传递的信息
+                        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);
+                        //    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);
+                        //}
                     }
-                    if (bc_code.ToArray().Length == 0)
+                    else
                     {
-                        OperateResult.AppendText(">>不良品请勾选不良明细\n", Color.Red);
-                        return;
+                        //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                        OperateResult.AppendText(">>序列号" + sncode.Text + "测试不通过\n", Color.Red, sncode);
                     }
-                    sql.Clear();
-                    sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
-                    sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_badname,mb_status,mb_bgname,mb_type)");
-                    sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
-                    sql.Append("sp_soncode,:bc_name,'0',:bg_name,'Client' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
-                    sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode.Text + "' and ms_makecode='" + ma_code.Text + "'");
-                    dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "bg_code", "bc_name", "bg_name" }, bc_code.ToArray(), bg_code.ToArray(), bc_name.ToArray(), bg_name.ToArray());
-                    dh.ExecuteSql("insert into makeserial_inspect(msi_id,msi_sncode,msi_makecode,msi_indate,msi_result,msi_inman,msi_source)values(makeserial_inspect_seq.nextval,'" + sncode.Text + "','" + ma_code.Text + "',sysdate,'NG','" + User.UserName + "','" + User.UserSourceCode + "')", "insert");
-                    sncode.Text = "";
                 }
-                LoadGridData();
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                //}
+                //}
+                else
+                {
+                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                }
             }
         }
 
-
         private void StepCount_Load(object sender, EventArgs e)
         {
 
         }
 
-        private void LoadGridData()
-        {
-
-            DataTable dt = (DataTable)dh.ExecuteSql("select MSI_ID, MSI_SNCODE, MSI_MAKECODE, MSI_INDATE, MSI_RESULT from makeserial_inspect where msi_makecode='" + ma_code.Text + "'", "select");
-            CheckItemDGV.DataSource = dt;
-        }
-
         private void CheckItemDGV_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
         {
             //系统值和
@@ -194,129 +383,5 @@ namespace UAS_MES_NEW.Make
                 }
             }
         }
-
-        private void BadGroupCode_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string bg_code = BadGroupCode.SelectedValue.ToString();
-            sql.Clear();
-            sql.Append("select 0 ChooseAll,bc_code,bc_name,bg_name,bg_code from badgroupdetail left join badgroup on bg_id=bgd_bgid ");
-            sql.Append("left join badcode on bgd_badcode=bc_code where bg_code='" + ((bg_code != "" && bg_code != "System.Data.DataRowView") ? bg_code.ToString() : "") + "' and bg_code is not null ");
-            sql.Append(" order by bc_code");
-            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            BadInfoSource.DataSource = dt;
-            BaseUtil.FillDgvWithDataTable(WaitChooseDGV, dt);
-        }
-
-        private void ChooseedReject_Click(object sender, EventArgs e)
-        {
-            DataTable wait = BaseUtil.filterDataTable((DataTable)WaitChooseDGV.DataSource, "ChooseAll<>0");
-            DataTable choose = (ChoosedDGV.DataSource as DataTable);
-            List<string> Chooseed = new List<string>();
-            for (int i = 0; i < choose.Rows.Count; i++)
-            {
-                Chooseed.Add(choose.Rows[i]["bc_code"].ToString());
-            }
-            if (wait.Rows.Count > 0)
-            {
-                for (int i = 0; i < wait.Rows.Count; i++)
-                {
-                    if (!Chooseed.Contains(wait.Rows[i]["bc_code"].ToString()))
-                    {
-                        DataRow dr1 = choose.NewRow();
-                        dr1["bc_code"] = wait.Rows[i]["bc_code"];
-                        dr1["bc_name"] = wait.Rows[i]["bc_name"];
-                        dr1["bg_code"] = wait.Rows[i]["bg_code"];
-                        dr1["bg_name"] = wait.Rows[i]["bg_name"];
-                        choose.Rows.Add(dr1);
-                    }
-                }
-                for (int i = 0; i < WaitChooseDGV.Rows.Count; i++)
-                {
-                    ((DataTable)WaitChooseDGV.DataSource).Rows[i]["ChooseAll"] = 0;
-                }
-            }
-            else OperateResult.AppendText(">>请勾选不良明细\n", Color.Red);
-        }
-
-        private void WaitReject_Click(object sender, EventArgs e)
-        {
-            for (int i = ChoosedDGV.Rows.Count - 1; i >= 0; i--)
-            {
-                if (ChoosedDGV.Rows[i].Cells["choose1"].FormattedValue.ToString() == "True")
-                {
-                    ChoosedDGV.Rows.RemoveAt(i);
-                }
-            }
-            (ChoosedDGV.DataSource as DataTable).AcceptChanges();
-        }
-
-        private void StepCount_Load_1(object sender, EventArgs e)
-        {
-
-        }
-
-        private void bccode_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                DataTable dt = (DataTable)dh.ExecuteSql("select bc_code bg_code,bc_name bg_name from badcode where bc_code='" + bccode.Text + "'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    try
-                    {
-                        for (int i = 0; i < ChoosedDGV.Rows.Count; i++)
-                        {
-                            if (ChoosedDGV.Rows[i].Cells[1].Value.ToString() == dt.Rows[0][0].ToString())
-                            {
-                                OperateResult.AppendText(">>已添加过不良代码" + bccode.Text + "\n", Color.Red);
-                                bccode.Clear();
-                                return;
-                            }
-                        }
-                        dt.Merge(ChoosedDGV.DataSource as DataTable);
-                        BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
-                        bccode.Clear();
-                    }
-                    catch (Exception) { }
-                }
-                else OperateResult.AppendText(">>不良代码不存在\n", Color.Red);
-            }
-        }
-
-        private void Confirm_Click(object sender, EventArgs e)
-        {
-            if (OK.Checked)
-            {
-                dh.ExecuteSql("insert into makeserial_inspect(msi_id,msi_sncode,msi_makecode,msi_indate,msi_result,msi_inman,msi_source)values(makeserial_inspect_seq.nextval,'" + sncode.Text + "','" + ma_code.Text + "',sysdate,'OK','" + User.UserName + "','" + User.UserSourceCode + "')", "insert");
-            }
-            else
-            {
-                List<string> bc_code = new List<string>();
-                List<string> bc_name = new List<string>();
-                List<string> bg_code = new List<string>();
-                List<string> bg_name = new List<string>();
-                for (int i = 0; i < ChoosedDGV.RowCount; i++)
-                {
-                    bc_code.Add(ChoosedDGV.Rows[i].Cells["bc_code1"].Value.ToString());
-                    bc_name.Add(ChoosedDGV.Rows[i].Cells["bc_name1"].Value.ToString());
-                    bg_code.Add(ChoosedDGV.Rows[i].Cells["bg_code1"].Value.ToString());
-                    bg_name.Add(ChoosedDGV.Rows[i].Cells["bg_name1"].Value.ToString());
-                }
-                if (bc_code.ToArray().Length == 0)
-                {
-                    OperateResult.AppendText(">>不良品请勾选不良明细\n", Color.Red);
-                }
-                sql.Clear();
-                sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
-                sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_badname,mb_status,mb_bgname,mb_type)");
-                sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
-                sql.Append("sp_soncode,:bc_name,'0',:bg_name,'Client' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
-                sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode.Text + "' and ms_makecode='" + ma_code.Text + "'");
-                dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "bg_code", "bc_name", "bg_name" }, bc_code.ToArray(), bg_code.ToArray(), bc_name.ToArray(), bg_name.ToArray());
-
-                dh.ExecuteSql("insert into makeserial_inspect(msi_id,msi_sncode,msi_makecode,msi_indate,msi_result,msi_inman,msi_source)values(makeserial_inspect_seq.nextval,'" + sncode.Text + "','" + ma_code.Text + "',sysdate,'NG','" + User.UserName + "','" + User.UserSourceCode + "')", "insert");
-            }
-            LoadGridData();
-        }
     }
 }

UAS_MES_PNE/FunctionCode/Make/Make_GetTestFileData.resx

@@ -117,261 +117,34 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="msi_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_class.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="msi_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_testresult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="msi_result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_sn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="msi_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="msi_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_bt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="msi_result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_imei1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="BadInfoSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="choose1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="choose1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_imei2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_googlekey.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_videotest.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="ChooseedReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH3wYWEw4tELKVawAAAslJREFU
-        SEuN1kuojVEYxvHtco77JUUpURQliQxcE+0BMlIkBpJQJmJwBqRMKAZKykSMkJEwUaIwcElIKQzccz2i
-        3HP3f77Wu8679n6d7a3f4Fuf5znZ+9trfbV6vb4bD7vxBPvQF/r3tcZJ65NwFY8R9TzCTcyCZVJDw3Bj
-        LM7jTze+YiPCsrTWEx34iajDXMRoNPXkSTcn4w6iEvMWS2CZ1JA7RJ/mAUR57xiGoOjJYzewEK8RlZgH
-        mI6cs3FrI9Hqk/+NXWhD0VONLSbr8BlRkdFzo68854KeabiPKG/0SGxAzhXjbvTGTvxCVGSOYxiKMrtO
-        luE9orzpxGLkXDHuxiAcRlTi7UUfFGV2jR7YhlYP/j1MRc7m8YsYhQuISsw3bEbO2bi1gTiCKO/pF6m/
-        WfRUY4vJFNxFVGLeYSlyzsatjcEVRHnvKPQtpQY3WnQWodUvUpviTORc0DMbTxHljZ5jPc9tVUHjcMNb
-        j4+Iisw1jEeVsbHrZBU+IMqbT+hI8ebhphmAs4hKvO2oMn5sDf1xBlHW60zRcrjhrUGr/+ENTECVsbHr
-        ZAVabRFfsCXFu4ZFbz5eICowzzEPORf0aDPVaRDlvT1orwpsWPD0jOhUj8JGz8Bq5JyNWxuBc4jy3ilU
-        G3IxWkh08ySisNGvZQd6ocrZ2DXaodeeKO/dQtPX74t0SOpjjMKeTvrBKIrsOtFZqjMuypuX0ORcVKRD
-        slXRZWhT7Cph7DqZg2eI8kYP9lrkXFS0AP+zWc5Aztm4NR0ZlxDljV5f9Narl4CixxdNxG1EBUY/6eXI
-        ORu31g+HEOU9vWkMRdFTTVocjtOIwuYHtkKnf1Fk18kmfEfUYa5jHHKuGBa0Y+9HFPYOQrtyU4mtQW+v
-        bxDljc7Auci5pmFxJbSx6VegjbLRK+j1Nr/si5+0pm3kBPTiFvWIHvx/v21WU6v9BRMV4fPlTpe/AAAA
-        AElFTkSuQmCC
-</value>
-  </data>
-  <data name="WaitReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH3wYWEw4tELKVawAAAs1JREFU
-        SEuN10uoTVEcx3HvV3nkEUPlFVKUDBDliGImiZQkiYkBGSgZGEiiyIASRgp5JVIGhlLkmTJC5K2833l8
-        f9v6rbP2PX+d+6/PYP3X/f3v7Zy91963S1SNRqM0EVfwCA8CD3EbM1FlynIP3bEN/5sj2jucovViwwbj
-        DP60sQu9UOVcXidL8Q5R3u5gSoo3i6b1xG5E4dIFDEGVc3mdTIc+hShvzzEXaUIqNQpr8RXRALuPSagy
-        ZbmHkbiKKG9fsAb1OW4k8/AS0QDTV7EIOecqegNxHFHefmMn9M0053iRTMBdRAPsF7aiK5qDKK/RA9uh
-        XxrNsFMYhNqcctBQ6BqJwqUTGIDaIK+TVfiMKG/XMQo513FQb+xDFC7dwhjUBpVrzMEzRHl7glnIuVxF
-        cz2+IxpgrzEfLYOK3jjcRJS3T1iBljlVpeZCvEE0wH5gA1oGFT0dDecQ5U3Xow5RHaa1ObloTsM9RANK
-        h9AXLYNST3t7EWVLR9Ef8R+kYuMkonBJx8Nk+A9I6X+VerPxAVHeXmEqwjm52NApqudONMT0ke9By6NE
-        lXq6G48gypuOh/0IP/FcaXMx3iIaZN+wDs6kCXmGjMAlRHn7ic3ohtqcXGlDh+BG6GKOBtkLVM8nK2aY
-        3ir0YI3y9h7LkXO1KjY6e07pdh+L2sByDZ1TTxHlTeeUrsOcy1U2oVv6LKIhpdNoeTR4negc+ogobzeg
-        cy3ncpVNjMY1RENMF+wO6PlWG+Y1dM1sga6haIbpsTYMOZurbGIG2r3/6Lm2EjnnKnr9cBBRvnQA8R3p
-        ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
-        zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
-        fgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Confirm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
 </root>