修改维修作业界面，清除界面控件方法添加清除子控件

UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs

@@ -30,8 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_Repair));
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.label1 = new System.Windows.Forms.Label();
             this.ma_craftcode_label = new System.Windows.Forms.Label();
             this.st_rstepcode_label = new System.Windows.Forms.Label();
             this.ms_prodcode_label = new System.Windows.Forms.Label();
@@ -47,10 +45,8 @@
             this.mbr_solution_label = new System.Windows.Forms.Label();
             this.mbl_loc_label = new System.Windows.Forms.Label();
             this.mbp_part_label = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
             this.GetSNCode_Label = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.panel3 = new System.Windows.Forms.Panel();
             this.BadCodeTree = new System.Windows.Forms.TreeView();
             this.LocationSource = new System.Windows.Forms.BindingSource(this.components);
             this.ComponentSource = new System.Windows.Forms.BindingSource(this.components);
@@ -95,44 +91,22 @@
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ms_checkno = new System.Windows.Forms.Label();
             this.ms_reworkcheckno = new System.Windows.Forms.Label();
-            this.panel2.SuspendLayout();
+            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbp_partdgv)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbl_locdgv)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.RefreshTreeView)).BeginInit();
+            this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // panel2
-            // 
-            this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.panel2.Controls.Add(this.label1);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1200, 36);
-            this.panel2.TabIndex = 32;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(16, 5);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "工单信息";
-            // 
             // ma_craftcode_label
             // 
             this.ma_craftcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ma_craftcode_label.AutoSize = true;
             this.ma_craftcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode_label.Location = new System.Drawing.Point(10, 102);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(21, 86);
             this.ma_craftcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_craftcode_label.Name = "ma_craftcode_label";
             this.ma_craftcode_label.Size = new System.Drawing.Size(92, 27);
@@ -145,7 +119,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.st_rstepcode_label.AutoSize = true;
             this.st_rstepcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_rstepcode_label.Location = new System.Drawing.Point(344, 103);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(355, 86);
             this.st_rstepcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_rstepcode_label.Name = "st_rstepcode_label";
             this.st_rstepcode_label.Size = new System.Drawing.Size(92, 27);
@@ -158,7 +132,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode_label.AutoSize = true;
             this.ms_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode_label.Location = new System.Drawing.Point(534, 55);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(545, 39);
             this.ms_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_prodcode_label.Name = "ms_prodcode_label";
             this.ms_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -169,7 +143,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(872, 192);
+            this.label14.Location = new System.Drawing.Point(872, 180);
             this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(92, 27);
@@ -181,7 +155,7 @@
             this.bc_name_label.AutoSize = true;
             this.bc_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name_label.ForeColor = System.Drawing.Color.Black;
-            this.bc_name_label.Location = new System.Drawing.Point(541, 190);
+            this.bc_name_label.Location = new System.Drawing.Point(541, 178);
             this.bc_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_name_label.Name = "bc_name_label";
             this.bc_name_label.Size = new System.Drawing.Size(92, 27);
@@ -192,7 +166,7 @@
             // 
             this.bg_name_label.AutoSize = true;
             this.bg_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bg_name_label.Location = new System.Drawing.Point(217, 190);
+            this.bg_name_label.Location = new System.Drawing.Point(217, 178);
             this.bg_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bg_name_label.Name = "bg_name_label";
             this.bg_name_label.Size = new System.Drawing.Size(112, 27);
@@ -205,7 +179,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(10, 53);
+            this.ms_sncode_label.Location = new System.Drawing.Point(21, 37);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -218,7 +192,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(261, 55);
+            this.ms_makecode_label.Location = new System.Drawing.Point(272, 39);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(72, 27);
@@ -230,7 +204,7 @@
             this.mbr_brgcode_label.AutoSize = true;
             this.mbr_brgcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_brgcode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_brgcode_label.Location = new System.Drawing.Point(217, 246);
+            this.mbr_brgcode_label.Location = new System.Drawing.Point(217, 234);
             this.mbr_brgcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_brgcode_label.Name = "mbr_brgcode_label";
             this.mbr_brgcode_label.Size = new System.Drawing.Size(112, 27);
@@ -242,7 +216,7 @@
             this.nr_name_label.AutoSize = true;
             this.nr_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_label.ForeColor = System.Drawing.Color.Black;
-            this.nr_name_label.Location = new System.Drawing.Point(541, 246);
+            this.nr_name_label.Location = new System.Drawing.Point(541, 234);
             this.nr_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.nr_name_label.Name = "nr_name_label";
             this.nr_name_label.Size = new System.Drawing.Size(92, 27);
@@ -254,7 +228,7 @@
             this.mbr_dutycode_label.AutoSize = true;
             this.mbr_dutycode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_dutycode_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_dutycode_label.Location = new System.Drawing.Point(872, 246);
+            this.mbr_dutycode_label.Location = new System.Drawing.Point(872, 234);
             this.mbr_dutycode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_dutycode_label.Name = "mbr_dutycode_label";
             this.mbr_dutycode_label.Size = new System.Drawing.Size(72, 27);
@@ -266,7 +240,7 @@
             this.mbc_component_label.AutoSize = true;
             this.mbc_component_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbc_component_label.ForeColor = System.Drawing.Color.Black;
-            this.mbc_component_label.Location = new System.Drawing.Point(217, 298);
+            this.mbc_component_label.Location = new System.Drawing.Point(217, 286);
             this.mbc_component_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbc_component_label.Name = "mbc_component_label";
             this.mbc_component_label.Size = new System.Drawing.Size(92, 27);
@@ -278,7 +252,7 @@
             this.mbr_solution_label.AutoSize = true;
             this.mbr_solution_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solution_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_solution_label.Location = new System.Drawing.Point(541, 297);
+            this.mbr_solution_label.Location = new System.Drawing.Point(541, 285);
             this.mbr_solution_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_solution_label.Name = "mbr_solution_label";
             this.mbr_solution_label.Size = new System.Drawing.Size(92, 27);
@@ -290,7 +264,7 @@
             this.mbl_loc_label.AutoSize = true;
             this.mbl_loc_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbl_loc_label.ForeColor = System.Drawing.Color.Black;
-            this.mbl_loc_label.Location = new System.Drawing.Point(217, 371);
+            this.mbl_loc_label.Location = new System.Drawing.Point(217, 359);
             this.mbl_loc_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbl_loc_label.Name = "mbl_loc_label";
             this.mbl_loc_label.Size = new System.Drawing.Size(92, 27);
@@ -302,29 +276,20 @@
             this.mbp_part_label.AutoSize = true;
             this.mbp_part_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbp_part_label.ForeColor = System.Drawing.Color.Black;
-            this.mbp_part_label.Location = new System.Drawing.Point(605, 371);
+            this.mbp_part_label.Location = new System.Drawing.Point(605, 359);
             this.mbp_part_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbp_part_label.Name = "mbp_part_label";
             this.mbp_part_label.Size = new System.Drawing.Size(92, 27);
             this.mbp_part_label.TabIndex = 105;
             this.mbp_part_label.Text = "不良零件";
             // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.panel1.Location = new System.Drawing.Point(211, 342);
-            this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(985, 1);
-            this.panel1.TabIndex = 108;
-            // 
             // GetSNCode_Label
             // 
             this.GetSNCode_Label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode_Label.AutoSize = true;
             this.GetSNCode_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetSNCode_Label.Location = new System.Drawing.Point(217, 678);
+            this.GetSNCode_Label.Location = new System.Drawing.Point(217, 666);
             this.GetSNCode_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.GetSNCode_Label.Name = "GetSNCode_Label";
             this.GetSNCode_Label.Size = new System.Drawing.Size(72, 27);
@@ -336,26 +301,17 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Black;
-            this.label2.Location = new System.Drawing.Point(10, 159);
+            this.label2.Location = new System.Drawing.Point(10, 147);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 117;
             this.label2.Text = "不良信息";
             // 
-            // panel3
-            // 
-            this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.panel3.Location = new System.Drawing.Point(1, 146);
-            this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1195, 1);
-            this.panel3.TabIndex = 109;
-            // 
             // BadCodeTree
             // 
             this.BadCodeTree.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BadCodeTree.Location = new System.Drawing.Point(15, 192);
+            this.BadCodeTree.Location = new System.Drawing.Point(15, 180);
             this.BadCodeTree.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.BadCodeTree.Name = "BadCodeTree";
             this.BadCodeTree.Size = new System.Drawing.Size(190, 532);
@@ -391,7 +347,7 @@
             this.nr_code.AutoSize = true;
             this.nr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_code.ForeColor = System.Drawing.Color.Black;
-            this.nr_code.Location = new System.Drawing.Point(1147, 94);
+            this.nr_code.Location = new System.Drawing.Point(1121, 78);
             this.nr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.nr_code.Name = "nr_code";
             this.nr_code.Size = new System.Drawing.Size(0, 27);
@@ -400,7 +356,7 @@
             // 
             // mb_badremark
             // 
-            this.mb_badremark.Location = new System.Drawing.Point(977, 191);
+            this.mb_badremark.Location = new System.Drawing.Point(977, 179);
             this.mb_badremark.Margin = new System.Windows.Forms.Padding(5);
             this.mb_badremark.Name = "mb_badremark";
             this.mb_badremark.Size = new System.Drawing.Size(186, 26);
@@ -413,7 +369,7 @@
             this.ms_sncode.AutoSize = true;
             this.ms_sncode.CutLength = null;
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode.Location = new System.Drawing.Point(119, 55);
+            this.ms_sncode.Location = new System.Drawing.Point(121, 39);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_sncode.Name = "ms_sncode";
@@ -427,7 +383,7 @@
             this.bd_soncode.Condition = null;
             this.bd_soncode.DBTitle = null;
             this.bd_soncode.FormName = null;
-            this.bd_soncode.Location = new System.Drawing.Point(704, 372);
+            this.bd_soncode.Location = new System.Drawing.Point(704, 360);
             this.bd_soncode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.bd_soncode.Name = "bd_soncode";
             this.bd_soncode.Power = null;
@@ -448,7 +404,7 @@
             this.mbp_part1,
             this.DeleteCom,
             this.mbp_id});
-            this.mbp_partdgv.Location = new System.Drawing.Point(611, 418);
+            this.mbp_partdgv.Location = new System.Drawing.Point(611, 406);
             this.mbp_partdgv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbp_partdgv.Name = "mbp_partdgv";
             this.mbp_partdgv.RowTemplate.Height = 27;
@@ -489,7 +445,7 @@
             this.mbl_loc1,
             this.DeletePos,
             this.mbl_id});
-            this.mbl_locdgv.Location = new System.Drawing.Point(222, 418);
+            this.mbl_locdgv.Location = new System.Drawing.Point(222, 406);
             this.mbl_locdgv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbl_locdgv.Name = "mbl_locdgv";
             this.mbl_locdgv.RowTemplate.Height = 27;
@@ -525,7 +481,7 @@
             this.RefreshTreeView.AllPower = null;
             this.RefreshTreeView.Cursor = System.Windows.Forms.Cursors.Hand;
             this.RefreshTreeView.Image = global::UAS_MES.Properties.Resources.refresh;
-            this.RefreshTreeView.Location = new System.Drawing.Point(113, 160);
+            this.RefreshTreeView.Location = new System.Drawing.Point(113, 148);
             this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.RefreshTreeView.Name = "RefreshTreeView";
             this.RefreshTreeView.Power = null;
@@ -542,7 +498,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(325, 679);
+            this.GetSNCode.Location = new System.Drawing.Point(325, 667);
             this.GetSNCode.Margin = new System.Windows.Forms.Padding(4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
@@ -561,7 +517,7 @@
             this.NewRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.DownImage")));
             this.NewRepairInf.Image = null;
             this.NewRepairInf.IsShowBorder = true;
-            this.NewRepairInf.Location = new System.Drawing.Point(367, 628);
+            this.NewRepairInf.Location = new System.Drawing.Point(367, 616);
             this.NewRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.NewRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.MoveImage")));
             this.NewRepairInf.Name = "NewRepairInf";
@@ -581,7 +537,7 @@
             this.SaveRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.DownImage")));
             this.SaveRepairInf.Image = null;
             this.SaveRepairInf.IsShowBorder = true;
-            this.SaveRepairInf.Location = new System.Drawing.Point(518, 628);
+            this.SaveRepairInf.Location = new System.Drawing.Point(518, 616);
             this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.SaveRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.MoveImage")));
             this.SaveRepairInf.Name = "SaveRepairInf";
@@ -601,7 +557,7 @@
             this.DeleteRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.DownImage")));
             this.DeleteRepairInf.Image = null;
             this.DeleteRepairInf.IsShowBorder = true;
-            this.DeleteRepairInf.Location = new System.Drawing.Point(670, 628);
+            this.DeleteRepairInf.Location = new System.Drawing.Point(670, 616);
             this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(4);
             this.DeleteRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.MoveImage")));
             this.DeleteRepairInf.Name = "DeleteRepairInf";
@@ -621,7 +577,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
-            this.mbl_loc.Location = new System.Drawing.Point(349, 373);
+            this.mbl_loc.Location = new System.Drawing.Point(349, 361);
             this.mbl_loc.Margin = new System.Windows.Forms.Padding(4);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
@@ -641,7 +597,7 @@
             this.mbr_solutioncode.BackColor = System.Drawing.Color.White;
             this.mbr_solutioncode.Enabled = false;
             this.mbr_solutioncode.ID = null;
-            this.mbr_solutioncode.Location = new System.Drawing.Point(670, 298);
+            this.mbr_solutioncode.Location = new System.Drawing.Point(670, 286);
             this.mbr_solutioncode.Margin = new System.Windows.Forms.Padding(4);
             this.mbr_solutioncode.Name = "mbr_solutioncode";
             this.mbr_solutioncode.Power = null;
@@ -660,7 +616,7 @@
             this.mbc_component.BackColor = System.Drawing.Color.White;
             this.mbc_component.Enabled = false;
             this.mbc_component.ID = null;
-            this.mbc_component.Location = new System.Drawing.Point(350, 299);
+            this.mbc_component.Location = new System.Drawing.Point(350, 287);
             this.mbc_component.Margin = new System.Windows.Forms.Padding(4);
             this.mbc_component.Name = "mbc_component";
             this.mbc_component.Power = null;
@@ -679,7 +635,7 @@
             this.mbr_dutycode.BackColor = System.Drawing.Color.White;
             this.mbr_dutycode.Enabled = false;
             this.mbr_dutycode.ID = null;
-            this.mbr_dutycode.Location = new System.Drawing.Point(977, 248);
+            this.mbr_dutycode.Location = new System.Drawing.Point(977, 236);
             this.mbr_dutycode.Margin = new System.Windows.Forms.Padding(4);
             this.mbr_dutycode.Name = "mbr_dutycode";
             this.mbr_dutycode.Power = null;
@@ -698,7 +654,7 @@
             this.nr_name.BackColor = System.Drawing.Color.White;
             this.nr_name.Enabled = false;
             this.nr_name.ID = null;
-            this.nr_name.Location = new System.Drawing.Point(670, 248);
+            this.nr_name.Location = new System.Drawing.Point(670, 236);
             this.nr_name.Margin = new System.Windows.Forms.Padding(4);
             this.nr_name.Name = "nr_name";
             this.nr_name.Power = null;
@@ -718,7 +674,7 @@
             this.nrg_name.BackColor = System.Drawing.Color.White;
             this.nrg_name.Enabled = false;
             this.nrg_name.ID = null;
-            this.nrg_name.Location = new System.Drawing.Point(350, 248);
+            this.nrg_name.Location = new System.Drawing.Point(350, 236);
             this.nrg_name.Margin = new System.Windows.Forms.Padding(4);
             this.nrg_name.Name = "nrg_name";
             this.nrg_name.Power = null;
@@ -737,7 +693,7 @@
             this.bc_name.BackColor = System.Drawing.Color.White;
             this.bc_name.Enabled = false;
             this.bc_name.ID = null;
-            this.bc_name.Location = new System.Drawing.Point(670, 191);
+            this.bc_name.Location = new System.Drawing.Point(670, 179);
             this.bc_name.Margin = new System.Windows.Forms.Padding(4);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
@@ -757,7 +713,7 @@
             this.bg_name.Enabled = false;
             this.bg_name.ForeColor = System.Drawing.Color.Red;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(350, 192);
+            this.bg_name.Location = new System.Drawing.Point(350, 180);
             this.bg_name.Margin = new System.Windows.Forms.Padding(4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
@@ -771,7 +727,7 @@
             // OperatResult
             // 
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(977, 371);
+            this.OperatResult.Location = new System.Drawing.Point(977, 359);
             this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperatResult.Name = "OperatResult";
             this.OperatResult.Size = new System.Drawing.Size(208, 311);
@@ -785,7 +741,7 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(368, 55);
+            this.ms_makecode.Location = new System.Drawing.Point(379, 39);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -799,7 +755,7 @@
             this.ms_prodcode.AutoSize = true;
             this.ms_prodcode.CutLength = null;
             this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(662, 55);
+            this.ms_prodcode.Location = new System.Drawing.Point(673, 39);
             this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_prodcode.Name = "ms_prodcode";
@@ -814,7 +770,7 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(968, 55);
+            this.pr_detail.Location = new System.Drawing.Point(979, 39);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
@@ -828,7 +784,7 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1042, 690);
+            this.Clean.Location = new System.Drawing.Point(1042, 678);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -844,20 +800,19 @@
             // cd_stepcode
             // 
             this.cd_stepcode.AllPower = null;
-            this.cd_stepcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
             this.cd_stepcode.Caller = null;
             this.cd_stepcode.Condition = null;
             this.cd_stepcode.DBTitle = "回流工序";
+            this.cd_stepcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cd_stepcode.FormName = null;
-            this.cd_stepcode.Location = new System.Drawing.Point(464, 104);
+            this.cd_stepcode.Location = new System.Drawing.Point(475, 86);
             this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = "ifspecial";
             this.cd_stepcode.ReturnData = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
-            this.cd_stepcode.Size = new System.Drawing.Size(200, 26);
+            this.cd_stepcode.Size = new System.Drawing.Size(200, 28);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
             this.cd_stepcode.Tag = "ms_stepcode";
@@ -866,20 +821,19 @@
             // cr_code
             // 
             this.cr_code.AllPower = null;
-            this.cr_code.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
             this.cr_code.Caller = null;
             this.cr_code.Condition = null;
             this.cr_code.DBTitle = "回流途程";
+            this.cr_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(121, 103);
+            this.cr_code.Location = new System.Drawing.Point(121, 86);
             this.cr_code.Margin = new System.Windows.Forms.Padding(4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = "ifspecial";
             this.cr_code.ReturnData = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
-            this.cr_code.Size = new System.Drawing.Size(200, 26);
+            this.cr_code.Size = new System.Drawing.Size(200, 29);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
             this.cr_code.Tag = "ms_craftcode";
@@ -893,7 +847,7 @@
             this.NewBadCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.DownImage")));
             this.NewBadCode.Image = null;
             this.NewBadCode.IsShowBorder = true;
-            this.NewBadCode.Location = new System.Drawing.Point(218, 628);
+            this.NewBadCode.Location = new System.Drawing.Point(218, 616);
             this.NewBadCode.Margin = new System.Windows.Forms.Padding(4);
             this.NewBadCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.MoveImage")));
             this.NewBadCode.Name = "NewBadCode";
@@ -914,7 +868,7 @@
             this.SaveBadLocation.Enabled = false;
             this.SaveBadLocation.Image = null;
             this.SaveBadLocation.IsShowBorder = true;
-            this.SaveBadLocation.Location = new System.Drawing.Point(513, 371);
+            this.SaveBadLocation.Location = new System.Drawing.Point(513, 359);
             this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(4);
             this.SaveBadLocation.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.MoveImage")));
             this.SaveBadLocation.Name = "SaveBadLocation";
@@ -932,9 +886,10 @@
             this.Scrap.AllPower = "ifall";
             this.Scrap.BackColor = System.Drawing.Color.Transparent;
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
+            this.Scrap.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(830, 99);
+            this.Scrap.Location = new System.Drawing.Point(841, 83);
             this.Scrap.Margin = new System.Windows.Forms.Padding(4);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
@@ -952,9 +907,10 @@
             this.RepairComplete.AllPower = "ifall";
             this.RepairComplete.BackColor = System.Drawing.Color.Transparent;
             this.RepairComplete.DownImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.DownImage")));
+            this.RepairComplete.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.RepairComplete.Image = null;
             this.RepairComplete.IsShowBorder = true;
-            this.RepairComplete.Location = new System.Drawing.Point(703, 99);
+            this.RepairComplete.Location = new System.Drawing.Point(714, 83);
             this.RepairComplete.Margin = new System.Windows.Forms.Padding(4);
             this.RepairComplete.MoveImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.MoveImage")));
             this.RepairComplete.Name = "RepairComplete";
@@ -973,7 +929,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(840, 55);
+            this.pr_detail_label.Location = new System.Drawing.Point(851, 39);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -986,7 +942,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_checkno.AutoSize = true;
             this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_checkno.Location = new System.Drawing.Point(1045, 53);
+            this.ms_checkno.Location = new System.Drawing.Point(1056, 37);
             this.ms_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_checkno.Name = "ms_checkno";
             this.ms_checkno.Size = new System.Drawing.Size(92, 27);
@@ -1000,7 +956,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_reworkcheckno.AutoSize = true;
             this.ms_reworkcheckno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_reworkcheckno.Location = new System.Drawing.Point(1047, 94);
+            this.ms_reworkcheckno.Location = new System.Drawing.Point(1058, 78);
             this.ms_reworkcheckno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_reworkcheckno.Name = "ms_reworkcheckno";
             this.ms_reworkcheckno.Size = new System.Drawing.Size(92, 27);
@@ -1008,16 +964,42 @@
             this.ms_reworkcheckno.Text = "返修批号";
             this.ms_reworkcheckno.Visible = false;
             // 
+            // groupBoxWithBorder1
+            // 
+            this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.cd_stepcode);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_reworkcheckno);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_makecode_label);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_checkno);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_sncode_label);
+            this.groupBoxWithBorder1.Controls.Add(this.RepairComplete);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_sncode);
+            this.groupBoxWithBorder1.Controls.Add(this.Scrap);
+            this.groupBoxWithBorder1.Controls.Add(this.nr_code);
+            this.groupBoxWithBorder1.Controls.Add(this.st_rstepcode_label);
+            this.groupBoxWithBorder1.Controls.Add(this.ma_craftcode_label);
+            this.groupBoxWithBorder1.Controls.Add(this.cr_code);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_prodcode_label);
+            this.groupBoxWithBorder1.Controls.Add(this.pr_detail);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_prodcode);
+            this.groupBoxWithBorder1.Controls.Add(this.ms_makecode);
+            this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1173, 128);
+            this.groupBoxWithBorder1.TabIndex = 130;
+            this.groupBoxWithBorder1.TabStop = false;
+            this.groupBoxWithBorder1.Text = "工单信息";
+            this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
+            // 
             // Make_Repair
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1200, 735);
-            this.Controls.Add(this.ms_reworkcheckno);
-            this.Controls.Add(this.ms_checkno);
+            this.ClientSize = new System.Drawing.Size(1200, 724);
+            this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.mb_badremark);
-            this.Controls.Add(this.ms_sncode);
-            this.Controls.Add(this.nr_code);
             this.Controls.Add(this.bd_soncode);
             this.Controls.Add(this.bg_code);
             this.Controls.Add(this.bc_code);
@@ -1025,14 +1007,12 @@
             this.Controls.Add(this.mbl_locdgv);
             this.Controls.Add(this.RefreshTreeView);
             this.Controls.Add(this.BadCodeTree);
-            this.Controls.Add(this.panel3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.GetSNCode);
             this.Controls.Add(this.GetSNCode_Label);
             this.Controls.Add(this.NewRepairInf);
             this.Controls.Add(this.SaveRepairInf);
             this.Controls.Add(this.DeleteRepairInf);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.mbp_part_label);
             this.Controls.Add(this.mbl_loc);
             this.Controls.Add(this.mbl_loc_label);
@@ -1049,26 +1029,12 @@
             this.Controls.Add(this.bc_name);
             this.Controls.Add(this.bg_name);
             this.Controls.Add(this.OperatResult);
-            this.Controls.Add(this.ms_makecode);
-            this.Controls.Add(this.ms_prodcode);
-            this.Controls.Add(this.pr_detail);
-            this.Controls.Add(this.ms_prodcode_label);
-            this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.Clean);
-            this.Controls.Add(this.cd_stepcode);
-            this.Controls.Add(this.cr_code);
-            this.Controls.Add(this.ma_craftcode_label);
-            this.Controls.Add(this.st_rstepcode_label);
             this.Controls.Add(this.NewBadCode);
             this.Controls.Add(this.SaveBadLocation);
-            this.Controls.Add(this.Scrap);
-            this.Controls.Add(this.RepairComplete);
             this.Controls.Add(this.label14);
             this.Controls.Add(this.bc_name_label);
             this.Controls.Add(this.bg_name_label);
-            this.Controls.Add(this.ms_sncode_label);
-            this.Controls.Add(this.ms_makecode_label);
-            this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_Repair";
@@ -1077,13 +1043,13 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_Repair_FormClosing);
             this.Load += new System.EventHandler(this.维修作业_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
-            this.panel2.ResumeLayout(true);
-            this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbp_partdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbl_locdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.RefreshTreeView)).EndInit();
+            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.PerformLayout();
             this.ResumeLayout(true);
             this.PerformLayout();
 
@@ -1096,8 +1062,6 @@
         private CustomControl.ButtonUtil.NormalButton NewBadCode;
         private CustomControl.TextBoxWithIcon.SearchTextBox cr_code;
         private CustomControl.TextBoxWithIcon.SearchTextBox cd_stepcode;
-        private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label ma_craftcode_label;
         private System.Windows.Forms.Label st_rstepcode_label;
         private System.Windows.Forms.Label ms_prodcode_label;
@@ -1125,14 +1089,12 @@
         private System.Windows.Forms.Label mbr_solution_label;
         private System.Windows.Forms.Label mbl_loc_label;
         private System.Windows.Forms.Label mbp_part_label;
-        private System.Windows.Forms.Panel panel1;
         private CustomControl.ButtonUtil.NormalButton DeleteRepairInf;
         private CustomControl.ButtonUtil.NormalButton SaveRepairInf;
         private CustomControl.ButtonUtil.NormalButton NewRepairInf;
         private CustomControl.TextBoxWithIcon.EnterTextBox GetSNCode;
         private System.Windows.Forms.Label GetSNCode_Label;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Panel panel3;
         private System.Windows.Forms.TreeView BadCodeTree;
         private CustomControl.ClickPicBox.ClickPicBox RefreshTreeView;
         private CustomControl.TextBoxWithIcon.EnterTextBox mbl_loc;
@@ -1155,5 +1117,6 @@
         private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.Label ms_checkno;
         private System.Windows.Forms.Label ms_reworkcheckno;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
     }
 }

UAS-MES/PublicMethod/BaseUtil.cs

@@ -597,6 +597,10 @@ namespace UAS_MES.PublicMethod
         {
             for (int i = 0; i < Form.Controls.Count; i++)
             {
+                if (Form.Controls[i].Controls.Count > 0)
+                {
+                    CleanControls(Form.Controls[i].Controls);
+                }
                 if (Form.Controls[i] is EnterTextBox || Form.Controls[i] is TextBox || Form.Controls[i] is ValueLabel || Form.Controls[i] is SearchTextBox || Form.Controls[i] is ValueNumLabel || Form.Controls[i] is MaCodeSearchTextBox)
                     Form.Controls[i].Text = "";
                 if (Form.Controls[i] is DataGridView)