Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -100,21 +100,13 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     string Msid;
-                    if (ma_code.Text == "")
-                    {
-                        if (!LogicHandler.GetMakeInfo(code.Text, out macode, out ErrorMessage))
-                        {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                            return;
-                        }
-                    }
-                    if (ma_code.Text != macode || ListA.Rows.Count == 0)
+                    if (ListA.Rows.Count == 0)
                     {
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, code.Text, User.UserCode, out macode, out Msid, out ErrorMessage) || ListA.Rows.Count > 0)
                         {
                             sql.Clear();
                             sql.Append("select ma_code,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion from makeserial left join make on ");
-                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "'");
+                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -120,8 +120,6 @@ namespace UAS_MES.Make
                                 }
                             }
                             //如果未打开串口设置为0
-                            if (pr_colorboxunit.Text == "kg")
-                                weight.Text = (float.Parse(weight.Text) / 1000).ToString();
                             double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text);
                             if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
                             {
@@ -171,6 +169,8 @@ namespace UAS_MES.Make
                             try
                             {
                                 weight.Text = Regex.Replace(serialPort1.ReadLine(), "\\D+", "");
+                                if (pr_colorboxunit.Text == "kg")
+                                    weight.Text = (float.Parse(weight.Text) / 1000).ToString();
                             }
                             catch (Exception)
                             {

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -245,7 +245,7 @@ namespace UAS_MES.Make
                                 }
                                 else OperateResult.AppendText(">>序列号" + code.Text + "已被扣料，不允许下料\n", Color.Green, code);
                             }
-                            else OperateResult.AppendText(">>序列号" + code + "未上料，无需下料\n", Color.Red, code);
+                            else OperateResult.AppendText(">>序列号" + code.Text + "未上料，无需下料\n", Color.Red, code);
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                     }

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -174,7 +174,10 @@ namespace UAS_MES.Make
             string[] id = new string[RejectCount];
             string ErrorMessage = "";
             if (ChoosedRejectList.Items.Count == 0)
+            {
                 MessageBox.Show("不良品必须选择不良原因和不良代码!");
+                return;
+            }
             else
             {
                 //用户未填写不良代码一切按照正常逻辑，填写了从index=1开始执行
@@ -188,12 +191,12 @@ namespace UAS_MES.Make
                 }
             }
             sql.Clear();
-            sql.Append("insert when (not exists(select 1 from makebad where mb_sncode='" + sncode + "' and mb_badcode=:bc_code)) then ");
-            sql.Append("into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
+            sql.Append("insert when (not exists(select 1 from makebad where mb_sncode='" + sncode + "' and mb_makecode='"+macode+"' and  ");
+            sql.Append("mb_status=0 and mb_badcode=:bc_code)) then into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
             sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_status)");
             sql.Append("select DISTINCT :id,ma_code,ms_code,ms_sncode,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
             sql.Append("'0' 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 and ms_craftcode = sp_craftcode  where ms_sncode='" + sncode + "' and ms_makecode = '"+macode+"'");
+            sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode and ms_craftcode = sp_craftcode  where ms_sncode='" + sncode + "' and ms_makecode = '" + macode + "'");
             dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code" }, bccode, id, bccode, bgcode);
             MessageBox.Show("保存成功");
             Close();

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -233,7 +233,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 //满箱之后采集下一个之前自动清除内容，生成新的箱号
-                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || pa_status.Text == "1")
+                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || (AutoGenBoxCode.Checked && pa_status.Text == "1"))
                                 {
                                     pa_currentqty.Text = "";
                                     pa_outboxcode.Text = "";

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -145,7 +145,7 @@ namespace UAS_MES.Make
             string Err = "";
             sql.Clear();
             sql.Append("select pa_prodcode,pr_cartonmaxw,pa_makecode,pr_cartonunit,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
-            sql.Append("pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,pa_currentqty from package left join ");
+            sql.Append("pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,pr_outboxinnerqty,pa_currentqty from package left join ");
             sql.Append("product on pa_prodcode=pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
             Err = "箱号";
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -159,9 +159,9 @@ namespace UAS_MES.Make
                 Weight = double.Parse(_weight == "" ? "0" : _weight);
                 MaxWeight = double.Parse(_maxweight == "" ? "0" : _maxweight);
                 MinWeight = double.Parse(_minweight == "" ? "0" : _minweight);
+                //记录该数据保证在修改不被允许的前提下能偶回复之前的值
                 StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
                 BaseUtil.SetFormValue(this.Controls, dt);
-                //保证按照箱内容量展示
                 if (pa_standardqty.Text != "0")
                     pr_outboxinnerqty.Text = pa_standardqty.Text;
                 if (Weight - MinWeight == MaxWeight - Weight)
@@ -305,7 +305,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 //满箱之后采集下一个之前自动清除内容，生成新的箱号
-                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || pa_status.Text == "1")
+                                if ((AutoGenBoxCode.Checked && pa_currentqty.Text != "" && pr_outboxinnerqty.Text == pa_currentqty.Text) || (AutoGenBoxCode.Checked && pa_status.Text == "1"))
                                 {
                                     pa_currentqty.Text = "";
                                     pa_outboxcode.Text = "";
@@ -330,12 +330,12 @@ namespace UAS_MES.Make
                                                 dh.UpdateByCondition("package", "pa_status=1,pa_weight='" + weight.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                                 pa_standardqty.Text = "";
                                                 pa_status.Text = "1";
+                                                OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量合格\n", Color.Green);
                                                 if (AutoPrint.Checked)
                                                     Print_Click(new object(), new EventArgs());
                                             }
                                             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "重量不符合标准重量\n", Color.Red);
                                         }
-
                                         LoadGridData();
                                         sn_code.Clear();
                                     }

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/FunctionCode/Make/Make_Repair.cs

@@ -130,7 +130,10 @@ namespace UAS_MES.Make
                     BadCodeTree.Nodes.Clear();
                     return;
                 }
-                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "nvl(ms_ifrework,0)ms_ifrework", "ms_reworkstatus" }, "ms_sncode='" + GetSNCode.Text + "'");
+                sql.Clear();
+                sql.Append("select ma_kind,ms_status,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
+                sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' order by ms_id desc");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {
                     string ms_status = dt.Rows[0]["ms_status"].ToString();

UAS-MES/Main.Designer.cs

@@ -57,12 +57,11 @@
             // 
             this.ProductName.AutoSize = true;
             this.ProductName.BackColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.ProductName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ProductName.Font = new System.Drawing.Font("微软雅黑", 13F);
             this.ProductName.ForeColor = System.Drawing.SystemColors.ButtonFace;
-            this.ProductName.Location = new System.Drawing.Point(108, 4);
-            this.ProductName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ProductName.Location = new System.Drawing.Point(81, 3);
             this.ProductName.Name = "ProductName";
-            this.ProductName.Size = new System.Drawing.Size(212, 27);
+            this.ProductName.Size = new System.Drawing.Size(190, 24);
             this.ProductName.TabIndex = 3;
             this.ProductName.Text = "优软科技制造执行系统";
             // 
@@ -73,11 +72,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(187, 40);
-            this.MainTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.MainTabControl.Location = new System.Drawing.Point(140, 32);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(1117, 700);
+            this.MainTabControl.Size = new System.Drawing.Size(838, 560);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
@@ -86,10 +84,9 @@
             this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
             this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(8, 10);
-            this.name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.name_label.Location = new System.Drawing.Point(6, 8);
             this.name_label.Name = "name_label";
-            this.name_label.Size = new System.Drawing.Size(43, 20);
+            this.name_label.Size = new System.Drawing.Size(35, 17);
             this.name_label.TabIndex = 4;
             this.name_label.Text = "姓名:";
             // 
@@ -106,10 +103,9 @@
             this.BasicInf.Controls.Add(this.Inf_source_label);
             this.BasicInf.Controls.Add(this.name_label);
             this.BasicInf.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.BasicInf.Location = new System.Drawing.Point(0, 741);
-            this.BasicInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BasicInf.Location = new System.Drawing.Point(0, 593);
             this.BasicInf.Name = "BasicInf";
-            this.BasicInf.Size = new System.Drawing.Size(1304, 39);
+            this.BasicInf.Size = new System.Drawing.Size(978, 31);
             this.BasicInf.TabIndex = 6;
             // 
             // inf_currentstep
@@ -117,10 +113,9 @@
             this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_currentstep.AutoSize = true;
             this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(304, 10);
-            this.inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_currentstep.Location = new System.Drawing.Point(228, 8);
             this.inf_currentstep.Name = "inf_currentstep";
-            this.inf_currentstep.Size = new System.Drawing.Size(0, 20);
+            this.inf_currentstep.Size = new System.Drawing.Size(0, 17);
             this.inf_currentstep.TabIndex = 15;
             // 
             // step_label
@@ -128,10 +123,9 @@
             this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.step_label.AutoSize = true;
             this.step_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(196, 10);
-            this.step_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.step_label.Location = new System.Drawing.Point(147, 8);
             this.step_label.Name = "step_label";
-            this.step_label.Size = new System.Drawing.Size(73, 20);
+            this.step_label.Size = new System.Drawing.Size(59, 17);
             this.step_label.TabIndex = 14;
             this.step_label.Text = "岗位工序:";
             // 
@@ -140,10 +134,9 @@
             this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
             this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(85, 10);
-            this.inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_name.Location = new System.Drawing.Point(64, 8);
             this.inf_name.Name = "inf_name";
-            this.inf_name.Size = new System.Drawing.Size(0, 20);
+            this.inf_name.Size = new System.Drawing.Size(0, 17);
             this.inf_name.TabIndex = 13;
             // 
             // Inf_linecode
@@ -151,10 +144,9 @@
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(541, 10);
-            this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_linecode.Location = new System.Drawing.Point(406, 8);
             this.Inf_linecode.Name = "Inf_linecode";
-            this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
+            this.Inf_linecode.Size = new System.Drawing.Size(0, 17);
             this.Inf_linecode.TabIndex = 11;
             // 
             // inf_source
@@ -162,10 +154,9 @@
             this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
             this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(753, 10);
-            this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_source.Location = new System.Drawing.Point(565, 8);
             this.inf_source.Name = "inf_source";
-            this.inf_source.Size = new System.Drawing.Size(0, 20);
+            this.inf_source.Size = new System.Drawing.Size(0, 17);
             this.inf_source.TabIndex = 10;
             // 
             // inf_db
@@ -173,10 +164,9 @@
             this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
             this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(1029, 10);
-            this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.inf_db.Location = new System.Drawing.Point(772, 8);
             this.inf_db.Name = "inf_db";
-            this.inf_db.Size = new System.Drawing.Size(0, 20);
+            this.inf_db.Size = new System.Drawing.Size(0, 17);
             this.inf_db.TabIndex = 9;
             // 
             // Inf_linecode_label
@@ -184,10 +174,9 @@
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 10);
-            this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(346, 8);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
-            this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
+            this.Inf_linecode_label.Size = new System.Drawing.Size(35, 17);
             this.Inf_linecode_label.TabIndex = 8;
             this.Inf_linecode_label.Text = "线别:";
             // 
@@ -196,10 +185,9 @@
             this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
             this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(935, 10);
-            this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.db_label.Location = new System.Drawing.Point(701, 8);
             this.db_label.Name = "db_label";
-            this.db_label.Size = new System.Drawing.Size(58, 20);
+            this.db_label.Size = new System.Drawing.Size(47, 17);
             this.db_label.TabIndex = 7;
             this.db_label.Text = "数据库:";
             // 
@@ -208,10 +196,9 @@
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(673, 10);
-            this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Inf_source_label.Location = new System.Drawing.Point(505, 8);
             this.Inf_source_label.Name = "Inf_source_label";
-            this.Inf_source_label.Size = new System.Drawing.Size(43, 20);
+            this.Inf_source_label.Size = new System.Drawing.Size(35, 17);
             this.Inf_source_label.TabIndex = 6;
             this.Inf_source_label.Text = "资源:";
             // 
@@ -221,19 +208,18 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.Menu);
-            this.panel1.Location = new System.Drawing.Point(0, 40);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Location = new System.Drawing.Point(0, 32);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(185, 702);
+            this.panel1.Size = new System.Drawing.Size(139, 562);
             this.panel1.TabIndex = 1;
             // 
             // Menu
             // 
             this.Menu.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Menu.Location = new System.Drawing.Point(0, 0);
-            this.Menu.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Menu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Menu.Name = "Menu";
-            this.Menu.Size = new System.Drawing.Size(183, 700);
+            this.Menu.Size = new System.Drawing.Size(137, 560);
             this.Menu.TabIndex = 3;
             // 
             // notifyIcon1
@@ -245,9 +231,8 @@
             // 
             this.pictureBox1.Image = global::UAS_MES.Properties.Resources.uas_blue;
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(100, 41);
+            this.pictureBox1.Size = new System.Drawing.Size(75, 33);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 4;
             this.pictureBox1.TabStop = false;
@@ -257,17 +242,17 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(1304, 40);
+            this.headBar1.Size = new System.Drawing.Size(978, 32);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = null;
             // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1304, 780);
+            this.ClientSize = new System.Drawing.Size(978, 624);
             this.Controls.Add(this.BasicInf);
             this.Controls.Add(this.MainTabControl);
             this.Controls.Add(this.pictureBox1);
@@ -276,7 +261,6 @@
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);

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)
@@ -1161,7 +1165,7 @@ namespace UAS_MES.PublicMethod
             }
             catch (Exception ex)
             {
-                throw new Exception(ex.Message);
+                LogManager.DoLog(ex.Message);
             }
             finally
             {

UAS_DLLTest/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     </startup>
-</configuration>
+</configuration>

UAS_DLLTest/Form1.Designer.cs

@@ -28,252 +28,71 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.groupBoxwithborder3 = new UAS_DLLTest.GroupBoxwithborder();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            this.Result = new UAS_DLLTest.GroupBoxwithborder();
             this.operateResult = new System.Windows.Forms.RichTextBox();
             this.Parameters = new UAS_DLLTest.GroupBoxwithborder();
-            this.textBox9 = new System.Windows.Forms.TextBox();
-            this.textBox8 = new System.Windows.Forms.TextBox();
-            this.textBox7 = new System.Windows.Forms.TextBox();
-            this.textBox6 = new System.Windows.Forms.TextBox();
-            this.textBox5 = new System.Windows.Forms.TextBox();
-            this.textBox4 = new System.Windows.Forms.TextBox();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label6 = 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.clearResult = new System.Windows.Forms.CheckBox();
             this.clearPara = new System.Windows.Forms.CheckBox();
             this.clear = new System.Windows.Forms.Button();
             this.confirm = new System.Windows.Forms.Button();
             this.Methods = new UAS_DLLTest.GroupBoxwithborder();
-            this.SetPcbaData = new System.Windows.Forms.RadioButton();
-            this.GetMobileAllInfo = new System.Windows.Forms.RadioButton();
-            this.SetTestDetail = new System.Windows.Forms.RadioButton();
-            this.GetRcardMOInfo = new System.Windows.Forms.RadioButton();
-            this.SetMobileData = new System.Windows.Forms.RadioButton();
-            this.SetIMEIInfo = new System.Windows.Forms.RadioButton();
-            this.SetAddressInfo = new System.Windows.Forms.RadioButton();
-            this.CheckRoutePassed = new System.Windows.Forms.RadioButton();
-            this.GoMo = new System.Windows.Forms.RadioButton();
-            this.GetMEIOrNetCodeRange = new System.Windows.Forms.RadioButton();
-            this.GetAddressRangeByMO = new System.Windows.Forms.RadioButton();
-            this.CheckUserAndResourcePassed = new System.Windows.Forms.RadioButton();
-            this.groupBoxwithborder3.SuspendLayout();
+            this.Result.SuspendLayout();
             this.Parameters.SuspendLayout();
-            this.Methods.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupBoxwithborder3
-            // 
-            this.groupBoxwithborder3.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxwithborder3.Controls.Add(this.operateResult);
-            this.groupBoxwithborder3.Location = new System.Drawing.Point(34, 495);
-            this.groupBoxwithborder3.Name = "groupBoxwithborder3";
-            this.groupBoxwithborder3.Size = new System.Drawing.Size(1219, 176);
-            this.groupBoxwithborder3.TabIndex = 2;
-            this.groupBoxwithborder3.TabStop = false;
-            this.groupBoxwithborder3.Text = "Result";
-            this.groupBoxwithborder3.TextColor = System.Drawing.Color.Black;
+            // Result
+            // 
+            this.Result.BorderColor = System.Drawing.Color.Black;
+            this.Result.Controls.Add(this.operateResult);
+            this.Result.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Result.Location = new System.Drawing.Point(23, 323);
+            this.Result.Margin = new System.Windows.Forms.Padding(2);
+            this.Result.Name = "Result";
+            this.Result.Padding = new System.Windows.Forms.Padding(2);
+            this.Result.Size = new System.Drawing.Size(879, 141);
+            this.Result.TabIndex = 2;
+            this.Result.TabStop = false;
+            this.Result.Text = "Result";
+            this.Result.TextColor = System.Drawing.Color.Black;
             // 
             // operateResult
             // 
-            this.operateResult.Location = new System.Drawing.Point(17, 27);
+            this.operateResult.Dock = System.Windows.Forms.DockStyle.Fill;
+            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(2, 24);
+            this.operateResult.Margin = new System.Windows.Forms.Padding(2);
             this.operateResult.Name = "operateResult";
-            this.operateResult.Size = new System.Drawing.Size(1185, 143);
+            this.operateResult.Size = new System.Drawing.Size(875, 115);
             this.operateResult.TabIndex = 0;
             this.operateResult.Text = "";
             // 
             // Parameters
             // 
             this.Parameters.BorderColor = System.Drawing.Color.Black;
-            this.Parameters.Controls.Add(this.textBox9);
-            this.Parameters.Controls.Add(this.textBox8);
-            this.Parameters.Controls.Add(this.textBox7);
-            this.Parameters.Controls.Add(this.textBox6);
-            this.Parameters.Controls.Add(this.textBox5);
-            this.Parameters.Controls.Add(this.textBox4);
-            this.Parameters.Controls.Add(this.textBox3);
-            this.Parameters.Controls.Add(this.textBox2);
-            this.Parameters.Controls.Add(this.textBox1);
-            this.Parameters.Controls.Add(this.label9);
-            this.Parameters.Controls.Add(this.label8);
-            this.Parameters.Controls.Add(this.label7);
-            this.Parameters.Controls.Add(this.label6);
-            this.Parameters.Controls.Add(this.label5);
-            this.Parameters.Controls.Add(this.label4);
-            this.Parameters.Controls.Add(this.label3);
-            this.Parameters.Controls.Add(this.label2);
-            this.Parameters.Controls.Add(this.label1);
             this.Parameters.Controls.Add(this.clearResult);
             this.Parameters.Controls.Add(this.clearPara);
             this.Parameters.Controls.Add(this.clear);
             this.Parameters.Controls.Add(this.confirm);
-            this.Parameters.Location = new System.Drawing.Point(34, 201);
+            this.Parameters.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Parameters.Location = new System.Drawing.Point(23, 160);
+            this.Parameters.Margin = new System.Windows.Forms.Padding(2);
             this.Parameters.Name = "Parameters";
-            this.Parameters.Size = new System.Drawing.Size(1219, 275);
+            this.Parameters.Padding = new System.Windows.Forms.Padding(2);
+            this.Parameters.Size = new System.Drawing.Size(879, 159);
             this.Parameters.TabIndex = 1;
             this.Parameters.TabStop = false;
             this.Parameters.Text = "Parameter";
             this.Parameters.TextColor = System.Drawing.Color.Black;
             // 
-            // textBox9
-            // 
-            this.textBox9.Location = new System.Drawing.Point(908, 124);
-            this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(181, 28);
-            this.textBox9.TabIndex = 21;
-            // 
-            // textBox8
-            // 
-            this.textBox8.Location = new System.Drawing.Point(543, 121);
-            this.textBox8.Name = "textBox8";
-            this.textBox8.Size = new System.Drawing.Size(177, 28);
-            this.textBox8.TabIndex = 20;
-            // 
-            // textBox7
-            // 
-            this.textBox7.Location = new System.Drawing.Point(125, 121);
-            this.textBox7.Name = "textBox7";
-            this.textBox7.Size = new System.Drawing.Size(191, 28);
-            this.textBox7.TabIndex = 19;
-            // 
-            // textBox6
-            // 
-            this.textBox6.Location = new System.Drawing.Point(908, 76);
-            this.textBox6.Name = "textBox6";
-            this.textBox6.Size = new System.Drawing.Size(181, 28);
-            this.textBox6.TabIndex = 18;
-            // 
-            // textBox5
-            // 
-            this.textBox5.Location = new System.Drawing.Point(543, 76);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(177, 28);
-            this.textBox5.TabIndex = 17;
-            // 
-            // textBox4
-            // 
-            this.textBox4.Location = new System.Drawing.Point(125, 76);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(191, 28);
-            this.textBox4.TabIndex = 16;
-            // 
-            // textBox3
-            // 
-            this.textBox3.Location = new System.Drawing.Point(908, 32);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(181, 28);
-            this.textBox3.TabIndex = 15;
-            // 
-            // textBox2
-            // 
-            this.textBox2.Location = new System.Drawing.Point(543, 33);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(177, 28);
-            this.textBox2.TabIndex = 14;
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(125, 33);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(191, 28);
-            this.textBox1.TabIndex = 13;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(815, 131);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 18);
-            this.label9.TabIndex = 12;
-            this.label9.Text = "label9";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(450, 124);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 18);
-            this.label8.TabIndex = 11;
-            this.label8.Text = "label8";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(40, 127);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(62, 18);
-            this.label7.TabIndex = 10;
-            this.label7.Text = "label7";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(815, 86);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(62, 18);
-            this.label6.TabIndex = 9;
-            this.label6.Text = "label6";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(450, 79);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
-            this.label5.TabIndex = 8;
-            this.label5.Text = "label5";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(40, 81);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
-            this.label4.TabIndex = 7;
-            this.label4.Text = "label4";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(815, 42);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 18);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "label3";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(450, 43);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(62, 18);
-            this.label2.TabIndex = 5;
-            this.label2.Text = "label2";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(40, 43);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 18);
-            this.label1.TabIndex = 4;
-            this.label1.Text = "label1";
-            // 
             // clearResult
             // 
             this.clearResult.AutoSize = true;
-            this.clearResult.Location = new System.Drawing.Point(927, 226);
+            this.clearResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.clearResult.Location = new System.Drawing.Point(763, 129);
+            this.clearResult.Margin = new System.Windows.Forms.Padding(2);
             this.clearResult.Name = "clearResult";
-            this.clearResult.Size = new System.Drawing.Size(133, 22);
+            this.clearResult.Size = new System.Drawing.Size(111, 25);
             this.clearResult.TabIndex = 3;
             this.clearResult.Text = "clearResult";
             this.clearResult.UseVisualStyleBackColor = true;
@@ -281,18 +100,22 @@
             // clearPara
             // 
             this.clearPara.AutoSize = true;
-            this.clearPara.Location = new System.Drawing.Point(799, 226);
+            this.clearPara.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.clearPara.Location = new System.Drawing.Point(648, 129);
+            this.clearPara.Margin = new System.Windows.Forms.Padding(2);
             this.clearPara.Name = "clearPara";
-            this.clearPara.Size = new System.Drawing.Size(115, 22);
+            this.clearPara.Size = new System.Drawing.Size(99, 25);
             this.clearPara.TabIndex = 2;
             this.clearPara.Text = "clearPara";
             this.clearPara.UseVisualStyleBackColor = true;
             // 
             // clear
             // 
-            this.clear.Location = new System.Drawing.Point(593, 218);
+            this.clear.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.clear.Location = new System.Drawing.Point(455, 123);
+            this.clear.Margin = new System.Windows.Forms.Padding(2);
             this.clear.Name = "clear";
-            this.clear.Size = new System.Drawing.Size(92, 36);
+            this.clear.Size = new System.Drawing.Size(61, 28);
             this.clear.TabIndex = 1;
             this.clear.Text = "clear";
             this.clear.UseVisualStyleBackColor = true;
@@ -300,9 +123,11 @@
             // 
             // confirm
             // 
-            this.confirm.Location = new System.Drawing.Point(453, 218);
+            this.confirm.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.confirm.Location = new System.Drawing.Point(362, 123);
+            this.confirm.Margin = new System.Windows.Forms.Padding(2);
             this.confirm.Name = "confirm";
-            this.confirm.Size = new System.Drawing.Size(94, 36);
+            this.confirm.Size = new System.Drawing.Size(63, 28);
             this.confirm.TabIndex = 0;
             this.confirm.Text = "confirm";
             this.confirm.UseVisualStyleBackColor = true;
@@ -311,174 +136,33 @@
             // Methods
             // 
             this.Methods.BorderColor = System.Drawing.Color.Black;
-            this.Methods.Controls.Add(this.SetPcbaData);
-            this.Methods.Controls.Add(this.GetMobileAllInfo);
-            this.Methods.Controls.Add(this.SetTestDetail);
-            this.Methods.Controls.Add(this.GetRcardMOInfo);
-            this.Methods.Controls.Add(this.SetMobileData);
-            this.Methods.Controls.Add(this.SetIMEIInfo);
-            this.Methods.Controls.Add(this.SetAddressInfo);
-            this.Methods.Controls.Add(this.CheckRoutePassed);
-            this.Methods.Controls.Add(this.GoMo);
-            this.Methods.Controls.Add(this.GetMEIOrNetCodeRange);
-            this.Methods.Controls.Add(this.GetAddressRangeByMO);
-            this.Methods.Controls.Add(this.CheckUserAndResourcePassed);
-            this.Methods.Location = new System.Drawing.Point(34, 24);
+            this.Methods.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Methods.Location = new System.Drawing.Point(23, 8);
+            this.Methods.Margin = new System.Windows.Forms.Padding(2);
             this.Methods.Name = "Methods";
-            this.Methods.Size = new System.Drawing.Size(1219, 151);
+            this.Methods.Padding = new System.Windows.Forms.Padding(2);
+            this.Methods.Size = new System.Drawing.Size(879, 148);
             this.Methods.TabIndex = 0;
             this.Methods.TabStop = false;
             this.Methods.Text = "Method";
             this.Methods.TextColor = System.Drawing.Color.Black;
             // 
-            // SetPcbaData
-            // 
-            this.SetPcbaData.AutoSize = true;
-            this.SetPcbaData.Location = new System.Drawing.Point(440, 111);
-            this.SetPcbaData.Name = "SetPcbaData";
-            this.SetPcbaData.Size = new System.Drawing.Size(258, 22);
-            this.SetPcbaData.TabIndex = 13;
-            this.SetPcbaData.TabStop = true;
-            this.SetPcbaData.Text = "SetPcbaData(PCBA校准测试)";
-            this.SetPcbaData.UseVisualStyleBackColor = true;
-            // 
-            // GetMobileAllInfo
-            // 
-            this.GetMobileAllInfo.AutoSize = true;
-            this.GetMobileAllInfo.Location = new System.Drawing.Point(790, 83);
-            this.GetMobileAllInfo.Name = "GetMobileAllInfo";
-            this.GetMobileAllInfo.Size = new System.Drawing.Size(303, 22);
-            this.GetMobileAllInfo.TabIndex = 12;
-            this.GetMobileAllInfo.TabStop = true;
-            this.GetMobileAllInfo.Text = "GetMobileAllInfo(获取手机信息)";
-            this.GetMobileAllInfo.UseVisualStyleBackColor = true;
-            // 
-            // SetTestDetail
-            // 
-            this.SetTestDetail.AutoSize = true;
-            this.SetTestDetail.Location = new System.Drawing.Point(790, 55);
-            this.SetTestDetail.Name = "SetTestDetail";
-            this.SetTestDetail.Size = new System.Drawing.Size(276, 22);
-            this.SetTestDetail.TabIndex = 11;
-            this.SetTestDetail.TabStop = true;
-            this.SetTestDetail.Text = "SetTestDetail(记录测试结果)";
-            this.SetTestDetail.UseVisualStyleBackColor = true;
-            // 
-            // GetRcardMOInfo
-            // 
-            this.GetRcardMOInfo.AutoSize = true;
-            this.GetRcardMOInfo.Location = new System.Drawing.Point(790, 28);
-            this.GetRcardMOInfo.Name = "GetRcardMOInfo";
-            this.GetRcardMOInfo.Size = new System.Drawing.Size(285, 22);
-            this.GetRcardMOInfo.TabIndex = 10;
-            this.GetRcardMOInfo.TabStop = true;
-            this.GetRcardMOInfo.Text = "GetRcardMOInfo(获取工单信息)";
-            this.GetRcardMOInfo.UseVisualStyleBackColor = true;
-            // 
-            // SetMobileData
-            // 
-            this.SetMobileData.AutoSize = true;
-            this.SetMobileData.Location = new System.Drawing.Point(33, 111);
-            this.SetMobileData.Name = "SetMobileData";
-            this.SetMobileData.Size = new System.Drawing.Size(321, 22);
-            this.SetMobileData.TabIndex = 9;
-            this.SetMobileData.TabStop = true;
-            this.SetMobileData.Text = "SetMobileData(接收生产数据,转号)";
-            this.SetMobileData.UseVisualStyleBackColor = true;
-            // 
-            // SetIMEIInfo
-            // 
-            this.SetIMEIInfo.AutoSize = true;
-            this.SetIMEIInfo.Location = new System.Drawing.Point(440, 83);
-            this.SetIMEIInfo.Name = "SetIMEIInfo";
-            this.SetIMEIInfo.Size = new System.Drawing.Size(258, 22);
-            this.SetIMEIInfo.TabIndex = 8;
-            this.SetIMEIInfo.TabStop = true;
-            this.SetIMEIInfo.Text = "SetIMEIInfo(记录IMEI使用)";
-            this.SetIMEIInfo.UseVisualStyleBackColor = true;
-            // 
-            // SetAddressInfo
-            // 
-            this.SetAddressInfo.AutoSize = true;
-            this.SetAddressInfo.Location = new System.Drawing.Point(440, 55);
-            this.SetAddressInfo.Name = "SetAddressInfo";
-            this.SetAddressInfo.Size = new System.Drawing.Size(294, 22);
-            this.SetAddressInfo.TabIndex = 7;
-            this.SetAddressInfo.TabStop = true;
-            this.SetAddressInfo.Text = "SetAddressInfo(记录MACBT使用)";
-            this.SetAddressInfo.UseVisualStyleBackColor = true;
-            // 
-            // CheckRoutePassed
-            // 
-            this.CheckRoutePassed.AutoSize = true;
-            this.CheckRoutePassed.Location = new System.Drawing.Point(440, 27);
-            this.CheckRoutePassed.Name = "CheckRoutePassed";
-            this.CheckRoutePassed.Size = new System.Drawing.Size(267, 22);
-            this.CheckRoutePassed.TabIndex = 6;
-            this.CheckRoutePassed.TabStop = true;
-            this.CheckRoutePassed.Text = "CheckRoutePassed(检查途程)";
-            this.CheckRoutePassed.UseVisualStyleBackColor = true;
-            // 
-            // GoMo
-            // 
-            this.GoMo.AutoSize = true;
-            this.GoMo.Location = new System.Drawing.Point(790, 111);
-            this.GoMo.Name = "GoMo";
-            this.GoMo.Size = new System.Drawing.Size(159, 22);
-            this.GoMo.TabIndex = 5;
-            this.GoMo.TabStop = true;
-            this.GoMo.Text = "GoMo(归属工单)";
-            this.GoMo.UseVisualStyleBackColor = true;
-            // 
-            // GetMEIOrNetCodeRange
-            // 
-            this.GetMEIOrNetCodeRange.AutoSize = true;
-            this.GetMEIOrNetCodeRange.Location = new System.Drawing.Point(33, 83);
-            this.GetMEIOrNetCodeRange.Name = "GetMEIOrNetCodeRange";
-            this.GetMEIOrNetCodeRange.Size = new System.Drawing.Size(303, 22);
-            this.GetMEIOrNetCodeRange.TabIndex = 3;
-            this.GetMEIOrNetCodeRange.TabStop = true;
-            this.GetMEIOrNetCodeRange.Text = "GetMEIOrNetCodeRange(分配IMEI)";
-            this.GetMEIOrNetCodeRange.UseVisualStyleBackColor = true;
-            // 
-            // GetAddressRangeByMO
-            // 
-            this.GetAddressRangeByMO.AutoSize = true;
-            this.GetAddressRangeByMO.Location = new System.Drawing.Point(33, 55);
-            this.GetAddressRangeByMO.Name = "GetAddressRangeByMO";
-            this.GetAddressRangeByMO.Size = new System.Drawing.Size(303, 22);
-            this.GetAddressRangeByMO.TabIndex = 2;
-            this.GetAddressRangeByMO.TabStop = true;
-            this.GetAddressRangeByMO.Text = "GetAddressRangeByMO(分配MACBT)";
-            this.GetAddressRangeByMO.UseVisualStyleBackColor = true;
-            // 
-            // CheckUserAndResourcePassed
-            // 
-            this.CheckUserAndResourcePassed.AutoSize = true;
-            this.CheckUserAndResourcePassed.Location = new System.Drawing.Point(33, 27);
-            this.CheckUserAndResourcePassed.Name = "CheckUserAndResourcePassed";
-            this.CheckUserAndResourcePassed.Size = new System.Drawing.Size(357, 22);
-            this.CheckUserAndResourcePassed.TabIndex = 1;
-            this.CheckUserAndResourcePassed.TabStop = true;
-            this.CheckUserAndResourcePassed.Text = "CheckUserAndResourcePassed(登录检查)";
-            this.CheckUserAndResourcePassed.UseVisualStyleBackColor = true;
-            // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1285, 686);
-            this.Controls.Add(this.groupBoxwithborder3);
+            this.ClientSize = new System.Drawing.Size(913, 471);
+            this.Controls.Add(this.Result);
             this.Controls.Add(this.Parameters);
             this.Controls.Add(this.Methods);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "Form1";
-            this.Text = "Form1";
+            this.Text = "UAS_DLL测试工具";
             this.Load += new System.EventHandler(this.Form1_Load);
-            this.groupBoxwithborder3.ResumeLayout(false);
+            this.Result.ResumeLayout(false);
             this.Parameters.ResumeLayout(false);
             this.Parameters.PerformLayout();
-            this.Methods.ResumeLayout(false);
-            this.Methods.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -486,42 +170,12 @@
         #endregion
 
         private GroupBoxwithborder Methods;
-        private System.Windows.Forms.RadioButton SetPcbaData;
-        private System.Windows.Forms.RadioButton GetMobileAllInfo;
-        private System.Windows.Forms.RadioButton SetTestDetail;
-        private System.Windows.Forms.RadioButton GetRcardMOInfo;
-        private System.Windows.Forms.RadioButton SetMobileData;
-        private System.Windows.Forms.RadioButton SetIMEIInfo;
-        private System.Windows.Forms.RadioButton SetAddressInfo;
-        private System.Windows.Forms.RadioButton CheckRoutePassed;
-        private System.Windows.Forms.RadioButton GoMo;
-        private System.Windows.Forms.RadioButton GetMEIOrNetCodeRange;
-        private System.Windows.Forms.RadioButton GetAddressRangeByMO;
-        private System.Windows.Forms.RadioButton CheckUserAndResourcePassed;
         private GroupBoxwithborder Parameters;
-        private GroupBoxwithborder groupBoxwithborder3;
+        private GroupBoxwithborder Result;
         private System.Windows.Forms.CheckBox clearResult;
         private System.Windows.Forms.CheckBox clearPara;
         private System.Windows.Forms.Button clear;
         private System.Windows.Forms.Button confirm;
-        private System.Windows.Forms.TextBox textBox9;
-        private System.Windows.Forms.TextBox textBox8;
-        private System.Windows.Forms.TextBox textBox7;
-        private System.Windows.Forms.TextBox textBox6;
-        private System.Windows.Forms.TextBox textBox5;
-        private System.Windows.Forms.TextBox textBox4;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label6;
-        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 System.Windows.Forms.RichTextBox operateResult;
     }
 }

UAS_DLLTest/Form1.cs

@@ -2,12 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace UAS_DLLTest
@@ -15,70 +11,108 @@ namespace UAS_DLLTest
     public partial class Form1 : Form
     {
         MESHelper helper;
-        Control.ControlCollection collection;
-        Control.ControlCollection groupBox2Childs;
+        Control.ControlCollection methodCollection;
+        Control.ControlCollection ParamCollection;
         ParameterInfo[] param;
         List<string> outParams = new List<string>();
         object[] allParams;
         int icount = 0;
+        Queue<Control> query = new Queue<Control>();//临时存储获取到的control控件
+        MethodInfo[] method;
+        int RowItemCount = 3;
         public Form1()
         {
             InitializeComponent();
             helper = new MESHelper();
-            collection = Methods.Controls;
-            groupBox2Childs = Parameters.Controls;
-            //监听多个radiobutton的状态
-            for (int i = 0; i < collection.Count; i++)
+            methodCollection = Methods.Controls;
+            ParamCollection = Parameters.Controls;
+        }
+
+        private void Form1_Load(object sender, EventArgs e)
+        {
+            //动态生成checkBox
+            method = helper.GetType().GetMethods();
+            List<MethodInfo> ShowMethods = new List<MethodInfo>();
+            for (int i = 0; i < method.Length; i++)
             {
-                if (collection[i] is RadioButton)
+                if (method[i].GetCustomAttributes(typeof(DescriptionAttribute), true).Length != 0)
                 {
-                    ((RadioButton)collection[i]).CheckedChanged+= new EventHandler(radioButton_checkChanged);
+                    ShowMethods.Add(method[i]);
                 }
             }
+            //动态的计算方法框的高度
+            //显示的控件才需要计数
+            int ControlHeight = 0;
+            Console.WriteLine(ShowMethods.Count);
+            for (int i = 0; i < ShowMethods.Count; i++)
+            {
+                RadioButton btn = new RadioButton();
+                btn.Name = method[i].Name;
+                btn.Text = method[i].Name;
+                btn.Anchor = AnchorStyles.Left;
+                btn.Anchor = AnchorStyles.Top;
+                btn.AutoSize = true;
+                ControlHeight = btn.Height;
+                //父控件三分之一的长度减去Radio的长度再除以2
+                btn.Location = new Point((Methods.Width / 6 - btn.Width) / 2 + (i % RowItemCount) * (Methods.Width / RowItemCount), 25 + (i / RowItemCount) * (btn.Height));
+                Methods.Controls.Add(btn);
+                btn.CheckedChanged += new EventHandler(radioButton_checkChanged);
+                if (i==0)
+                {
+                    btn.Checked = true;
+                }
+            }
+            //是否剩下一行没装满的
+            int LastRow = ShowMethods.Count % RowItemCount == 0 ? 0 : 1;
+            Methods.Size = new Size(Methods.Width, ControlHeight * (ShowMethods.Count / RowItemCount + ShowMethods.Count % RowItemCount+2));
+            Parameters.Location = new Point(Methods.Location.X, Methods.Location.Y + Methods.Size.Height);
+            Result.Location = new Point(Parameters.Location.X, Parameters.Location.Y + Parameters.Size.Height);
+            Height = Methods.Height + Parameters.Height + Result.Height + 50;
+            //使最大化窗口失效
+            MaximizeBox = false;
+            FormBorderStyle = FormBorderStyle.FixedSingle;
         }
 
         private void radioButton_checkChanged(object sender, EventArgs e)
         {
-            hideControl();
-            for (int i = 0; i < collection.Count; i++)
+            removeControl();
+            for (int i = 0; i < methodCollection.Count; i++)
             {
-                if (((RadioButton)collection[i]).Checked) {
+                if (((RadioButton)methodCollection[i]).Checked)
+                {
                     //显示当前选中的方法的所有参数
                     //获取所有的参数
                     icount = 0;
-                    param = helper.GetType().GetMethod(collection[i].Name).GetParameters();
-                    for (int j = 1; j < param.Length+1; j++)
+                    param = helper.GetType().GetMethod(methodCollection[i].Name).GetParameters();
+                    for (int j = 1; j < param.Length + 1; j++)
                     {
                         //参数名i开头的才需要显示
-                        if (!param[j - 1].Name.StartsWith("o"))
+                        if (param[j - 1].Name.StartsWith("i"))
                         {
                             icount += 1;
-                            //设置显示参数
-                            for (int k = 0; k < groupBox2Childs.Count; k++)
-                            {
-                                if (groupBox2Childs[k].Name == "label" + j)
-                                {
-                                    groupBox2Childs[k].Text = param[j - 1].Name;
-                                    groupBox2Childs[k].Visible = true;
-                                }
-                                else if (groupBox2Childs[k].Name == "textBox" + j)
-                                {
-                                    groupBox2Childs[k].Visible = true;
-                                }
-                            }
+                            ParamControl paramControl = new ParamControl();
+                            paramControl.paramsName = param[j - 1].Name;
+                            paramControl.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+                            paramControl.paramsValueName = param[j - 1].Name;
+                            paramControl.Anchor = AnchorStyles.Left;
+                            paramControl.Anchor = AnchorStyles.Top;
+                            paramControl.Location = new Point((Parameters.Width / 3 - paramControl.Width) / 2 + ((j - 1) % 3) * (Parameters.Width / 3), 25 + ((j - 1) / 3) * (paramControl.Height));
+                            Parameters.Controls.Add(paramControl);
                         }
                     }
                     allParams = new object[param.Length];
                 }
             }
+            //重新获取控件
+            ParamCollection = Parameters.Controls;
         }
 
         private void confirm_Click(object sender, EventArgs e)
         {
             //拿到所有已经填写的参数
-            for (int i = 0; i < groupBox2Childs.Count; i++)
+            for (int i = 0; i < ParamCollection.Count; i++)
             {
-                for (int j = 1; j < allParams.Length; j++)
+                for (int j = 1; j < allParams.Length + 1; j++)
                 {
                     if (j > icount)
                     {
@@ -86,15 +120,15 @@ namespace UAS_DLLTest
                     }
                     else
                     {
-                        if (groupBox2Childs[i].Name == "textBox" + j)
+                        if (ParamCollection[i] is ParamControl && ((ParamControl)ParamCollection[i]).paramsValueName == param[j - 1].Name)
                         {
-                            if (param[j - 1].ParameterType.ToString()!= "System.String[]")
+                            if (param[j - 1].ParameterType.ToString() != "System.String[]")
                             {
-                                allParams[j - 1] = ((TextBox)groupBox2Childs[i]).Text;
+                                allParams[j - 1] = ((ParamControl)ParamCollection[i]).paramsValue;
                             }
                             else
                             {
-                                allParams[j - 1] = ((TextBox)groupBox2Childs[i]).Text.Split(',');
+                                allParams[j - 1] = ((ParamControl)ParamCollection[i]).paramsValue.Split(',');
                             }
                         }
                     }
@@ -103,54 +137,64 @@ namespace UAS_DLLTest
             //将out类型的参数放进去
             string oResult = "";
             //拿到需要触发的方法名
-            for (int i = 0; i < collection.Count; i++) {
-                if (((RadioButton)collection[i]).Checked)
+            for (int i = 0; i < methodCollection.Count; i++)
+            {
+                if (((RadioButton)methodCollection[i]).Checked)
                 {
                     Type type = helper.GetType();
-                    MethodInfo method =  type.GetMethod(((RadioButton)collection[i]).Name);
+                    MethodInfo method = type.GetMethod(((RadioButton)methodCollection[i]).Name);
                     oResult = method.Invoke(helper, allParams).ToString();
                 }
             }
             //输出out出的信息
-            operateResult.AppendText("返回值:"+oResult+",");
-            for (int i=0;i<param.Length;i++) {
-                if (param[i].Name.StartsWith("o")) {
-                    operateResult.AppendText(param[i].Name + ":" + allParams[i]+",");
+            operateResult.AppendText("返回值:" + oResult + ",");
+            for (int i = 0; i < param.Length; i++)
+            {
+                if (param[i].Name.StartsWith("o"))
+                {
+                    operateResult.AppendText(param[i].Name + ":" + allParams[i] + ",");
                 }
             }
             operateResult.AppendText("\n");
         }
 
-        private void Form1_Load(object sender, EventArgs e)
-        {
-            hideControl();
-        }
-
         private void clear_Click(object sender, EventArgs e)
         {
             //清除信息
-            if (clearPara.Checked) {
-                for (int i=0;i<groupBox2Childs.Count;i++) {
-                    if (groupBox2Childs[i] is TextBox) {
-                        ((TextBox)groupBox2Childs[i]).Text = "";
+            if (clearPara.Checked)
+            {
+                for (int i = 0; i < ParamCollection.Count; i++)
+                {
+                    if (ParamCollection[i] is ParamControl)
+                    {
+                        ((ParamControl)ParamCollection[i]).paramsValue = "";
                     }
                 }
             }
             //清除日志
-            if (clearResult.Checked) {
+            if (clearResult.Checked)
+            {
                 operateResult.Clear();
             }
         }
-        private void hideControl()
+
+        /// <summary>
+        /// 移除所有控件
+        /// </summary>
+        private void removeControl()
         {
-            //设置groupBox2中所有的label和textbox不可见
-            for (int i = 0; i < groupBox2Childs.Count; i++)
+            //移除所有ParamControl控件
+            foreach (Control c in this.Parameters.Controls)
             {
-                if ((groupBox2Childs[i] is Label) || (groupBox2Childs[i] is TextBox))
+                if (c is ParamControl)
                 {
-                    groupBox2Childs[i].Visible = false;
+                    query.Enqueue(c);
                 }
             }
+            while (query.Count != 0)
+            {
+                query.Dequeue().Dispose();
+            }
         }
     }
-}
+}

UAS_DLLTest/Form1.resx

@@ -117,4 +117,171 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAABAAAACEAAABBAAAATAAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAA
+        AE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAA
+        AE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAASgAA
+        ADQAAAAQAAAAAQAAAAAAAAACAAAAJAAAAHYAAACrAAAAtQAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
+        ALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
+        ALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
+        ALQAAAC0AAAAswAAAJgAAABOAAAADAAAAAAAAAAKAAAAWQAAANYAAAD5AAAA+wAAAPsAAAD7AAAA+wAA
+        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAA
+        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAA
+        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPEAAACiAAAAJAAAAAAAAAANAAAAjAAAAP0AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADfAAAAOwAAAAAAAAANAAAAogAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADxAAAARgAA
+        AAAAAAANAQEBowICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wIC
+        Av8CAgL/AQAA/wAAAP8FBgX/DRMR/xkrJP8iQDX/J01A/ydPQf8nTkH/JUg7/x01Lf8SHBn/BwoK/wIB
+        Af8AAAD/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wIC
+        Av8CAgLxAQEBRwICAgAAAAANAwMDowQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
+        BP8EBAT/BAQE/wMDA/8DAgL/DRMR/yA/NP8ydF3/OJl2/zeqgf81soX/M7SG/zO0hv8ztIb/NLOG/zau
+        hP84on3/NYdq/ylYR/8VJR//BgUF/wMCAv8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
+        BP8EBAT/BAQE/wQEBP8EBATxAgICRwQEBAAAAAANAwMDowQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
+        BP8EBAT/BAQE/wQEBP8EBAT/AwIC/wgJCf8hQDX/NYpt/zWvhP8wt4f/K7SE/yqygv8qsYL/KrGC/yux
+        gv8rsYL/KrGC/yqxgv8qs4P/LbaG/zO1h/83n3v/LWVS/xEbF/8DAgL/BAQE/wQEBP8EBAT/BAQE/wQE
+        BP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBATxAgICRwQEBAAAAAANBQUFowcHB/8HBwf/BwcH/wcH
+        B/8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8FBAT/DRcT/y5tWP82rob/LbaI/yqyhf8qsYT/K7GF/yux
+        hf8rsYX/K7GF/yuxhf8rsYX/K7GF/yuxhf8rsYX/K7GE/yqxhP8rtIf/MbaK/zaUdP8cOS//BQQF/wcG
+        Bv8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8GBgbxAgICRwcHBwAAAAANBgYHowgI
+        CP8ICAj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAj/CAgI/wcFBv8RHBj/Mn9l/zS1iv8tsob/LbGF/y6x
+        hf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LbGF/y+1
+        iP83pYD/IEQ5/wgGB/8IBwj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAjxAwMDRwgI
+        CAAAAAANBwcIowoKCv8KCgv/CgoL/woKC/8KCgv/CgoL/woKC/8KCgv/CQcJ/w4WE/8ygGb/NLaK/y6x
+        hf8vsYX/L7GF/y+xhf8vsYX/L7GF/y+xhf8vsYX/L7KG/y+yhv8vsob/L7KF/y+xhf8vsYX/L7GF/y+x
+        hf8vsYX/L7GF/y+xhf8wtYj/N6eB/x9BNf8IBgf/CgoK/woKC/8KCgv/CgoL/woKC/8KCgv/CgoL/woK
+        C/8JCQrxBAQERwoKCgAAAAANCQkJowwMDP8MDAz/DAwM/wwMDP8MDAz/DAwM/wwMDP8MCwz/DAwM/yhk
+        T/80tYn/L7KF/y+xhf8vsYX/L7GF/y+xhf8vsYX/L7KF/zC0h/8vs4b/LauA/yymfP8sp33/Lq6D/zC1
+        h/8vs4b/L7GF/y+xhf8vsYX/L7GF/y+xhf8vsYX/MLWI/zWceP8VJiH/CwkK/wwMDP8MDAz/DAwM/wwM
+        DP8MDAz/DAwM/wwMDP8LCwzxBQUFRwwMDAAAAAANCgoKow0NDf8NDQ3/DQ0N/w0NDf8NDQ3/DQ0N/w0N
+        Df8LCQr/Gzgu/zSqgf8vt4f/L7WG/y+1hv8vtYb/L7WG/y+1hv8vtof/L7WG/yiUbv8dX0n/FTsv/xMv
+        Jv8TMSj/F0Q2/yF0V/8spnv/L7eH/y+1hv8vtYb/L7WG/y+1hv8vtYb/L7SG/zK6iv8sdl3/DhAP/w0M
+        DP8NDQ3/DQ0N/w0NDf8NDQ3/DQ0N/w0NDf8MDA3xBgYGRw0NDgAAAAANDQ0NoxEREf8QEBH/EBAR/xAQ
+        Ef8QEBH/EBAR/xAQEP8PEBH/K3pg/zK6jv8vtYn/L7WJ/y+1if8vtYn/L7WJ/y+2iv8usof/InVZ/xQn
+        IP8QDg//DwwO/xANDv8QDQ7/DwwO/xATEv8YQDL/KJdy/y+3i/8vtYn/L7WJ/y+1if8vtYn/L7WJ/y+3
+        i/8zq4T/Gjcu/w8MDv8QEBH/EBAR/xAQEf8QEBH/EBAR/xAQEf8PDxDxBwcHRxAQEQAAAAANDg4OoxIS
+        E/8SEhL/EhIS/xISEv8SEhL/EhIT/xEPEP8YLCb/MqeB/zC3i/8wtYr/MLWK/zC1iv8wtYr/MLWK/zC2
+        i/8jdlv/ExsZ/xEOEP8SEhL/EhIT/xISEv8SEhP/EhIT/xIREv8RDg//GDku/yqeef8wt4z/MLWK/zC1
+        iv8wtYr/MLWK/zC1iv8zuY7/J25Y/xEQEf8SEhL/EhIS/xISEv8SEhL/EhIS/xISEv8RERLxCAgIRxIS
+        EwAAAAANDw8QoxUVFf8VFRX/FRUV/xUVFf8VFRX/FRUV/xMQEf8iVET/NLeL/zO2iv8ztYr/M7WK/zO1
+        iv8ztYr/M7iM/yyZdf8XKiX/FBET/xUVFf8VFRX/FRUV/xUVFf8VFRX/FRUV/xUVFf8VFBX/FBIT/x9a
+        R/8ys4j/M7aK/zO1iv8ztYr/M7WK/zO1iv80uYz/MJd0/xYfHP8UExT/FRUV/xUVFf8VFRX/FRUV/xUV
+        Ff8TExTxCAgIRxQUFQAAAAANERESoxYWGP8WFhj/FhYX/xYWF/8WFhj/FhYX/xUVFv8odlz/NLyO/zO4
+        i/8zuIv/M7iL/zO4i/8zuYv/M7eL/yJhTP8VExX/FhYX/xYWF/8WFhf/FhYX/xYWF/8WFhf/FhYX/xYW
+        F/8WFhj/FhQW/xgmIf8smHT/NLuN/zO4i/8zuIv/M7iL/zO4i/8zuYz/M66E/xs2Lf8VExX/FhYY/xYW
+        F/8WFhf/FhYX/xYWGP8VFRbxCQkJRxYWFwAAAAANExMUoxkZGf8ZGRn/GRkZ/xkZGf8ZGRn/GBcY/xgd
+        HP8si2z/NL2Q/zO5jv8zuY7/M7mO/zO5jv8zu4//MKmB/xw4MP8YFRf/GRkZ/xkZGf8ZGRn/GRkZ/xkZ
+        Gf8ZGRn/GRkZ/xkZGf8ZGRn/GRgZ/xgXGP8mcVj/M7yP/zO5jv8zuY7/M7mO/zO5jv8zuY7/NLeM/yBL
+        Pf8XFBb/GRkZ/xkZGf8ZGRn/GRkZ/xkZGf8XFxjxCgoLRxkZGgAAAAANFRUVoxsbHP8bGxz/Gxsc/xsb
+        HP8bGxz/Gxkb/xwkIv8wlXT/NryR/zW5jv81uY7/NbmO/zW5jv82vJD/LpVz/xwmJP8bGRv/Gxsc/xsb
+        HP8bGxz/Gxsc/xsbHP8bGxz/Gxsc/xsbHP8bGxz/Gxsc/xoXGf8jVEX/NbeM/zW6j/81uY7/NbmO/zW5
+        jv81uY7/NrqP/yVYR/8aFhj/Gxwd/xsbHP8bGxz/Gxsc/xsbHP8aGhvxDAwMRxwcHQAAAAANFhYXox4e
+        Hv8eHh7/Hh4e/x4eHv8eHh7/Hhwd/x4nJf8xmHX/Ob6Q/zi7jv84u47/OLuO/zi7jv85vpH/Lolr/x0i
+        If8eHR7/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8eHh7/Hh4e/x0aHP8jSDz/NrOI/zi8
+        j/84u47/OLuO/zi7jv84u47/OLyP/yZbSf8dGRr/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8cHB3xDAwNRx4e
+        HwAAAAANGBgZox8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx0g/yAoJ/8ymnb/OcGQ/zi+jv84vo7/OL6O/zi+
+        jv85wZD/LoVn/x8hIv8fHyD/Hx8h/x8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx8h/x8c
+        Hv8kRTr/NrOH/zjAj/84vo7/OL6O/zi+jv84vo7/OL+P/ydcS/8eGh3/HyAh/x8fIf8fHyH/Hx8h/x8f
+        If8eHh/xDQ0NRyAgIQAAAAANGhoboyIiI/8iIiP/IiIj/yIiI/8iIiP/IiAi/yIrKf8zm3f/OcGT/zm+
+        kf85vpH/Ob6R/zm+kf86wpP/LoNn/yEjI/8iIiL/IiIj/yIiI/8iIiP/IiIj/yIiI/8iIiP/IiIj/yIi
+        I/8iIiP/IiIj/yEeIP8lQzn/NrKI/znAkv85vpH/Ob6R/zm+kf85vpH/Ob+S/yleTf8hHR//IiIj/yIi
+        I/8iIiP/IiIj/yIiI/8gICHxDg4PRyIiJAAAAAANHBwdoyQkJv8lJSb/JCQm/yQkJv8kJSb/JCIk/yQt
+        K/81nHn/PMKU/zy/kv88v5L/PL+S/zy/kv88wpX/MYRo/yMlJf8kJCX/JCUm/yQkJv8kJCb/JCQm/yQk
+        Jv8kJCb/JCQm/yQkJv8kJCb/JCUm/yQhI/8nRTz/ObKJ/zzBk/88v5L/PL+S/zy/kv88v5L/PMCT/ypg
+        Tv8jHyL/JSUm/yQkJv8kJCb/JCQm/yUlJv8jIyTxDw8QRyUlJgAAAAANHR0foyYmKf8nJyn/JiYp/yYm
+        Kf8nJyn/JiQn/yYvLf82nnn/PcWU/zzBkv88wZL/PMGS/zzBkv89xZT/MoZp/yUnKP8mJij/Jicp/yYm
+        Kf8mJin/JiYp/yYmKf8mJin/JiYp/yYmKf8mJin/Jycp/yYjJv8pRz3/OrWJ/zzDk/88wZL/PMGS/zzB
+        kv88wpL/PMKT/yxhUP8lIST/Jycp/yYmKf8mJin/JiYp/ycnKf8lJSfxEBAQRycnKQAAAAANICAhoysr
+        LP8rKyv/Kysr/ysrK/8rKyv/Kigq/ykyMP83n3v/PcWW/z3Ck/89wpP/PcKT/z3Ck/89xZb/NIhr/ygq
+        K/8qKiv/Kysr/ysrK/8rKyv/Kysr/ysrK/8rKyv/Kysr/ysrK/8rKyv/Kysr/yonKf8rSUD/OraL/z3E
+        lf89wpP/PcKT/z3Ck/89wpT/PMOU/y5jUv8pJSf/Kyss/ysrK/8rKyv/Kior/ysrLP8pKSrxERESRysr
+        LAAAAAANIiIjoy0tLv8tLS7/LS0u/y0tLv8tLS7/LCot/ys0Mv85oH7/QMWZ/z/Cl/8/wpf/P8KX/z/C
+        l/9AxZn/Nolu/yosLf8sLC7/LS0u/y0tLv8tLS7/LS0u/y0tLv8tLS7/LS0u/y0tLv8tLS7/LS0u/ywp
+        LP8tS0P/PbaO/0DEmP8/wpf/P8KX/z/Cl/8/wpf/P8OX/zBlVP8rJyr/LS0u/y0tLv8tLS7/LCwu/y0t
+        Lv8rKyzxEhITRy0tLwAAAAANJCQkoy8vMP8vLy//Ly8v/y8vL/8vLy//Ly0u/y42NP87oX//QcaZ/0DC
+        l/9Awpf/QMKX/0DCl/9BxZn/N4pv/y0vL/8vLi//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8v
+        L/8vLy//Ly8v/y4rLf8vTUT/PbeP/0DEmP9Awpf/QMKX/0DCl/9Aw5f/QMOX/zJnVv8tKSz/Ly8w/y8v
+        L/8vLy//Ly8v/y8vMP8tLS3xExMURy8vMAAAAAANJSUmozAwMv8wMDL/MDAy/zAwMv8wMDL/MC4w/y84
+        Nv87o4D/QMiZ/0DFl/9AxZf/QMWX/0DFl/9AyJn/OI1v/y8wMf8wLzH/MDAy/zAwMv8wMDL/MDAy/zAw
+        Mv8wMDL/MDAy/zAwMv8wMDL/MDAy/y8sMP8xT0b/PrmP/0DHmf9AxZf/QMWX/0DFl/9AxZf/QMaY/zRp
+        WP8vKy7/MDAy/zAwMv8wMDL/MDAy/zAwMv8uLjDxFBQVRzExMwAAAAANJiYoozMzNf8zMzT/MzM0/zMz
+        NP8zMzT/MjEz/zE6OP87pIL/Qcmc/0DGmv9Axpr/QMaa/0DGmv9ByZz/OY5z/zEzNP8zMjT/MzM0/zMz
+        NP8zMzT/MzM0/zMzNP8zMzT/MzM0/zMzNP8zMzT/MzM0/zIvMv8zUUj/P7uS/0HIm/9Axpr/QMaa/0DG
+        mv9Axpr/QMea/zVqWf8xLTD/MzM1/zMzNP8zMzT/MzM0/zMzNf8xMTLxFRUWRzQ0NQAAAAANKSkqozY2
+        OP82Njj/NjY4/zY2OP82Njj/NTQ2/zQ8O/8+pIP/RMmd/0TGm/9Expv/RMab/0TGm/9EyZ3/O450/zQ1
+        Nv82NTf/NjY4/zY2OP82Njj/NjY4/zY2OP82Njj/NjY4/zY2OP82Njj/NjY4/zUyNf81Ukr/QbuT/0TI
+        nP9Expv/RMab/0TGm/9Expv/Q8eb/zdrW/80MDP/NjY4/zY2OP82Njj/NjY4/zY2OP8zMzXxFhYWRzY2
+        OAAAAAANKiosozg4Ov84ODr/ODg6/zg4Ov84ODr/ODY5/zY+Pf9ApoT/Rcud/0XHm/9Fx5v/Rceb/0XH
+        m/9Gy53/PY90/zY3Of84Nzr/ODg6/zg4Ov84ODr/ODg6/zg4Ov84ODr/ODg6/zg4Ov84ODr/ODg6/zc0
+        N/82VEz/Q7yT/0XJnP9Fx5v/Rceb/0XHm/9FyJv/Rcib/zluXf82Mjb/ODg6/zg4Ov84ODr/ODg6/zg4
+        Ov81NTfxFhYXRzg4OgAAAAANLCwuozo6PP86Ojz/Ojo8/zo6PP86Ojz/Ojg7/zhBQP9AqYX/Rc6f/0XL
+        nP9Fy5z/Rcuc/0XLnf9Fzp7/PpJ2/zg5O/86OTz/Ojo8/zo6PP86Ojz/Ojo8/zo6PP86Ojz/Ojo8/zo6
+        PP86Ojz/Ojo8/zk3Ov85Vk7/Q7+U/0XNnv9Fy5z/Rcuc/0XLnP9Fy53/Rcyd/zpwX/84NDj/Ojo9/zo6
+        PP86Ojz/Ojo8/zo6Pf83NzrxGBgZRzo6PQAAAAANLi4wozw8P/88PD//PDw//zw8P/88PD//PDo+/zpD
+        Qv9CqYj/R86h/0bLn/9Gy5//Rsuf/0bLn/9HzqH/P5N5/zo7Pf88PD//PDw//zw8P/88PD//PDw//zw8
+        P/88PD//PDw//zw8P/88PD//PDw//zw5PP87WVH/RL+X/0fNoP9Gy5//Rsuf/0bLn/9Gy5//Rsyf/zxx
+        Yf87Nzv/PD0//zw8P/88PD//PDw//z09QP86OjzxGRkaRz09QAAAAAANMDAxoz8/QP8/P0D/Pz9A/z8/
+        QP8/P0D/Pz0//zxFRP9Eqoj/Sc6h/0nLn/9Jy5//Scuf/0nLn/9JzqH/QpV5/zw+P/8/PkD/Pz9A/z8/
+        QP8/P0D/Pz9A/z8/QP8/P0D/Pz9A/z8/QP8/P0D/Pz9A/z47Pv89WlH/R8CX/0nNoP9Jy5//Scuf/0nL
+        n/9Jy5//Scyg/z5zYv89OTz/Pz9A/z8/QP8/P0D/Pz9A/z8/QP88PD7xGhobRz8/QQAAAAANMTEzo0BA
+        Qv9AQEL/QEBC/0BAQv9AQEL/QD5B/z5HRf9FrYj/SdCh/0nNn/9JzZ//Sc2f/0nNn/9J0KH/QpZ6/z5A
+        Qf9AP0L/QEBC/0BAQv9AQEL/QEBC/0BAQv9AQEL/QEBC/0BAQv9AQEL/QEBC/z89QP8+XFP/R8GX/0nP
+        oP9JzZ//Sc2f/0nNn/9JzZ//Sc6f/0B1Y/8/Oz7/QEBD/0BAQv9AQEL/QEBC/0BAQ/8+PkDxGxscR0FB
+        QwAAAAANMzM1o0NDRv9DQ0X/Q0NF/0NDRf9DQ0X/QkFE/0BIR/9Froj/SdKh/0nPn/9Jz5//Sc+f/0nP
+        n/9J0qH/RJh7/0BBQ/9DQkX/Q0NF/0NDRf9DQ0X/Q0NF/0NDRf9DQ0X/Q0NF/0NDRf9DQ0X/Q0NF/0I/
+        Q/9AXlX/R8SY/0nRoP9Jz5//Sc+f/0nPn/9Jz5//SdCf/0F2ZP9BPUH/Q0NF/0NDRf9DQ0X/Q0NF/0ND
+        Rv9AQELxHBwcR0NDRQAAAAANNTU2o0VFR/9FRUf/RUVH/0VFR/9FRUf/RUNG/0JLSf9Hror/S9Ki/0rP
+        oP9Kz6D/Ss+g/0rPoP9L0qL/RZl9/0JERf9FREf/RUVH/0VFR/9FRUf/RUVH/0VFR/9FRUf/RUVH/0VF
+        R/9FRUf/RUVH/0RBRf9BYFf/ScSZ/0vRov9Kz6D/Ss+g/0rPoP9Kz6H/StCh/0N4Zv9DP0P/RUVH/0VF
+        R/9FRUf/RUVH/0VFR/9CQkPxHBwdR0VFRwAAAAANNjY4o0dHSv9HR0n/RkZJ/0ZGSf9HR0n/RkVI/0NM
+        TP9Ir43/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/Rpl+/0RFR/9HRkn/R0dJ/0ZGSf9GRkn/RkZJ/0ZG
+        Sf9GRkn/RkZJ/0ZGSf9GRkn/R0dJ/0ZDR/9DYVj/S8Sc/03Rpf9Nz6T/Tc+k/03PpP9Nz6T/TdCk/0R4
+        af9FQUX/R0dJ/0ZGSf9GRkn/RkZJ/0dHSv9DQ0bxHR0eR0dHSQAAAAANNzc5o0lJTP9JSUz/SUlM/0lJ
+        TP9JSUz/SUdK/0VOTf9JsI7/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/R5p//0ZHSf9JSEv/SUlM/0lJ
+        TP9JSUz/SUlM/0lJTP9JSUz/SUlM/0lJTP9JSUz/SUlM/0hFSf9FYlr/S8Sc/03Rpf9Nz6T/Tc+k/03P
+        pP9Nz6T/TdCl/0V6av9HQ0f/SUlM/0lJTP9JSUz/SUlL/0lJTP9FRUjxHh4fR0lJTAAAAAANOTk7o0pK
+        Tf9KSk3/SkpN/0pKTf9KSk3/SkhM/0dQTv9KsI7/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/R5uA/0dJ
+        S/9KSU3/SkpN/0pKTf9KSk3/SkpN/0pKTf9KSk3/SkpN/0pKTf9KSk3/SkpN/0lHS/9FZFz/S8Sc/03R
+        pf9Nz6T/Tc+k/03PpP9Nz6T/TdCk/0d7av9JRUn/SkpN/0pKTf9KSk3/SkpN/0pKTv9HR0rxHx8gR0tL
+        TgAAAAANOjo7o01NTf9NTU3/TU1N/01NTf9NTU3/TUtM/0lRUP9KsY7/TdSm/03RpP9N0aT/TdGk/03R
+        pP9N1Kb/SJ2B/0lLTP9NTE3/TU1N/01NTf9NTU3/TU1N/01NTf9NTU3/TU1N/01NTf9NTU3/TU1N/0xJ
+        S/9HZV3/TMac/03Tpf9N0aT/TdGk/03RpP9N0aT/TdKk/0h8bP9LR0r/TU1N/01NTf9NTU3/TU1N/01N
+        Tf9JSUrxHx8gR01NTwAAAAAOOzs9o01NUP9NTVD/TU1Q/01NUP9NTVD/TUtO/0lSUv9LtZD/Ttmo/07W
+        pv9O1qb/Ttam/07Wpv9N2aj/SqCD/0tMTf9NTE//TU1Q/01NUP9NTVD/TU1Q/01NUP9NTVD/TU1Q/01N
+        UP9NTVD/TU1Q/01KTf9JaF7/Tcue/07YqP9O1qb/Ttam/07Wpv9O1qf/Tdem/0h+bf9MSEz/TU1Q/01N
+        UP9NTVD/TU1Q/01NUP9KSkzxICAhR09PUQAAAAANPDw+o05OUv9NTVL/TU1S/01NUv9NTVL/TUxR/0xU
+        Vf9IpIf/R8CZ/0e9l/9HvZf/R72X/0e+mP9HwJn/SJR8/0xOUf9NTVL/TU1S/01NUv9NTVL/TU1S/01N
+        Uv9NTVL/TU1S/01NUv9NTVL/TU1S/01LUP9LZV//R7WS/0e/mP9HvZf/R72X/0e9l/9Hvpj/R7+Y/0p5
+        a/9NSU//TU1S/01NUv9NTVL/TU1S/05OUv9KSk7xISEiRkhISwAAAAAJPz9BnlFRUv9RUVL/UVFS/1FR
+        Uv9RUVL/UVBS/1BSU/9KXFj/SF5Y/0hdWP9IXVj/SF1Y/0hdWP9IXlj/TFtX/1FRU/9RUFL/UVFS/1FR
+        Uv9RUVL/UVFS/1FRUv9RUVL/UVFS/1FRUv9RUVL/UVFS/1FQUv9PVFT/SV1Y/0hdWP9IXVj/SF1Y/0hd
+        WP9IXVj/SF5Y/05XVf9RUFL/UVFS/1FRUv9RUVL/UVFS/1FRU/9NTU/wIyMkQUFBQgAAAAABR0dKhlNT
+        Vv5SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUFT/Uk9T/1JPU/9ST1P/Uk9T/1JPU/9ST1P/UlBU/1JS
+        Vf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUVX/UlBU/1JP
+        U/9ST1P/Uk9T/1JPU/9ST1P/Uk9T/1JRVP9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9TU1bkMTEyLE1N
+        TwBZWVsATExOO19fYtZVVVn+U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NT
+        V/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NT
+        V/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1pa
+        XvdbW12UODg5Ck5OUABeXl4AAAAAAn19gDZ+foKAdnZ6jXZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
+        eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
+        eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
+        eox2dnqMeHh8jIGBhGNlZWYUm5ucABUVFQBjY2UARUVFAGtrbgBmZmoAYWFlAGFhZQBhYWUAYWFlAGFh
+        ZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFh
+        ZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFh
+        ZQBhYWUAYWFlAGFhZQBhYWUAYmJmAGpqbQBfX2AAAAAAADo6OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAA=
+</value>
+  </data>
 </root>

UAS_DLLTest/ParamControl.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace UAS_DLLTest
+{
+    public partial class ParamControl : UserControl
+    {
+        public ParamControl()
+        {
+            InitializeComponent();
+        }
+        public string paramsValue
+        {
+            get { return paramValue.Text; }
+            set { paramValue.Text = value; }
+        }
+        public string paramsName
+        {
+            get { return paramName.Text; }
+            set { paramName.Text = value; }
+        }
+        public string paramsValueName
+        {
+            get { return paramValue.Name; }
+            set { paramValue.Name = value; }
+        }
+    }
+}

UAS_DLLTest/Properties/Resources.Designer.cs

@@ -1,69 +1,61 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 4.0.30319.42000
+//     运行时版本:4.0.30319.42000
 //
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace UAS_DLLTest.Properties
-{
-
-
+namespace UAS_DLLTest.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   强类型资源类，用于查找本地化字符串等。
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
     // 此类是由 StronglyTypedResourceBuilder
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   返回此类使用的缓存 ResourceManager 实例。
+        ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("UAS_DLLTest.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
-        ///   覆盖当前线程的 CurrentUICulture 属性
-        ///   使用此强类型的资源类的资源查找。
+        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }

UAS_DLLTest/Properties/Settings.Designer.cs

@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace UAS_DLLTest.Properties
-{
-
-
+namespace UAS_DLLTest.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }

UAS_DLLTest/UAS_DLLTest.csproj

@@ -9,9 +9,25 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UAS_DLLTest</RootNamespace>
     <AssemblyName>UAS_DLLTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,7 +48,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>U_Icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BenQGuru.eMES.DLLService, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>tool\BenQGuru.eMES.DLLService.dll</HintPath>
+    </Reference>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>tool\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -41,7 +68,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -52,8 +78,26 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="GroupBoxwithborder.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="GroupBoxwithborder.Designer.cs">
+      <DependentUpon>GroupBoxwithborder.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ParamControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="paramControl.Designer.cs">
+      <DependentUpon>ParamControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="paramControl.resx">
+      <DependentUpon>ParamControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -62,6 +106,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -76,6 +121,26 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="U_Icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

UAS_DLLTest/paramControl.Designer.cs

@@ -0,0 +1,73 @@
+namespace UAS_DLLTest
+{
+    partial class ParamControl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.paramName = new System.Windows.Forms.Label();
+            this.paramValue = new System.Windows.Forms.TextBox();
+            this.SuspendLayout();
+            // 
+            // paramName
+            // 
+            this.paramName.AutoSize = true;
+            this.paramName.Location = new System.Drawing.Point(2, 4);
+            this.paramName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.paramName.Name = "paramName";
+            this.paramName.Size = new System.Drawing.Size(41, 12);
+            this.paramName.TabIndex = 0;
+            this.paramName.Text = "label1";
+            this.paramName.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            // 
+            // paramValue
+            // 
+            this.paramValue.Location = new System.Drawing.Point(73, 1);
+            this.paramValue.Margin = new System.Windows.Forms.Padding(2);
+            this.paramValue.Name = "paramValue";
+            this.paramValue.Size = new System.Drawing.Size(138, 21);
+            this.paramValue.TabIndex = 1;
+            // 
+            // ParamControl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.paramValue);
+            this.Controls.Add(this.paramName);
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Name = "ParamControl";
+            this.Size = new System.Drawing.Size(236, 26);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label paramName;
+        private System.Windows.Forms.TextBox paramValue;
+    }
+}

UAS_DLLTest/paramControl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

UAS_KanBan/Process.Designer.cs

@@ -67,11 +67,12 @@
             this.TopLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.TopLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.TopLine.DownBack = null;
-            this.TopLine.Location = new System.Drawing.Point(3, 22);
+            this.TopLine.Location = new System.Drawing.Point(4, 28);
+            this.TopLine.Margin = new System.Windows.Forms.Padding(4);
             this.TopLine.MouseBack = null;
             this.TopLine.Name = "TopLine";
             this.TopLine.NormlBack = null;
-            this.TopLine.Size = new System.Drawing.Size(1030, 2);
+            this.TopLine.Size = new System.Drawing.Size(1285, 2);
             this.TopLine.TabIndex = 0;
             // 
             // BottomLine
@@ -82,41 +83,40 @@
             this.BottomLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.BottomLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.BottomLine.DownBack = null;
-            this.BottomLine.Location = new System.Drawing.Point(3, 134);
+            this.BottomLine.Location = new System.Drawing.Point(4, 168);
+            this.BottomLine.Margin = new System.Windows.Forms.Padding(4);
             this.BottomLine.MouseBack = null;
             this.BottomLine.Name = "BottomLine";
             this.BottomLine.NormlBack = null;
-            this.BottomLine.Size = new System.Drawing.Size(1030, 2);
+            this.BottomLine.Size = new System.Drawing.Size(1285, 2);
             this.BottomLine.TabIndex = 1;
             // 
             // Line1
             // 
-            this.Line1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
             this.Line1.BackColor = System.Drawing.Color.White;
             this.Line1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line1.DownBack = null;
-            this.Line1.Location = new System.Drawing.Point(255, 23);
+            this.Line1.Location = new System.Drawing.Point(340, 29);
+            this.Line1.Margin = new System.Windows.Forms.Padding(4);
             this.Line1.MouseBack = null;
             this.Line1.Name = "Line1";
             this.Line1.NormlBack = null;
-            this.Line1.Size = new System.Drawing.Size(2, 112);
+            this.Line1.Size = new System.Drawing.Size(1, 139);
             this.Line1.TabIndex = 1;
             // 
             // Line2
             // 
-            this.Line2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.Line2.BackColor = System.Drawing.Color.White;
             this.Line2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line2.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line2.DownBack = null;
-            this.Line2.Location = new System.Drawing.Point(784, 23);
+            this.Line2.Location = new System.Drawing.Point(1055, 29);
+            this.Line2.Margin = new System.Windows.Forms.Padding(4);
             this.Line2.MouseBack = null;
             this.Line2.Name = "Line2";
             this.Line2.NormlBack = null;
-            this.Line2.Size = new System.Drawing.Size(2, 112);
+            this.Line2.Size = new System.Drawing.Size(1, 139);
             this.Line2.TabIndex = 3;
             // 
             // MidLine
@@ -127,11 +127,12 @@
             this.MidLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.MidLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.MidLine.DownBack = null;
-            this.MidLine.Location = new System.Drawing.Point(784, 81);
+            this.MidLine.Location = new System.Drawing.Point(1056, 101);
+            this.MidLine.Margin = new System.Windows.Forms.Padding(4);
             this.MidLine.MouseBack = null;
             this.MidLine.Name = "MidLine";
             this.MidLine.NormlBack = null;
-            this.MidLine.Size = new System.Drawing.Size(250, 2);
+            this.MidLine.Size = new System.Drawing.Size(235, 2);
             this.MidLine.TabIndex = 2;
             // 
             // Title
@@ -141,25 +142,26 @@
             this.Title.BackColor = System.Drawing.Color.Transparent;
             this.Title.BorderColor = System.Drawing.Color.White;
             this.Title.Font = new System.Drawing.Font("宋体", 45F);
-            this.Title.Location = new System.Drawing.Point(267, 49);
+            this.Title.Location = new System.Drawing.Point(356, 61);
+            this.Title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Title.Name = "Title";
-            this.Title.Size = new System.Drawing.Size(505, 60);
+            this.Title.Size = new System.Drawing.Size(632, 75);
             this.Title.TabIndex = 4;
             this.Title.Text = "产线执行进度看板";
             // 
             // Line3
             // 
-            this.Line3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Line3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.Line3.BackColor = System.Drawing.Color.White;
             this.Line3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line3.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line3.DownBack = null;
-            this.Line3.Location = new System.Drawing.Point(895, 23);
+            this.Line3.Location = new System.Drawing.Point(1207, 29);
+            this.Line3.Margin = new System.Windows.Forms.Padding(4);
             this.Line3.MouseBack = null;
             this.Line3.Name = "Line3";
             this.Line3.NormlBack = null;
-            this.Line3.Size = new System.Drawing.Size(2, 112);
+            this.Line3.Size = new System.Drawing.Size(1, 139);
             this.Line3.TabIndex = 4;
             // 
             // 机型_label
@@ -169,10 +171,11 @@
             this.机型_label.AutoSize = true;
             this.机型_label.BackColor = System.Drawing.Color.Transparent;
             this.机型_label.BorderColor = System.Drawing.Color.White;
-            this.机型_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.机型_label.Location = new System.Drawing.Point(7, 265);
+            this.机型_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.机型_label.Location = new System.Drawing.Point(9, 331);
+            this.机型_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.机型_label.Name = "机型_label";
-            this.机型_label.Size = new System.Drawing.Size(314, 70);
+            this.机型_label.Size = new System.Drawing.Size(375, 84);
             this.机型_label.TabIndex = 6;
             this.机型_label.Tag = "AutoFont";
             this.机型_label.Text = "生产机型";
@@ -184,10 +187,11 @@
             this.产出_label.AutoSize = true;
             this.产出_label.BackColor = System.Drawing.Color.Transparent;
             this.产出_label.BorderColor = System.Drawing.Color.White;
-            this.产出_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.产出_label.Location = new System.Drawing.Point(7, 518);
+            this.产出_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.产出_label.Location = new System.Drawing.Point(9, 648);
+            this.产出_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.产出_label.Name = "产出_label";
-            this.产出_label.Size = new System.Drawing.Size(243, 70);
+            this.产出_label.Size = new System.Drawing.Size(290, 84);
             this.产出_label.TabIndex = 9;
             this.产出_label.Tag = "AutoFont";
             this.产出_label.Text = "总产出";
@@ -199,10 +203,11 @@
             this.投入_label.AutoSize = true;
             this.投入_label.BackColor = System.Drawing.Color.Transparent;
             this.投入_label.BorderColor = System.Drawing.Color.White;
-            this.投入_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.投入_label.Location = new System.Drawing.Point(7, 393);
+            this.投入_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.投入_label.Location = new System.Drawing.Point(9, 491);
+            this.投入_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.投入_label.Name = "投入_label";
-            this.投入_label.Size = new System.Drawing.Size(243, 70);
+            this.投入_label.Size = new System.Drawing.Size(290, 84);
             this.投入_label.TabIndex = 10;
             this.投入_label.Tag = "AutoFont";
             this.投入_label.Text = "总投入";
@@ -214,10 +219,11 @@
             this.收益率_label.AutoSize = true;
             this.收益率_label.BackColor = System.Drawing.Color.Transparent;
             this.收益率_label.BorderColor = System.Drawing.Color.White;
-            this.收益率_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.收益率_label.Location = new System.Drawing.Point(638, 393);
+            this.收益率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.收益率_label.Location = new System.Drawing.Point(807, 491);
+            this.收益率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率_label.Name = "收益率_label";
-            this.收益率_label.Size = new System.Drawing.Size(243, 70);
+            this.收益率_label.Size = new System.Drawing.Size(290, 84);
             this.收益率_label.TabIndex = 13;
             this.收益率_label.Tag = "AutoFont";
             this.收益率_label.Text = "收益率";
@@ -229,10 +235,11 @@
             this.故障数_label.AutoSize = true;
             this.故障数_label.BackColor = System.Drawing.Color.Transparent;
             this.故障数_label.BorderColor = System.Drawing.Color.White;
-            this.故障数_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.故障数_label.Location = new System.Drawing.Point(638, 518);
+            this.故障数_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.故障数_label.Location = new System.Drawing.Point(807, 648);
+            this.故障数_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数_label.Name = "故障数_label";
-            this.故障数_label.Size = new System.Drawing.Size(243, 70);
+            this.故障数_label.Size = new System.Drawing.Size(290, 84);
             this.故障数_label.TabIndex = 12;
             this.故障数_label.Tag = "AutoFont";
             this.故障数_label.Text = "故障数";
@@ -240,17 +247,18 @@
             // 直通率_label
             // 
             this.直通率_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.直通率_label.AutoSize = true;
             this.直通率_label.BackColor = System.Drawing.Color.Transparent;
             this.直通率_label.BorderColor = System.Drawing.Color.White;
-            this.直通率_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.直通率_label.Location = new System.Drawing.Point(638, 265);
+            this.直通率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.直通率_label.Location = new System.Drawing.Point(807, 331);
+            this.直通率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率_label.Name = "直通率_label";
-            this.直通率_label.Size = new System.Drawing.Size(243, 70);
+            this.直通率_label.Size = new System.Drawing.Size(460, 84);
             this.直通率_label.TabIndex = 11;
             this.直通率_label.Tag = "AutoFont";
-            this.直通率_label.Text = "直通率";
+            this.直通率_label.Text = "一次直通率";
             // 
             // LineCode_label
             // 
@@ -259,9 +267,10 @@
             this.LineCode_label.BackColor = System.Drawing.Color.Transparent;
             this.LineCode_label.BorderColor = System.Drawing.Color.White;
             this.LineCode_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.LineCode_label.Location = new System.Drawing.Point(792, 33);
+            this.LineCode_label.Location = new System.Drawing.Point(1073, 41);
+            this.LineCode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LineCode_label.Name = "LineCode_label";
-            this.LineCode_label.Size = new System.Drawing.Size(97, 40);
+            this.LineCode_label.Size = new System.Drawing.Size(122, 50);
             this.LineCode_label.TabIndex = 14;
             this.LineCode_label.Text = "线体";
             // 
@@ -272,9 +281,10 @@
             this.WorkShift_label.BackColor = System.Drawing.Color.Transparent;
             this.WorkShift_label.BorderColor = System.Drawing.Color.White;
             this.WorkShift_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.WorkShift_label.Location = new System.Drawing.Point(792, 88);
+            this.WorkShift_label.Location = new System.Drawing.Point(1073, 110);
+            this.WorkShift_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.WorkShift_label.Name = "WorkShift_label";
-            this.WorkShift_label.Size = new System.Drawing.Size(97, 40);
+            this.WorkShift_label.Size = new System.Drawing.Size(122, 50);
             this.WorkShift_label.TabIndex = 15;
             this.WorkShift_label.Text = "班次";
             // 
@@ -282,9 +292,10 @@
             // 
             this.Logo.BackColor = System.Drawing.Color.Transparent;
             this.Logo.Image = global::UAS_KanBan.Properties.Resources.lo3;
-            this.Logo.Location = new System.Drawing.Point(6, 31);
+            this.Logo.Location = new System.Drawing.Point(8, 39);
+            this.Logo.Margin = new System.Windows.Forms.Padding(4);
             this.Logo.Name = "Logo";
-            this.Logo.Size = new System.Drawing.Size(244, 95);
+            this.Logo.Size = new System.Drawing.Size(325, 119);
             this.Logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.Logo.TabIndex = 16;
             this.Logo.TabStop = false;
@@ -297,11 +308,12 @@
             this.投入.BackColor = System.Drawing.Color.Transparent;
             this.投入.BorderColor = System.Drawing.Color.Red;
             this.投入.BorderSize = 0;
-            this.投入.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.投入.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.投入.ForeColor = System.Drawing.Color.Red;
-            this.投入.Location = new System.Drawing.Point(340, 393);
+            this.投入.Location = new System.Drawing.Point(453, 491);
+            this.投入.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.投入.Name = "投入";
-            this.投入.Size = new System.Drawing.Size(0, 71);
+            this.投入.Size = new System.Drawing.Size(0, 87);
             this.投入.TabIndex = 19;
             this.投入.Tag = "AutoFont";
             // 
@@ -313,11 +325,12 @@
             this.产出.BackColor = System.Drawing.Color.Transparent;
             this.产出.BorderColor = System.Drawing.Color.Red;
             this.产出.BorderSize = 0;
-            this.产出.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.产出.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.产出.ForeColor = System.Drawing.Color.Red;
-            this.产出.Location = new System.Drawing.Point(340, 518);
+            this.产出.Location = new System.Drawing.Point(453, 648);
+            this.产出.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.产出.Name = "产出";
-            this.产出.Size = new System.Drawing.Size(0, 71);
+            this.产出.Size = new System.Drawing.Size(0, 87);
             this.产出.TabIndex = 18;
             this.产出.Tag = "AutoFont";
             // 
@@ -329,11 +342,12 @@
             this.收益率.BackColor = System.Drawing.Color.Transparent;
             this.收益率.BorderColor = System.Drawing.Color.Red;
             this.收益率.BorderSize = 0;
-            this.收益率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.收益率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.收益率.ForeColor = System.Drawing.Color.Red;
-            this.收益率.Location = new System.Drawing.Point(898, 393);
+            this.收益率.Location = new System.Drawing.Point(1153, 491);
+            this.收益率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率.Name = "收益率";
-            this.收益率.Size = new System.Drawing.Size(0, 71);
+            this.收益率.Size = new System.Drawing.Size(0, 87);
             this.收益率.TabIndex = 22;
             this.收益率.Tag = "AutoFont";
             // 
@@ -345,11 +359,12 @@
             this.故障数.BackColor = System.Drawing.Color.Transparent;
             this.故障数.BorderColor = System.Drawing.Color.Red;
             this.故障数.BorderSize = 0;
-            this.故障数.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.故障数.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.故障数.ForeColor = System.Drawing.Color.Red;
-            this.故障数.Location = new System.Drawing.Point(898, 518);
+            this.故障数.Location = new System.Drawing.Point(1153, 648);
+            this.故障数.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数.Name = "故障数";
-            this.故障数.Size = new System.Drawing.Size(0, 71);
+            this.故障数.Size = new System.Drawing.Size(0, 87);
             this.故障数.TabIndex = 21;
             this.故障数.Tag = "AutoFont";
             // 
@@ -361,11 +376,12 @@
             this.直通率.BackColor = System.Drawing.Color.Transparent;
             this.直通率.BorderColor = System.Drawing.Color.Red;
             this.直通率.BorderSize = 0;
-            this.直通率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.直通率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.直通率.ForeColor = System.Drawing.Color.Red;
-            this.直通率.Location = new System.Drawing.Point(898, 265);
+            this.直通率.Location = new System.Drawing.Point(1153, 331);
+            this.直通率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率.Name = "直通率";
-            this.直通率.Size = new System.Drawing.Size(0, 71);
+            this.直通率.Size = new System.Drawing.Size(0, 87);
             this.直通率.TabIndex = 20;
             this.直通率.Tag = "AutoFont";
             // 
@@ -377,9 +393,10 @@
             this.班次.BorderColor = System.Drawing.Color.Red;
             this.班次.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.班次.ForeColor = System.Drawing.Color.Red;
-            this.班次.Location = new System.Drawing.Point(909, 88);
+            this.班次.Location = new System.Drawing.Point(1233, 110);
+            this.班次.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.班次.Name = "班次";
-            this.班次.Size = new System.Drawing.Size(0, 40);
+            this.班次.Size = new System.Drawing.Size(0, 50);
             this.班次.TabIndex = 24;
             // 
             // Line
@@ -390,9 +407,10 @@
             this.Line.BorderColor = System.Drawing.Color.Red;
             this.Line.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Line.ForeColor = System.Drawing.Color.Red;
-            this.Line.Location = new System.Drawing.Point(909, 32);
+            this.Line.Location = new System.Drawing.Point(1233, 40);
+            this.Line.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Line.Name = "Line";
-            this.Line.Size = new System.Drawing.Size(0, 40);
+            this.Line.Size = new System.Drawing.Size(0, 50);
             this.Line.TabIndex = 23;
             // 
             // Title2
@@ -402,9 +420,10 @@
             this.Title2.BackColor = System.Drawing.Color.Transparent;
             this.Title2.BorderColor = System.Drawing.Color.White;
             this.Title2.Font = new System.Drawing.Font("宋体", 45F);
-            this.Title2.Location = new System.Drawing.Point(267, 161);
+            this.Title2.Location = new System.Drawing.Point(356, 201);
+            this.Title2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Title2.Name = "Title2";
-            this.Title2.Size = new System.Drawing.Size(535, 60);
+            this.Title2.Size = new System.Drawing.Size(670, 75);
             this.Title2.TabIndex = 25;
             this.Title2.Text = "投入\\产出实时统计";
             // 
@@ -414,20 +433,21 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.机型.AutoSize = true;
             this.机型.BackColor = System.Drawing.Color.Transparent;
-            this.机型.Font = new System.Drawing.Font("宋体", 52.25F, System.Drawing.FontStyle.Bold);
+            this.机型.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.机型.ForeColor = System.Drawing.Color.Red;
-            this.机型.Location = new System.Drawing.Point(340, 265);
+            this.机型.Location = new System.Drawing.Point(453, 331);
+            this.机型.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.机型.Name = "机型";
-            this.机型.Size = new System.Drawing.Size(0, 70);
+            this.机型.Size = new System.Drawing.Size(0, 87);
             this.机型.TabIndex = 17;
             this.机型.Tag = "AutoFont";
             // 
             // Process
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1036, 687);
+            this.ClientSize = new System.Drawing.Size(1292, 859);
             this.Controls.Add(this.Title2);
             this.Controls.Add(this.班次);
             this.Controls.Add(this.Line);
@@ -456,6 +476,7 @@
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Process";
             this.Text = "";
             this.TitleColor = System.Drawing.Color.WhiteSmoke;

UAS_KanBan/Process.cs

@@ -14,7 +14,7 @@ namespace UAS_KanBan
     public partial class Process : BaseForm
     {
 
-        AutoSizeControl asc = new AutoSizeControl();
+        AutoSizeFormClass asc = new AutoSizeFormClass();
 
         DataHelper dh = new DataHelper();
 
@@ -41,7 +41,7 @@ namespace UAS_KanBan
 
         private void Process_Load(object sender, EventArgs e)
         {
-            asc.InitControl(this);
+            asc.controllInitializeSize(this);
             Refresh_Tick(sender, e);
             Refresh.Tick += Refresh_Tick;
             Refresh.Interval = Setting.RefreshRate * 1000;
@@ -79,7 +79,10 @@ namespace UAS_KanBan
 
         private void Process_SizeChanged(object sender, EventArgs e)
         {
-            asc.AutoSize(this);
+            asc.controlAutoSize(this);
+            Line1.Size = new Size(2,BottomLine.Location.Y-TopLine.Location.Y);
+            Line2.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
+            Line3.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
             Title.Location = new Point(Line1.Location.X + (Line2.Location.X - Line1.Location.X - Title.Size.Width) / 2, TopLine.Location.Y + (BottomLine.Location.Y - TopLine.Location.Y - Title.Size.Height) / 2);
             Title2.Location = new Point(Title.Location.X, Title2.Location.Y);
             WorkShift_label.Location = new Point(Line2.Location.X + (Line3.Location.X - Line2.Location.X - WorkShift_label.Size.Width) / 2, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
@@ -87,13 +90,13 @@ namespace UAS_KanBan
             Line.Location = new Point(Line.Location.X, TopLine.Location.Y + (MidLine.Location.Y - TopLine.Location.Y - LineCode_label.Size.Height) / 2);
             班次.Location = new Point(班次.Location.X, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
             Logo.Size = new Size(Line1.Location.X - 20, BottomLine.Location.Y - TopLine.Location.Y - 20);
-            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 30, 机型_label.Location.Y);
-            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 30, 投入_label.Location.Y);
-            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 30, 产出_label.Location.Y);
-            直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 30, 直通率_label.Location.Y);
-            收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 30, 收益率_label.Location.Y);
-            故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 30, 故障数_label.Location.Y);
-            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width-40, 0);
+            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 5, 机型_label.Location.Y);
+            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 5, 投入_label.Location.Y);
+            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 5, 产出_label.Location.Y);
+            直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 5, 直通率_label.Location.Y);
+            收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 5, 收益率_label.Location.Y);
+            故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 5, 故障数_label.Location.Y);
+            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width-15, 0);
         }
 
         private void Process_FormClosing(object sender, FormClosingEventArgs e)

UAS_KanBan/Process.resx

@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>62</value>
+    <value>64</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

UAS_MesInterface(4.0)/MesHelper.cs

@@ -1,13 +1,14 @@
 using Oracle.ManagedDataAccess.Client;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Runtime.InteropServices;
 using System.Text;
 
 namespace BenQGuru.eMES.DLLService
 {
-     
+
     [Guid("99D0E96E-1058-415D-9874-D34537625284")]
     [InterfaceType(ComInterfaceType.InterfaceIsDual)]
     public interface IMESHelper
@@ -38,7 +39,7 @@ namespace BenQGuru.eMES.DLLService
         //用于存放批量执行的SQL
         List<string> sqls = new List<string>();
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
+        private string ConnectionStrings = "Data Source=117.25.180.218/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
         //用户选择的数据库的连接字符串
         private OracleConnection connection;
         //用户选择的数据库的连接字符串
@@ -56,6 +57,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iResCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("序列号对应工序检测")]
         public bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -102,6 +104,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iResCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("验证身份信息")]
         public bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage)
         {
             oErrMessage = "";
@@ -171,6 +174,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="oCdoe3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("分配MAC和BT信息")]
         public bool GetAddressRangeByMO(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCdoe3, out string oErrMessage)
         {
             oWIFI = "";
@@ -219,6 +223,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="oID3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("分配IMEI和NetCode信息")]
         public bool GetMEIOrNetCodeRange(string iSN, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
             oIMEI1 = "";
@@ -262,6 +267,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="oMoCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("获取序列号对应工单信息")]
         public bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage)
         {
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
@@ -305,6 +311,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="oID5"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("查询已分配的信息")]
         public bool GetMobileAllInfo(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
             oBT = "";
@@ -398,6 +405,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iCode3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("写入SN的Wifi,BT信息")]
         public bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
         {
             if (iSN == "")
@@ -416,6 +424,7 @@ namespace BenQGuru.eMES.DLLService
                 return false;
         }
 
+        [Description("序列号跳到下一 步")]
         public bool SetStepFinish(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iErrCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -490,6 +499,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iUserCode"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
+        [Description("设置测试结果，结果必须为NG或者OK")]
         public bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperater, string iResult, string iErrCode, string flag, out string oErrorMessage)
         {
             oErrorMessage = "";
@@ -540,6 +550,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iTestResult"></param>
         /// <param name="oErrMessage"></param>                                                      
         /// <returns></returns>
+        [Description("设置测试结果")]
         public bool SetTestDetail(string iSN, string iTestResult, string iResCode, string[] iTestDetail, out string oErrMessage)
         {
             if (iSN == "" || iSN == null)
@@ -580,6 +591,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iID3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
+        [Description("设置IMEI信息")]
         public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
         {
             if (iSN == "")
@@ -608,6 +620,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iErrCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("设置测试结果")]
         public bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -628,6 +641,15 @@ namespace BenQGuru.eMES.DLLService
                 return false;
         }
 
+        /// <summary>
+        /// 序列号归属工单
+        /// </summary>
+        /// <param name="iMO"></param>
+        /// <param name="iSN"></param>
+        /// <param name="iResCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("序列号归属工单")]
         public bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage)
         {
             if (iSN == "")