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

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

@@ -77,6 +77,7 @@
             this.pa_checkno = new System.Windows.Forms.Label();
             this.pa_downstatus = new System.Windows.Forms.Label();
             this.ms_makecode = new System.Windows.Forms.Label();
+            this.pa_standardqty = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -687,11 +688,23 @@
             this.ms_makecode.TabIndex = 179;
             this.ms_makecode.Visible = false;
             // 
+            // pa_standardqty
+            // 
+            this.pa_standardqty.AutoSize = true;
+            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_standardqty.Location = new System.Drawing.Point(1132, 588);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_standardqty.TabIndex = 180;
+            this.pa_standardqty.Visible = false;
+            // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 730);
+            this.Controls.Add(this.pa_standardqty);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.pa_downstatus);
             this.Controls.Add(this.pa_checkno);
@@ -780,5 +793,6 @@
         private System.Windows.Forms.Label pa_checkno;
         private System.Windows.Forms.Label pa_downstatus;
         private System.Windows.Forms.Label ms_makecode;
+        private System.Windows.Forms.Label pa_standardqty;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -77,21 +77,10 @@ namespace UAS_MES.Make
         {
             //加载表单数据
             string Err = "";
-            if (pa_outboxcode.Text != "")
-            {
-                sql.Clear();
-                sql.Append("select pr_code,pa_outboxcode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,pr_detail,pa_packageqty,nvl(pa_standardqty,pr_outboxinnerqty)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
-                sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
-                Err = "箱号";
-            }
-            else
-            {
-                sql.Clear();
-                sql.Append("select ms_makecode,pr_code,pa_makecode,pa_status,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,nvl(pa_standardqty,pr_outboxinnerqty) pr_outboxinnerqty,pa_packageqty,pa_currentqty,");
-                sql.Append("pa_outboxcode from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
-                sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
-                Err = "序列号";
-            }
+            sql.Clear();
+            sql.Append("select pr_code,pa_outboxcode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,pr_detail,pa_packageqty,pa_standardqty,pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
+            sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
+            Err = "箱号";
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -146,14 +135,31 @@ namespace UAS_MES.Make
                 {
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                     {
+                        sql.Clear();
+                        sql.Append("select ms_makecode,pr_code,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,nvl(pa_standardqty,pr_outboxinnerqty) ");
+                        sql.Append("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                        sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            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 (pa_outboxcode.Text == "")
                         {
-                            LoadData();
-                            if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
+                            string boxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString();
+                            if (boxcode != "")
+                            {
+                                pa_outboxcode.Text = boxcode;
                                 LoadGridData();
+                            }
                             else
                             {
-                                if (AutoGenBoxCode.Checked)
+                                if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
                                     pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
                             }
                         }
@@ -162,41 +168,44 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号不能为空\n", Color.Red, sn_code);
                             return;
                         }
-                        //按工单核对装箱
-                        switch (pr_packrule.Text.ToUpper())
+                        if (pa_status.Text != "1")
                         {
-                            case "MAKE":
-                                if (dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_id='" + oMsID + "'").ToString() != pa_makecode.Text && pa_makecode.Text != "")
-                                {
-                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
-                                    return;
-                                }
-                                break;
-                            case "SALE":
-                                if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
-                                {
-                                    sql.Clear();
-                                    sql.Append("select 1 from package left join make on pa_salecode=ma_salecode left join makeserial ");
-                                    sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
-                                    DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (dt.Rows.Count == 0)
+                            //按工单核对装箱
+                            switch (pr_packrule.Text.ToUpper())
+                            {
+                                case "MAKE":
+                                    if (dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_id='" + oMsID + "'").ToString() != pa_makecode.Text && pa_makecode.Text != "")
                                     {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
+                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
                                         return;
                                     }
-                                }
-                                break;
-                            case "PROD":
-                                if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pr_code.Text)
-                                {
-                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
-                                    return;
-                                }
-                                break;
-                            case "MIX":
-                                break;
-                            default:
-                                break;
+                                    break;
+                                case "SALE":
+                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
+                                    {
+                                        sql.Clear();
+                                        sql.Append("select 1 from package left join make on pa_salecode=ma_salecode left join makeserial ");
+                                        sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
+                                        DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                        if (dt.Rows.Count == 0)
+                                        {
+                                            OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
+                                            return;
+                                        }
+                                    }
+                                    break;
+                                case "PROD":
+                                    if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pr_code.Text)
+                                    {
+                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
+                                        return;
+                                    }
+                                    break;
+                                case "MIX":
+                                    break;
+                                default:
+                                    break;
+                            }
                         }
                         //判断箱内总数必须大于0
                         if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
@@ -254,6 +263,7 @@ namespace UAS_MES.Make
                             {
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "装箱采集", "取消采集成功", sn_code.Text, "");
                                 LoadGridData();
+                                pa_status.Text = "0";
                                 OperateResult.AppendText(">>已从该箱中移除序列号" + sn_code.Text + "\n", Color.Green, sn_code);
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sn_code);

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

@@ -86,6 +86,7 @@
             this.pa_checkno = new System.Windows.Forms.Label();
             this.pa_sccode = new System.Windows.Forms.Label();
             this.ms_makecode = new System.Windows.Forms.Label();
+            this.pa_standardqty = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -802,11 +803,23 @@
             this.ms_makecode.TabIndex = 182;
             this.ms_makecode.Visible = false;
             // 
+            // pa_standardqty
+            // 
+            this.pa_standardqty.AutoSize = true;
+            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_standardqty.Location = new System.Drawing.Point(1047, 589);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_standardqty.TabIndex = 183;
+            this.pa_standardqty.Visible = false;
+            // 
             // Make_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 727);
+            this.Controls.Add(this.pa_standardqty);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.pa_sccode);
             this.Controls.Add(this.pa_checkno);
@@ -909,5 +922,6 @@
         private System.Windows.Forms.Label pr_outboxinnerqty_label;
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label ms_makecode;
+        private System.Windows.Forms.Label pa_standardqty;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -143,23 +143,11 @@ namespace UAS_MES.Make
         {
             //加载表单数据
             string Err = "";
-            if (pa_outboxcode.Text != "")
-            {
-                sql.Clear();
-                sql.Append("select 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,pr_outboxinnerqty)pr_outboxinnerqty,pa_currentqty from package left join ");
-                sql.Append("product on pa_prodcode=pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
-                Err = "箱号";
-            }
-            else
-            {
-                sql.Clear();
-                sql.Append("select pr_cartonmaxw,pa_makecode,pr_cartonunit,pr_cartonminw,pr_cartongw,ms_makecode,pa_status,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,");
-                sql.Append("pa_checkno,pr_packrule,pr_code,pr_detail,nvl(pa_standardqty,pr_outboxinnerqty) pr_outboxinnerqty,pa_packageqty,pa_currentqty,");
-                sql.Append("pa_outboxcode from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
-                sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
-                Err = "序列号";
-            }
+            sql.Clear();
+            sql.Append("select 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,pr_outboxinnerqty)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");
             if (dt.Rows.Count > 0)
             {
@@ -225,17 +213,31 @@ namespace UAS_MES.Make
                 {
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                     {
+                        sql.Clear();
+                        sql.Append("select ms_makecode,pr_code,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,nvl(pa_standardqty,pr_outboxinnerqty) ");
+                        sql.Append("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
+                        sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            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 (pa_outboxcode.Text == "")
                         {
-                            LoadData();
-                            if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
+                            string boxcode = dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString();
+                            if (boxcode != "")
+                            {
+                                pa_outboxcode.Text = boxcode;
                                 LoadGridData();
+                            }
                             else
                             {
-                                pa_outboxcode.MakeCode = pa_makecode.Text;
-                                pa_outboxcode.ProdCode = pr_code.Text;
-                                pa_outboxcode.Caller = "PACKAGE";
-                                if (AutoGenBoxCode.Checked)
+                                if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
                                     pa_outboxcode.GeneratePaCode_Click(new object(), new EventArgs());
                             }
                         }
@@ -244,41 +246,44 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号不能为空\n", Color.Red, sn_code);
                             return;
                         }
-                        //按工单核对装箱
-                        switch (pr_packrule.Text.ToUpper())
+                        if (pa_status.Text != "1")
                         {
-                            case "MAKE":
-                                if (dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_id='" + oMsID + "'").ToString() != pa_makecode.Text)
-                                {
-                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
-                                    return;
-                                }
-                                break;
-                            case "SALE":
-                                if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
-                                {
-                                    sql.Clear();
-                                    sql.Append("select 1 from package left join make on pa_salecode=ma_salecode left join makeserial ");
-                                    sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
-                                    DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (dt.Rows.Count == 0)
+                            //按工单核对装箱
+                            switch (pr_packrule.Text.ToUpper())
+                            {
+                                case "MAKE":
+                                    if (dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_id='" + oMsID + "'").ToString() != pa_makecode.Text)
                                     {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
+                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
                                         return;
                                     }
-                                }
-                                break;
-                            case "PROD":
-                                if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pr_code.Text)
-                                {
-                                    OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
-                                    return;
-                                }
-                                break;
-                            case "MIX":
-                                break;
-                            default:
-                                break;
+                                    break;
+                                case "SALE":
+                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
+                                    {
+                                        sql.Clear();
+                                        sql.Append("select 1 from package left join make on pa_salecode=ma_salecode left join makeserial ");
+                                        sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
+                                        DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                        if (dt.Rows.Count == 0)
+                                        {
+                                            OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
+                                            return;
+                                        }
+                                    }
+                                    break;
+                                case "PROD":
+                                    if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pr_code.Text)
+                                    {
+                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
+                                        return;
+                                    }
+                                    break;
+                                case "MIX":
+                                    break;
+                                default:
+                                    break;
+                            }
                         }
                         //判断箱内总数必须大于0
                         if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
@@ -339,6 +344,7 @@ namespace UAS_MES.Make
                             {
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "装箱采集", "取消采集成功", sn_code.Text, "");
                                 LoadGridData();
+                                pa_status.Text = "0";
                                 OperateResult.AppendText(">>已从该箱中移除序列号" + sn_code.Text + "\n", Color.Green, sn_code);
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sn_code);
@@ -393,6 +399,7 @@ namespace UAS_MES.Make
             {
                 dh.UpdateByCondition("package", "pa_status=1,pa_totalqty=pa_currentqty,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                 pa_status.Text = "1";
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "装箱采集", "封箱成功", pa_outboxcode.Text, "");
                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "封箱成功\n", Color.Green);
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "错误或者已封箱\n", Color.Red);

UAS_DLLTest/Form1.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.groupBoxwithborder3 = new UAS_DLLTest.GroupBoxwithborder();
             this.operateResult = new System.Windows.Forms.RichTextBox();
-            this.groupBoxwithborder2 = new UAS_DLLTest.GroupBoxwithborder();
+            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();
@@ -53,7 +53,7 @@
             this.clearPara = new System.Windows.Forms.CheckBox();
             this.clear = new System.Windows.Forms.Button();
             this.confirm = new System.Windows.Forms.Button();
-            this.groupBoxwithborder1 = new UAS_DLLTest.GroupBoxwithborder();
+            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();
@@ -67,8 +67,8 @@
             this.GetAddressRangeByMO = new System.Windows.Forms.RadioButton();
             this.CheckUserAndResourcePassed = new System.Windows.Forms.RadioButton();
             this.groupBoxwithborder3.SuspendLayout();
-            this.groupBoxwithborder2.SuspendLayout();
-            this.groupBoxwithborder1.SuspendLayout();
+            this.Parameters.SuspendLayout();
+            this.Methods.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBoxwithborder3
@@ -91,98 +91,98 @@
             this.operateResult.TabIndex = 0;
             this.operateResult.Text = "";
             // 
-            // groupBoxwithborder2
-            // 
-            this.groupBoxwithborder2.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxwithborder2.Controls.Add(this.textBox9);
-            this.groupBoxwithborder2.Controls.Add(this.textBox8);
-            this.groupBoxwithborder2.Controls.Add(this.textBox7);
-            this.groupBoxwithborder2.Controls.Add(this.textBox6);
-            this.groupBoxwithborder2.Controls.Add(this.textBox5);
-            this.groupBoxwithborder2.Controls.Add(this.textBox4);
-            this.groupBoxwithborder2.Controls.Add(this.textBox3);
-            this.groupBoxwithborder2.Controls.Add(this.textBox2);
-            this.groupBoxwithborder2.Controls.Add(this.textBox1);
-            this.groupBoxwithborder2.Controls.Add(this.label9);
-            this.groupBoxwithborder2.Controls.Add(this.label8);
-            this.groupBoxwithborder2.Controls.Add(this.label7);
-            this.groupBoxwithborder2.Controls.Add(this.label6);
-            this.groupBoxwithborder2.Controls.Add(this.label5);
-            this.groupBoxwithborder2.Controls.Add(this.label4);
-            this.groupBoxwithborder2.Controls.Add(this.label3);
-            this.groupBoxwithborder2.Controls.Add(this.label2);
-            this.groupBoxwithborder2.Controls.Add(this.label1);
-            this.groupBoxwithborder2.Controls.Add(this.clearResult);
-            this.groupBoxwithborder2.Controls.Add(this.clearPara);
-            this.groupBoxwithborder2.Controls.Add(this.clear);
-            this.groupBoxwithborder2.Controls.Add(this.confirm);
-            this.groupBoxwithborder2.Location = new System.Drawing.Point(34, 201);
-            this.groupBoxwithborder2.Name = "groupBoxwithborder2";
-            this.groupBoxwithborder2.Size = new System.Drawing.Size(1219, 275);
-            this.groupBoxwithborder2.TabIndex = 1;
-            this.groupBoxwithborder2.TabStop = false;
-            this.groupBoxwithborder2.Text = "Parameter";
-            this.groupBoxwithborder2.TextColor = System.Drawing.Color.Black;
+            // 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.Name = "Parameters";
+            this.Parameters.Size = new System.Drawing.Size(1219, 275);
+            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, 108);
+            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, 105);
+            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, 105);
+            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, 60);
+            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, 60);
+            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, 60);
+            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, 16);
+            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, 17);
+            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, 17);
+            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;
@@ -190,7 +190,7 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(815, 115);
+            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;
@@ -199,7 +199,7 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(450, 108);
+            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;
@@ -208,7 +208,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(40, 111);
+            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;
@@ -217,7 +217,7 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(815, 70);
+            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;
@@ -226,7 +226,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(450, 63);
+            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;
@@ -235,7 +235,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(40, 65);
+            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;
@@ -244,7 +244,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(815, 26);
+            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;
@@ -253,7 +253,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(450, 27);
+            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;
@@ -262,7 +262,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(40, 27);
+            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;
@@ -308,38 +308,38 @@
             this.confirm.UseVisualStyleBackColor = true;
             this.confirm.Click += new System.EventHandler(this.confirm_Click);
             // 
-            // groupBoxwithborder1
-            // 
-            this.groupBoxwithborder1.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxwithborder1.Controls.Add(this.SetPcbaData);
-            this.groupBoxwithborder1.Controls.Add(this.GetMobileAllInfo);
-            this.groupBoxwithborder1.Controls.Add(this.SetTestDetail);
-            this.groupBoxwithborder1.Controls.Add(this.GetRcardMOInfo);
-            this.groupBoxwithborder1.Controls.Add(this.SetMobileData);
-            this.groupBoxwithborder1.Controls.Add(this.SetIMEIInfo);
-            this.groupBoxwithborder1.Controls.Add(this.SetAddressInfo);
-            this.groupBoxwithborder1.Controls.Add(this.CheckRoutePassed);
-            this.groupBoxwithborder1.Controls.Add(this.GoMo);
-            this.groupBoxwithborder1.Controls.Add(this.GetMEIOrNetCodeRange);
-            this.groupBoxwithborder1.Controls.Add(this.GetAddressRangeByMO);
-            this.groupBoxwithborder1.Controls.Add(this.CheckUserAndResourcePassed);
-            this.groupBoxwithborder1.Location = new System.Drawing.Point(34, 24);
-            this.groupBoxwithborder1.Name = "groupBoxwithborder1";
-            this.groupBoxwithborder1.Size = new System.Drawing.Size(1219, 151);
-            this.groupBoxwithborder1.TabIndex = 0;
-            this.groupBoxwithborder1.TabStop = false;
-            this.groupBoxwithborder1.Text = "Method";
-            this.groupBoxwithborder1.TextColor = System.Drawing.Color.Black;
+            // 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.Name = "Methods";
+            this.Methods.Size = new System.Drawing.Size(1219, 151);
+            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(132, 22);
+            this.SetPcbaData.Size = new System.Drawing.Size(258, 22);
             this.SetPcbaData.TabIndex = 13;
             this.SetPcbaData.TabStop = true;
-            this.SetPcbaData.Text = "SetPcbaData";
+            this.SetPcbaData.Text = "SetPcbaData(PCBA校准测试)";
             this.SetPcbaData.UseVisualStyleBackColor = true;
             // 
             // GetMobileAllInfo
@@ -347,10 +347,10 @@
             this.GetMobileAllInfo.AutoSize = true;
             this.GetMobileAllInfo.Location = new System.Drawing.Point(790, 83);
             this.GetMobileAllInfo.Name = "GetMobileAllInfo";
-            this.GetMobileAllInfo.Size = new System.Drawing.Size(177, 22);
+            this.GetMobileAllInfo.Size = new System.Drawing.Size(303, 22);
             this.GetMobileAllInfo.TabIndex = 12;
             this.GetMobileAllInfo.TabStop = true;
-            this.GetMobileAllInfo.Text = "GetMobileAllInfo";
+            this.GetMobileAllInfo.Text = "GetMobileAllInfo(获取手机信息)";
             this.GetMobileAllInfo.UseVisualStyleBackColor = true;
             // 
             // SetTestDetail
@@ -358,10 +358,10 @@
             this.SetTestDetail.AutoSize = true;
             this.SetTestDetail.Location = new System.Drawing.Point(790, 55);
             this.SetTestDetail.Name = "SetTestDetail";
-            this.SetTestDetail.Size = new System.Drawing.Size(150, 22);
+            this.SetTestDetail.Size = new System.Drawing.Size(276, 22);
             this.SetTestDetail.TabIndex = 11;
             this.SetTestDetail.TabStop = true;
-            this.SetTestDetail.Text = "SetTestDetail";
+            this.SetTestDetail.Text = "SetTestDetail(记录测试结果)";
             this.SetTestDetail.UseVisualStyleBackColor = true;
             // 
             // GetRcardMOInfo
@@ -369,10 +369,10 @@
             this.GetRcardMOInfo.AutoSize = true;
             this.GetRcardMOInfo.Location = new System.Drawing.Point(790, 28);
             this.GetRcardMOInfo.Name = "GetRcardMOInfo";
-            this.GetRcardMOInfo.Size = new System.Drawing.Size(159, 22);
+            this.GetRcardMOInfo.Size = new System.Drawing.Size(285, 22);
             this.GetRcardMOInfo.TabIndex = 10;
             this.GetRcardMOInfo.TabStop = true;
-            this.GetRcardMOInfo.Text = "GetRcardMOInfo";
+            this.GetRcardMOInfo.Text = "GetRcardMOInfo(获取工单信息)";
             this.GetRcardMOInfo.UseVisualStyleBackColor = true;
             // 
             // SetMobileData
@@ -380,10 +380,10 @@
             this.SetMobileData.AutoSize = true;
             this.SetMobileData.Location = new System.Drawing.Point(33, 111);
             this.SetMobileData.Name = "SetMobileData";
-            this.SetMobileData.Size = new System.Drawing.Size(150, 22);
+            this.SetMobileData.Size = new System.Drawing.Size(321, 22);
             this.SetMobileData.TabIndex = 9;
             this.SetMobileData.TabStop = true;
-            this.SetMobileData.Text = "SetMobileData";
+            this.SetMobileData.Text = "SetMobileData(接收生产数据,转号)";
             this.SetMobileData.UseVisualStyleBackColor = true;
             // 
             // SetIMEIInfo
@@ -391,10 +391,10 @@
             this.SetIMEIInfo.AutoSize = true;
             this.SetIMEIInfo.Location = new System.Drawing.Point(440, 83);
             this.SetIMEIInfo.Name = "SetIMEIInfo";
-            this.SetIMEIInfo.Size = new System.Drawing.Size(132, 22);
+            this.SetIMEIInfo.Size = new System.Drawing.Size(258, 22);
             this.SetIMEIInfo.TabIndex = 8;
             this.SetIMEIInfo.TabStop = true;
-            this.SetIMEIInfo.Text = "SetIMEIInfo";
+            this.SetIMEIInfo.Text = "SetIMEIInfo(记录IMEI使用)";
             this.SetIMEIInfo.UseVisualStyleBackColor = true;
             // 
             // SetAddressInfo
@@ -402,10 +402,10 @@
             this.SetAddressInfo.AutoSize = true;
             this.SetAddressInfo.Location = new System.Drawing.Point(440, 55);
             this.SetAddressInfo.Name = "SetAddressInfo";
-            this.SetAddressInfo.Size = new System.Drawing.Size(159, 22);
+            this.SetAddressInfo.Size = new System.Drawing.Size(294, 22);
             this.SetAddressInfo.TabIndex = 7;
             this.SetAddressInfo.TabStop = true;
-            this.SetAddressInfo.Text = "SetAddressInfo";
+            this.SetAddressInfo.Text = "SetAddressInfo(记录MACBT使用)";
             this.SetAddressInfo.UseVisualStyleBackColor = true;
             // 
             // CheckRoutePassed
@@ -413,10 +413,10 @@
             this.CheckRoutePassed.AutoSize = true;
             this.CheckRoutePassed.Location = new System.Drawing.Point(440, 27);
             this.CheckRoutePassed.Name = "CheckRoutePassed";
-            this.CheckRoutePassed.Size = new System.Drawing.Size(177, 22);
+            this.CheckRoutePassed.Size = new System.Drawing.Size(267, 22);
             this.CheckRoutePassed.TabIndex = 6;
             this.CheckRoutePassed.TabStop = true;
-            this.CheckRoutePassed.Text = "CheckRoutePassed";
+            this.CheckRoutePassed.Text = "CheckRoutePassed(检查途程)";
             this.CheckRoutePassed.UseVisualStyleBackColor = true;
             // 
             // GoMo
@@ -424,10 +424,10 @@
             this.GoMo.AutoSize = true;
             this.GoMo.Location = new System.Drawing.Point(790, 111);
             this.GoMo.Name = "GoMo";
-            this.GoMo.Size = new System.Drawing.Size(69, 22);
+            this.GoMo.Size = new System.Drawing.Size(159, 22);
             this.GoMo.TabIndex = 5;
             this.GoMo.TabStop = true;
-            this.GoMo.Text = "GoMo";
+            this.GoMo.Text = "GoMo(归属工单)";
             this.GoMo.UseVisualStyleBackColor = true;
             // 
             // GetMEIOrNetCodeRange
@@ -435,10 +435,10 @@
             this.GetMEIOrNetCodeRange.AutoSize = true;
             this.GetMEIOrNetCodeRange.Location = new System.Drawing.Point(33, 83);
             this.GetMEIOrNetCodeRange.Name = "GetMEIOrNetCodeRange";
-            this.GetMEIOrNetCodeRange.Size = new System.Drawing.Size(213, 22);
+            this.GetMEIOrNetCodeRange.Size = new System.Drawing.Size(303, 22);
             this.GetMEIOrNetCodeRange.TabIndex = 3;
             this.GetMEIOrNetCodeRange.TabStop = true;
-            this.GetMEIOrNetCodeRange.Text = "GetMEIOrNetCodeRange";
+            this.GetMEIOrNetCodeRange.Text = "GetMEIOrNetCodeRange(分配IMEI)";
             this.GetMEIOrNetCodeRange.UseVisualStyleBackColor = true;
             // 
             // GetAddressRangeByMO
@@ -446,10 +446,10 @@
             this.GetAddressRangeByMO.AutoSize = true;
             this.GetAddressRangeByMO.Location = new System.Drawing.Point(33, 55);
             this.GetAddressRangeByMO.Name = "GetAddressRangeByMO";
-            this.GetAddressRangeByMO.Size = new System.Drawing.Size(204, 22);
+            this.GetAddressRangeByMO.Size = new System.Drawing.Size(303, 22);
             this.GetAddressRangeByMO.TabIndex = 2;
             this.GetAddressRangeByMO.TabStop = true;
-            this.GetAddressRangeByMO.Text = "GetAddressRangeByMO";
+            this.GetAddressRangeByMO.Text = "GetAddressRangeByMO(分配MACBT)";
             this.GetAddressRangeByMO.UseVisualStyleBackColor = true;
             // 
             // CheckUserAndResourcePassed
@@ -457,10 +457,10 @@
             this.CheckUserAndResourcePassed.AutoSize = true;
             this.CheckUserAndResourcePassed.Location = new System.Drawing.Point(33, 27);
             this.CheckUserAndResourcePassed.Name = "CheckUserAndResourcePassed";
-            this.CheckUserAndResourcePassed.Size = new System.Drawing.Size(267, 22);
+            this.CheckUserAndResourcePassed.Size = new System.Drawing.Size(357, 22);
             this.CheckUserAndResourcePassed.TabIndex = 1;
             this.CheckUserAndResourcePassed.TabStop = true;
-            this.CheckUserAndResourcePassed.Text = "CheckUserAndResourcePassed";
+            this.CheckUserAndResourcePassed.Text = "CheckUserAndResourcePassed(登录检查)";
             this.CheckUserAndResourcePassed.UseVisualStyleBackColor = true;
             // 
             // Form1
@@ -469,23 +469,23 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1285, 686);
             this.Controls.Add(this.groupBoxwithborder3);
-            this.Controls.Add(this.groupBoxwithborder2);
-            this.Controls.Add(this.groupBoxwithborder1);
+            this.Controls.Add(this.Parameters);
+            this.Controls.Add(this.Methods);
             this.Name = "Form1";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);
             this.groupBoxwithborder3.ResumeLayout(false);
-            this.groupBoxwithborder2.ResumeLayout(false);
-            this.groupBoxwithborder2.PerformLayout();
-            this.groupBoxwithborder1.ResumeLayout(false);
-            this.groupBoxwithborder1.PerformLayout();
+            this.Parameters.ResumeLayout(false);
+            this.Parameters.PerformLayout();
+            this.Methods.ResumeLayout(false);
+            this.Methods.PerformLayout();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private GroupBoxwithborder groupBoxwithborder1;
+        private GroupBoxwithborder Methods;
         private System.Windows.Forms.RadioButton SetPcbaData;
         private System.Windows.Forms.RadioButton GetMobileAllInfo;
         private System.Windows.Forms.RadioButton SetTestDetail;
@@ -498,7 +498,7 @@
         private System.Windows.Forms.RadioButton GetMEIOrNetCodeRange;
         private System.Windows.Forms.RadioButton GetAddressRangeByMO;
         private System.Windows.Forms.RadioButton CheckUserAndResourcePassed;
-        private GroupBoxwithborder groupBoxwithborder2;
+        private GroupBoxwithborder Parameters;
         private GroupBoxwithborder groupBoxwithborder3;
         private System.Windows.Forms.CheckBox clearResult;
         private System.Windows.Forms.CheckBox clearPara;

UAS_DLLTest/Form1.cs

@@ -14,7 +14,7 @@ namespace UAS_DLLTest
 {
     public partial class Form1 : Form
     {
-        MESHelper l;
+        MESHelper helper;
         Control.ControlCollection collection;
         Control.ControlCollection groupBox2Childs;
         ParameterInfo[] param;
@@ -24,9 +24,9 @@ namespace UAS_DLLTest
         public Form1()
         {
             InitializeComponent();
-            l = new MESHelper();
-            collection = groupBoxwithborder1.Controls;
-            groupBox2Childs = groupBoxwithborder2.Controls;
+            helper = new MESHelper();
+            collection = Methods.Controls;
+            groupBox2Childs = Parameters.Controls;
             //监听多个radiobutton的状态
             for (int i = 0; i < collection.Count; i++)
             {
@@ -39,16 +39,16 @@ namespace UAS_DLLTest
 
         private void radioButton_checkChanged(object sender, EventArgs e)
         {
+            hideControl();
             for (int i = 0; i < collection.Count; i++)
             {
                 if (((RadioButton)collection[i]).Checked) {
                     //显示当前选中的方法的所有参数
                     //获取所有的参数
                     icount = 0;
-                    param = l.GetType().GetMethod(collection[i].Name).GetParameters();
+                    param = helper.GetType().GetMethod(collection[i].Name).GetParameters();
                     for (int j = 1; j < param.Length+1; j++)
                     {
-                        Console.WriteLine("参数名:"+param[j-1].Name);
                         //参数名i开头的才需要显示
                         if (!param[j - 1].Name.StartsWith("o"))
                         {
@@ -106,10 +106,9 @@ namespace UAS_DLLTest
             for (int i = 0; i < collection.Count; i++) {
                 if (((RadioButton)collection[i]).Checked)
                 {
-                    Type type = l.GetType();
+                    Type type = helper.GetType();
                     MethodInfo method =  type.GetMethod(((RadioButton)collection[i]).Name);
-                    var result=method.Invoke(l, allParams);
-                    oResult = result.ToString();
+                    oResult = method.Invoke(helper, allParams).ToString();
                 }
             }
             //输出out出的信息
@@ -124,13 +123,7 @@ namespace UAS_DLLTest
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            //设置groupBox2中所有的label和textbox不可见
-            for (int i = 0; i < groupBox2Childs.Count; i++)
-            {
-                if ((groupBox2Childs[i] is Label)||(groupBox2Childs[i] is TextBox)) {
-                    groupBox2Childs[i].Visible = false;
-                }
-            }
+            hideControl();
         }
 
         private void clear_Click(object sender, EventArgs e)
@@ -148,5 +141,16 @@ namespace UAS_DLLTest
                 operateResult.Clear();
             }
         }
+        private void hideControl()
+        {
+            //设置groupBox2中所有的label和textbox不可见
+            for (int i = 0; i < groupBox2Childs.Count; i++)
+            {
+                if ((groupBox2Childs[i] is Label) || (groupBox2Childs[i] is TextBox))
+                {
+                    groupBox2Childs[i].Visible = false;
+                }
+            }
+        }
     }
 }