Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs

@@ -42,7 +42,7 @@
             this.Search_Icon.Location = new System.Drawing.Point(183, 0);
             this.Search_Icon.Name = "Search_Icon";
             this.Search_Icon.Power = "";
-            this.Search_Icon.Size = new System.Drawing.Size(21, 22);
+            this.Search_Icon.Size = new System.Drawing.Size(21, 25);
             this.Search_Icon.TabIndex = 1;
             this.Search_Icon.TabStop = false;
             this.Search_Icon.Click += new System.EventHandler(this.Search_Icon_Click);
@@ -71,7 +71,7 @@
             this.Controls.Add(this.Search_Icon);
             this.Controls.Add(this.TextBox);
             this.Name = "MaCodeSearchTextBox";
-            this.Size = new System.Drawing.Size(204, 22);
+            this.Size = new System.Drawing.Size(204, 25);
             this.Load += new System.EventHandler(this.SearchTextBox_Load);
             this.SizeChanged += new System.EventHandler(this.SearchTextBox_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -225,12 +225,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         private void TextBox_TextChanged(object sender, EventArgs e)
         {
-            try
-            {
-                if (db.SuccessReturnData)
-                    LockCheckBox.Checked = true;
-            }
-            catch (Exception) { }
             UserControlTextChanged?.Invoke(sender, new EventArgs());
         }
 

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -42,6 +42,7 @@ namespace UAS_MES.Make
 
         private void Make_CollectBTMAC_Load(object sender, EventArgs e)
         {
+            sncode.Focus();
             dh = new DataHelper();
             asc.controllInitializeSize(this);
         }
@@ -86,45 +87,30 @@ namespace UAS_MES.Make
                         // 获取工单归属工单下一工序是否正确
                         if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                         {
-                            if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                            sql.Clear();
+                            sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            if (dt.Rows.Count > 0)
                             {
-                                //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                                if (ms_makecode.Text != macode || macode == "")
-                                {
-                                    //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                                    if (macode != "" && ms_makecode.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                                    }
-                                }
-                                sql.Clear();
-                                sql.Append("select  ma_code as ms_makecode,nvl(mcd_inqty,0),ma_prodcode,pr_detail,pr_spec, ");
-                                sql.Append("ma_qty-nvl(mcd_inqty,0)as mcd_remainqty from make left join makecraftdetail on mcd_maid=ma_id left join product on pr_code=ma_prodcode ");
-                                sql.Append("where ma_code=:ma_code");
-                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", macode);
-                                if (dt.Rows.Count > 0)
-                                {
-                                    BaseUtil.SetFormValue(this.Controls, dt);
-                                    dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
-                                    OperateResult.AppendText(">>请输入BT\n", Color.Green);
-                                    sn_code = sncode.Text;
-                                    sncode.Text = "";
-                                    isBT = true;
-                                    return;
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                                }
-
+                                BaseUtil.SetFormValue(this.Controls, dt);
+                                dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
+                                OperateResult.AppendText(">>请输入BT\n", Color.Green);
+                                sn_code = sncode.Text;
+                                sncode.Text = "";
+                                isBT = true;
+                                return;
                             }
                             else
                             {
-                                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                                sncode.Text = "";
+                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
                             }
                         }
                         else
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                         }
 
@@ -144,6 +130,7 @@ namespace UAS_MES.Make
                         ms_bt = dh.getFieldDataByCondition("makeserial", "ms_bt", "ms_id = '" + oMsID + "'").ToString();
                         if (sncode.Text == ms_bt)
                         {
+                            sncode.Text = "";
                             OperateResult.AppendText(">>BT错误,重复\n", Color.Red);
                             OperateResult.AppendText(">>请输入BT\n", Color.Green);
                             return;
@@ -151,12 +138,12 @@ namespace UAS_MES.Make
                         else
                         {
                             ms_bt = sncode.Text;
-                            ErrorMessage = "工单" + sncode.Text + "BT采集完成>>>请输入SN";
+                            ErrorMessage = "BT采集完成>>>请输入MAC";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                             isBT = false;
                             isMAC = true;
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                            sncode.Text = "";
+                            sncode.Focus(); 
                         }
 
                     }
@@ -176,6 +163,7 @@ namespace UAS_MES.Make
                     ms_mac = dh.getFieldDataByCondition("makeserial", "ms_mac", "ms_id = '" + oMsID + "'").ToString();
                     if (sncode.Text == ms_mac)
                     {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>MAC错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入MAC\n", Color.Green);
                         return;
@@ -195,7 +183,7 @@ namespace UAS_MES.Make
                         }
                         else
                         {
-                            OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
+                            OperateResult.AppendText(">>采集错误" + ErrorMessage + "\n", Color.Red);
                         }
                         ErrorMessage = ">>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -38,6 +38,7 @@ namespace UAS_MES.Make
 
         private void Make_CollectNetCode_Load(object sender, EventArgs e)
         {
+            sncode.Focus();
             dh = new DataHelper();
             asc.controllInitializeSize(this);
 
@@ -54,50 +55,34 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
                         return;
                     }
-                    OperateResult.AppendText("<<"+sncode.Text+"\n", Color.Green);
+                    OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
                     string ErrorMessage2;
                     string oMakeCode;
                     // 获取工单归属工单下一工序是否正确
                     if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                     {
-                        if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                        sql.Clear();
+                        sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                        sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                        sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
                         {
-                            //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                            if (ms_makecode.Text != macode || macode == "")
-                            {
-                                //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                                if (macode != "" && ms_makecode.Text != "")
-                                {
-                                    OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                                }
-                            }
-                            sql.Clear();
-                            sql.Append("select  ma_code as ms_makecode,nvl(mcd_inqty,0),ma_prodcode,pr_detail,pr_spec, ");
-                            sql.Append("ma_qty-nvl(mcd_inqty,0)as mcd_remainqty from make left join makecraftdetail on mcd_maid=ma_id left join product on pr_code=ma_prodcode ");
-                            sql.Append("where ma_code=:ma_code");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", macode);
-                            if (dt.Rows.Count > 0)
-                            {
-                                BaseUtil.SetFormValue(this.Controls, dt);
-                                dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
-                                OperateResult.AppendText(">>请输入网标\n", Color.Green);
-                                sn_code = sncode.Text;
-                                sncode.Text = "";
-                                isnetcode = true;
-                                return;
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                            }
-
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
+                            OperateResult.AppendText(">>请输入网标\n", Color.Green);
+                            sn_code = sncode.Text;
+                            sncode.Text = "";
+                            isnetcode = true;
+                            return;
                         }
                         else
                         {
-                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                            OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
                         }
                     }
-                    else {
+                    else
+                    {
                         OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                     }
                 }
@@ -115,11 +100,13 @@ namespace UAS_MES.Make
                     net_code = dh.getFieldDataByCondition("makeserial", "ms_netcode", "ms_id = '" + oMsID + "'").ToString();
                     if (int.Parse(mcd_remainqty.Text) <= 0)
                     {
-                        ErrorMessage = "工单" + sncode.Text + "剩余采集数不足>>>请输入SN";
+                        ErrorMessage = "工单" + ms_makecode.Text + "剩余采集数不足>>>请输入SN";
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         return;
                     }
-                    else if (sncode.Text == net_code) {
+                    else if (sncode.Text == net_code)
+                    {
+                        sncode.Text = "";
                         OperateResult.AppendText(">>网标错误,重复\n", Color.Red);
                         OperateResult.AppendText(">>请输入网标\n", Color.Green);
                         return;
@@ -134,7 +121,7 @@ namespace UAS_MES.Make
                             BaseUtil.CleanForm(this);
                             printcount++;
                             mcd_okqty.Text = printcount + "";
-                            mcd_remainqty.Text = 0+ "";
+                            mcd_remainqty.Text = 0 + "";
                             isnetcode = false;
                         }
                         else
@@ -160,9 +147,10 @@ namespace UAS_MES.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
-            if (isnetcode) {
+            if (isnetcode)
+            {
                 BaseUtil.CleanForm(this);
-                mcd_remainqty.Text = 0+ "";
+                mcd_remainqty.Text = 0 + "";
                 OperateResult.AppendText(">>清除完成，清重新输入SN号\n", Color.Green);
                 isnetcode = false;
             }

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

@@ -195,7 +195,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(483, 52);
+            this.pr_code.Location = new System.Drawing.Point(465, 52);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 27);
@@ -206,7 +206,7 @@
             // 
             this.pr_detail.AutoSize = true;
             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(777, 52);
+            this.pr_detail.Location = new System.Drawing.Point(748, 54);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -261,7 +261,7 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(191, 58);
+            this.ma_code.Location = new System.Drawing.Point(163, 54);
             this.ma_code.Name = "ma_code";
             this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 183;

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -30,8 +30,6 @@ namespace UAS_MES.Make
         string craftcode;
         //制造单号
         string macode;
-        //当前工单的序列号
-        string sn_code;
         //当前提示的索引
         int RemainIndex = 0;
         ApplicationClass lbl;
@@ -61,78 +59,70 @@ namespace UAS_MES.Make
                 // 获取工单归属工单下一工序是否正确
                 if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                 {
-                    if (LogicHandler.GetMakeInfo(sncode.Text, out macode, out ErrorMessage2))
+                    //获取工单的其他信息
+                    sql.Clear();
+                    sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode as pr_code ,pr_detail,");
+                    sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
                     {
-                        //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                      //  macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "'").ToString();
-                        if (ma_code.Text != macode || macode == "")
-                        {
-                            //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
-                            if (macode != "" && ma_code.Text != "")
-                            {
-                                OperateResult.AppendText(">>切换工单至工单号" + macode + "\n", Color.Red);
-                            }
-                        }
-                        sql.Clear();
-                        sql.Append("select ma_code,mcd_okqty,ma_qty,ma_qty-mcd_okqty as mcd_remainqty,pr_detail,pr_code ");
-                        sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                        sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", sncode.Text);
-                        if (dt.Rows.Count > 0)
-                        {
-                            BaseUtil.SetFormValue(this.Controls, dt);
-                            sn_code = sncode.Text;
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                        BaseUtil.SetFormValue(this.Controls, dt);
+                        //提示用户“<<工单号：取ma_makecode”
+                        OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                        //提示用户“<< 序列号：XXXX”
+                        OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
 
-                        }
-                        string ErrorMessage = "";
-                        string result = "";
-                        if (int.Parse(mcd_remainqty.Text) <= 0)
-                        {
-                            macode = ma_code.Text;
-                            BaseUtil.CleanForm(this);
-                            ErrorMessage = "工单" + macode + "打印完成>>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                            return;
-                        }
-                        else
+                    }
+                    string ErrorMessage = "";
+                    string result = "";
+                    if (int.Parse(mcd_remainqty.Text) <= 0)
+                    {
+                        macode = ma_code.Text;
+                        BaseUtil.CleanForm(this);
+                        ErrorMessage = "工单" + macode + "打印完成>>>请输入SN";
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                        sncode.Focus();
+                        return;
+                    }
+                    else
+                    {
+                        if (PrintLabel.SelectedValue != null && PrintNum.Text.Trim() != "")
                         {
-                            if (PrintLabel.SelectedValue != null && PrintNum.Text.Trim() != "")
+                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text));
+                            if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
                             {
-                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text));
-                                if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
-                                {
-                                    ErrorMessage = "打印完成,执行更新";
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                                    mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-                                    mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
-                                    sncode.Text = "";
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>更新错误" + ErrorMessage + "\n", Color.Red);
-                                }
+                                ErrorMessage = "打印完成,执行更新";
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
+                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                                mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
+                                sncode.Text = "";
+                                sncode.Focus();
                             }
                             else
                             {
-                                ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                                return;
+                                sncode.Text = "";
+                                sncode.Focus();
+                                OperateResult.AppendText(">>更新失败" + ErrorMessage + "\n", Color.Red);
                             }
-                            ErrorMessage = ">>>请输入SN";
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                         }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        else
+                        {
+                            ErrorMessage = "该序列号对应的产品未维护（彩盒）标签模板或打印张数没有选择";
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                            return;
+                        }
+                        ErrorMessage = ">>>请输入SN";
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                     }
                 }
-                else {
-                    OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                else
+                {
+                    OperateResult.AppendText(ErrorMessage2 + "\n", Color.Red);
                 }
             }
         }

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

@@ -71,9 +71,10 @@
             this.bc_code,
             this.bc_name,
             this.bc_note});
-            this.ChoosedRejectList.Location = new System.Drawing.Point(313, 197);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(417, 246);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(226, 242);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(300, 302);
             this.ChoosedRejectList.TabIndex = 54;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -118,9 +119,10 @@
             this.bc_code1,
             this.bc_name1,
             this.bc_note1});
-            this.WaitRejectList.Location = new System.Drawing.Point(14, 194);
+            this.WaitRejectList.Location = new System.Drawing.Point(19, 242);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(226, 244);
+            this.WaitRejectList.Size = new System.Drawing.Size(300, 304);
             this.WaitRejectList.TabIndex = 51;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -160,9 +162,10 @@
             // 
             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(10, 133);
+            this.bg_name_label.Location = new System.Drawing.Point(13, 166);
+            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(90, 21);
+            this.bg_name_label.Size = new System.Drawing.Size(112, 27);
             this.bg_name_label.TabIndex = 92;
             this.bg_name_label.Text = "不良代码组";
             // 
@@ -170,9 +173,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(10, 170);
+            this.label1.Location = new System.Drawing.Point(13, 212);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 96;
             this.label1.Text = "待选不良";
             // 
@@ -180,9 +184,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(309, 170);
+            this.label2.Location = new System.Drawing.Point(412, 212);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 97;
             this.label2.Text = "已选不良";
             // 
@@ -192,9 +197,10 @@
             this.label3.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label3.Location = new System.Drawing.Point(6, 5);
+            this.label3.Location = new System.Drawing.Point(8, 6);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(106, 21);
+            this.label3.Size = new System.Drawing.Size(132, 27);
             this.label3.TabIndex = 99;
             this.label3.Text = "新增不良代码";
             // 
@@ -203,8 +209,9 @@
             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.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(548, 32);
+            this.headBar1.Size = new System.Drawing.Size(731, 40);
             this.headBar1.TabIndex = 98;
             this.headBar1.Title = null;
             this.headBar1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.headBar1_MouseDown);
@@ -212,10 +219,10 @@
             // badgroup
             // 
             this.badgroup.FormattingEnabled = true;
-            this.badgroup.Location = new System.Drawing.Point(123, 134);
-            this.badgroup.Margin = new System.Windows.Forms.Padding(2);
+            this.badgroup.Location = new System.Drawing.Point(164, 168);
+            this.badgroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.badgroup.Name = "badgroup";
-            this.badgroup.Size = new System.Drawing.Size(153, 20);
+            this.badgroup.Size = new System.Drawing.Size(203, 23);
             this.badgroup.TabIndex = 95;
             this.badgroup.SelectedIndexChanged += new System.EventHandler(this.badgroup_SelectedIndexChanged);
             // 
@@ -228,11 +235,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.ms_sncode);
             this.groupBoxWithBorder1.Controls.Add(this.ms_sncode_label);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 35);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 44);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(548, 80);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(731, 100);
             this.groupBoxWithBorder1.TabIndex = 94;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "产品信息";
@@ -248,10 +255,11 @@
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_makecode.ForeColor = System.Drawing.Color.Black;
             this.ms_makecode.ID = null;
-            this.ms_makecode.Location = new System.Drawing.Point(313, 36);
+            this.ms_makecode.Location = new System.Drawing.Point(417, 45);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Power = null;
-            this.ms_makecode.Size = new System.Drawing.Size(141, 23);
+            this.ms_makecode.Size = new System.Drawing.Size(187, 27);
             this.ms_makecode.Str = null;
             this.ms_makecode.Str1 = null;
             this.ms_makecode.Str2 = null;
@@ -262,9 +270,10 @@
             // 
             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(240, 36);
+            this.ms_makecode_label.Location = new System.Drawing.Point(320, 45);
+            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(58, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_makecode_label.TabIndex = 97;
             this.ms_makecode_label.Text = "工单号";
             // 
@@ -278,10 +287,11 @@
             this.ms_sncode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ForeColor = System.Drawing.Color.Black;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(82, 36);
+            this.ms_sncode.Location = new System.Drawing.Point(109, 45);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(141, 23);
+            this.ms_sncode.Size = new System.Drawing.Size(187, 27);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -292,9 +302,10 @@
             // 
             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, 36);
+            this.ms_sncode_label.Location = new System.Drawing.Point(13, 45);
+            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(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 95;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -305,13 +316,13 @@
             this.Cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("Cancel.DownImage")));
             this.Cancel.Image = null;
             this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(289, 449);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.Cancel.Location = new System.Drawing.Point(385, 561);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
             this.Cancel.Name = "Cancel";
             this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
             this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(60, 28);
+            this.Cancel.Size = new System.Drawing.Size(80, 35);
             this.Cancel.TabIndex = 56;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = false;
@@ -324,13 +335,13 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(200, 449);
-            this.Save.Margin = new System.Windows.Forms.Padding(2);
+            this.Save.Location = new System.Drawing.Point(267, 561);
+            this.Save.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(60, 28);
+            this.Save.Size = new System.Drawing.Size(80, 35);
             this.Save.TabIndex = 55;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -339,9 +350,10 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(247, 343);
+            this.ChooseedReject.Location = new System.Drawing.Point(336, 348);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 53;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -349,18 +361,19 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(247, 279);
+            this.WaitReject.Location = new System.Drawing.Point(336, 420);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 52;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
             // 
             // Make_NewBadCode
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(548, 486);
+            this.ClientSize = new System.Drawing.Size(731, 608);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.headBar1);
             this.Controls.Add(this.label2);
@@ -375,7 +388,7 @@
             this.Controls.Add(this.WaitReject);
             this.Controls.Add(this.WaitRejectList);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_NewBadCode";
             this.Tag = "ShowDialogWindow";
             this.Text = "Make_NewBadCode";

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

@@ -60,27 +60,32 @@
             // 
             // mbc_component_lsv
             // 
+            this.mbc_component_lsv.CheckBoxes = true;
             this.mbc_component_lsv.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1});
             this.mbc_component_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbc_component_lsv.FullRowSelect = true;
+            listViewItem1.StateImageIndex = 0;
+            listViewItem2.StateImageIndex = 0;
+            listViewItem3.StateImageIndex = 0;
             this.mbc_component_lsv.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
             listViewItem1,
             listViewItem2,
             listViewItem3});
-            this.mbc_component_lsv.Location = new System.Drawing.Point(9, 127);
-            this.mbc_component_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbc_component_lsv.Location = new System.Drawing.Point(12, 159);
+            this.mbc_component_lsv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbc_component_lsv.Name = "mbc_component_lsv";
-            this.mbc_component_lsv.Size = new System.Drawing.Size(219, 153);
+            this.mbc_component_lsv.Size = new System.Drawing.Size(291, 190);
             this.mbc_component_lsv.TabIndex = 1;
             this.mbc_component_lsv.UseCompatibleStateImageBehavior = false;
             this.mbc_component_lsv.View = System.Windows.Forms.View.Details;
+            this.mbc_component_lsv.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.mbc_component_lsv_ItemChecked);
             this.mbc_component_lsv.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.ListView_ItemSelectionChanged);
             // 
             // columnHeader1
             // 
             this.columnHeader1.Text = "不良组件";
-            this.columnHeader1.Width = 137;
+            this.columnHeader1.Width = 123;
             // 
             // nrg_name_lsv
             // 
@@ -90,10 +95,10 @@
             this.nrg_name_lsv.Cursor = System.Windows.Forms.Cursors.Default;
             this.nrg_name_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nrg_name_lsv.FullRowSelect = true;
-            this.nrg_name_lsv.Location = new System.Drawing.Point(232, 127);
-            this.nrg_name_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.nrg_name_lsv.Location = new System.Drawing.Point(309, 159);
+            this.nrg_name_lsv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.nrg_name_lsv.Name = "nrg_name_lsv";
-            this.nrg_name_lsv.Size = new System.Drawing.Size(199, 153);
+            this.nrg_name_lsv.Size = new System.Drawing.Size(264, 190);
             this.nrg_name_lsv.TabIndex = 2;
             this.nrg_name_lsv.UseCompatibleStateImageBehavior = false;
             this.nrg_name_lsv.View = System.Windows.Forms.View.Details;
@@ -118,10 +123,10 @@
             this.nr_groupcode});
             this.nr_name_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_lsv.FullRowSelect = true;
-            this.nr_name_lsv.Location = new System.Drawing.Point(436, 127);
-            this.nr_name_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.nr_name_lsv.Location = new System.Drawing.Point(581, 159);
+            this.nr_name_lsv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.nr_name_lsv.Name = "nr_name_lsv";
-            this.nr_name_lsv.Size = new System.Drawing.Size(182, 306);
+            this.nr_name_lsv.Size = new System.Drawing.Size(241, 382);
             this.nr_name_lsv.TabIndex = 3;
             this.nr_name_lsv.UseCompatibleStateImageBehavior = false;
             this.nr_name_lsv.View = System.Windows.Forms.View.Details;
@@ -148,10 +153,10 @@
             this.nd_name});
             this.mbr_dutycode_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_dutycode_lsv.FullRowSelect = true;
-            this.mbr_dutycode_lsv.Location = new System.Drawing.Point(9, 284);
-            this.mbr_dutycode_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbr_dutycode_lsv.Location = new System.Drawing.Point(12, 355);
+            this.mbr_dutycode_lsv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbr_dutycode_lsv.Name = "mbr_dutycode_lsv";
-            this.mbr_dutycode_lsv.Size = new System.Drawing.Size(219, 149);
+            this.mbr_dutycode_lsv.Size = new System.Drawing.Size(291, 185);
             this.mbr_dutycode_lsv.TabIndex = 5;
             this.mbr_dutycode_lsv.UseCompatibleStateImageBehavior = false;
             this.mbr_dutycode_lsv.View = System.Windows.Forms.View.Details;
@@ -174,10 +179,10 @@
             this.so_name});
             this.mbr_solutioncode_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solutioncode_lsv.FullRowSelect = true;
-            this.mbr_solutioncode_lsv.Location = new System.Drawing.Point(232, 284);
-            this.mbr_solutioncode_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbr_solutioncode_lsv.Location = new System.Drawing.Point(309, 355);
+            this.mbr_solutioncode_lsv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.mbr_solutioncode_lsv.Name = "mbr_solutioncode_lsv";
-            this.mbr_solutioncode_lsv.Size = new System.Drawing.Size(199, 149);
+            this.mbr_solutioncode_lsv.Size = new System.Drawing.Size(264, 185);
             this.mbr_solutioncode_lsv.TabIndex = 6;
             this.mbr_solutioncode_lsv.UseCompatibleStateImageBehavior = false;
             this.mbr_solutioncode_lsv.View = System.Windows.Forms.View.Details;
@@ -200,13 +205,13 @@
             this.Cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("Cancel.DownImage")));
             this.Cancel.Image = null;
             this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(326, 450);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.Cancel.Location = new System.Drawing.Point(435, 562);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
             this.Cancel.Name = "Cancel";
             this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
             this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(60, 28);
+            this.Cancel.Size = new System.Drawing.Size(80, 35);
             this.Cancel.TabIndex = 58;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = false;
@@ -219,13 +224,13 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(238, 450);
-            this.Save.Margin = new System.Windows.Forms.Padding(2);
+            this.Save.Location = new System.Drawing.Point(317, 562);
+            this.Save.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(60, 28);
+            this.Save.Size = new System.Drawing.Size(80, 35);
             this.Save.TabIndex = 57;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -240,11 +245,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.bg_name_label);
             this.groupBoxWithBorder1.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 32);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 40);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(624, 80);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(832, 100);
             this.groupBoxWithBorder1.TabIndex = 4;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "工单信息";
@@ -260,10 +265,11 @@
             this.bc_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name.ForeColor = System.Drawing.Color.Black;
             this.bc_name.ID = null;
-            this.bc_name.Location = new System.Drawing.Point(404, 34);
+            this.bc_name.Location = new System.Drawing.Point(539, 42);
+            this.bc_name.Margin = new System.Windows.Forms.Padding(4);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
-            this.bc_name.Size = new System.Drawing.Size(141, 23);
+            this.bc_name.Size = new System.Drawing.Size(187, 27);
             this.bc_name.Str = null;
             this.bc_name.Str1 = null;
             this.bc_name.Str2 = null;
@@ -274,9 +280,10 @@
             // 
             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.Location = new System.Drawing.Point(308, 34);
+            this.bc_name_label.Location = new System.Drawing.Point(411, 42);
+            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(74, 21);
+            this.bc_name_label.Size = new System.Drawing.Size(92, 27);
             this.bc_name_label.TabIndex = 101;
             this.bc_name_label.Text = "不良代码";
             // 
@@ -290,10 +297,11 @@
             this.bg_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bg_name.ForeColor = System.Drawing.Color.Black;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(128, 34);
+            this.bg_name.Location = new System.Drawing.Point(171, 42);
+            this.bg_name.Margin = new System.Windows.Forms.Padding(4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
-            this.bg_name.Size = new System.Drawing.Size(141, 23);
+            this.bg_name.Size = new System.Drawing.Size(187, 27);
             this.bg_name.Str = null;
             this.bg_name.Str1 = null;
             this.bg_name.Str2 = null;
@@ -304,9 +312,10 @@
             // 
             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(19, 34);
+            this.bg_name_label.Location = new System.Drawing.Point(25, 42);
+            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(90, 21);
+            this.bg_name_label.Size = new System.Drawing.Size(112, 27);
             this.bg_name_label.TabIndex = 99;
             this.bg_name_label.Text = "不良代码组";
             // 
@@ -315,17 +324,18 @@
             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);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(624, 32);
+            this.headBar1.Size = new System.Drawing.Size(832, 40);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = "新增维修信息";
             this.headBar1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.headBar1_MouseDown);
             // 
             // Make_NewMatainInf
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(624, 488);
+            this.ClientSize = new System.Drawing.Size(832, 610);
             this.Controls.Add(this.Cancel);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.mbr_solutioncode_lsv);
@@ -336,7 +346,7 @@
             this.Controls.Add(this.mbc_component_lsv);
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_NewMatainInf";
             this.Tag = "ShowDialogWindow";
             this.Text = "Make_NewMatainInf";

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -176,7 +176,16 @@ namespace UAS_MES.Make
                 ErrorMessage += " 解决方案 ";
             if (ErrorMessage == "")
             {
-                ErrorMessage = "";
+                for (int i = 0; i < mbc_component_lsv.Items.Count; i++)
+                {
+                    if (mbc_component_lsv.Items[i].Checked)
+                    {
+                        mbc_component_lsv.Items[i].Selected = true;
+                    }
+                    else {
+                        mbc_component_lsv.Items[i].Selected = false;
+                    }
+                }
                 string mbccomponent = GetListViewSelectedItemText(mbc_component_lsv, 0);
                 string nrgcode = GetListViewSelectedItemText(nrg_name_lsv, 0);
                 string nrcode = GetListViewSelectedItemText(nr_name_lsv, 0);
@@ -188,8 +197,30 @@ namespace UAS_MES.Make
                 {
                     string macode = dt.Rows[0]["ms_makecode"].ToString();
                     string mbr_id = dh.GetSEQ("makebadreason_seq");
-                    if (!dh.CheckExist("makebadreason", "mbr_badcode='" + bccode + "' and mbr_sncode='" + sncode + "' and mbr_brcode='" + nrcode + "'"))
+                    //存在不良组件进行提示
+                    if (dh.CheckExist("makebadreason", "mbr_badcode='" + bccode + "' and mbr_sncode='" + sncode + "' and mbr_brcode='" + nrcode + "'"))
+                    {
+                        ErrorMessage = "不良代码【" + bc_name.Text + "】已存在不良原因【" + nrname + "】\n";
+                    }
+                    if (ErrorMessage != "")
+                    {
+                        MessageBox.Show(ErrorMessage);
+                        return;
+                    }
+                    else
+                    {
+                        //保存不良原因
+                        sql.Clear();
+                        sql.Append("insert into makebadrscom (mbc_id,mbc_mbrid,mbc_component,mbc_badcode,");
+                        sql.Append("mbc_brcode,mbc_sncode,mbc_makecode,mbc_indate,mbc_inman ) values ");
+                        sql.Append("(makebadrscom_seq.nextval,'" + mbr_id + "' ,'" + mbccomponent + "',");
+                        sql.Append("'" + bccode + "','" + nrcode + "','" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "')");
+                        dh.ExecuteSql(sql.GetString(), "insert");
+                        Close();
+                    }
+                    if (mbccomponent != "" || mbccomponent != null)
                     {
+                        //保存不良组件
                         sql.Clear();
                         sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
                         sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
@@ -197,25 +228,8 @@ namespace UAS_MES.Make
                         sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
                         sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
                         dh.ExecuteSql(sql.GetString(), "insert");
-                        MessageBox.Show("不良原因保存成功");
                     }
-                    else MessageBox.Show("不良代码【" + bc_name.Text + "】已存在不良原因【" + nrname+"】");
-                    if (mbccomponent != "" || mbccomponent != null)
-                    {
-                        if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
-                        {
-                            sql.Clear();
-                            sql.Append("insert into makebadrscom (mbc_id,mbc_mbrid,mbc_component,mbc_badcode,");
-                            sql.Append("mbc_brcode,mbc_sncode,mbc_makecode,mbc_indate,mbc_inman ) values ");
-                            sql.Append("(makebadrscom_seq.nextval,'" + mbr_id + "' ,'" + mbccomponent + "',");
-                            sql.Append("'" + bccode + "','" + nrcode + "','" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "')");
-                            dh.ExecuteSql(sql.GetString(), "insert");
-                        }
-                        else ErrorMessage += "序列号【" + sncode + "】已存在不良组件【" + mbccomponent+"】";
-                    }
-                    if (ErrorMessage != "")
-                        MessageBox.Show(ErrorMessage);
-                    Close();
+
                 }
                 else MessageBox.Show("序列号错误，不存在或者不处于维修状态");
             }
@@ -251,5 +265,19 @@ namespace UAS_MES.Make
             ReleaseCapture();
             SendMessage(this.Handle, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, 0);
         }
+
+        private void mbc_component_lsv_ItemChecked(object sender, ItemCheckedEventArgs e)
+        {
+            if (e.Item.Checked)
+            {
+                foreach (ListViewItem item in this.mbc_component_lsv.CheckedItems)
+                {
+                    if (item != e.Item)
+                    {
+                        item.Checked = false;
+                    }
+                }
+            }
+        }
     }
 }

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

@@ -105,8 +105,9 @@
             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, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(995, 29);
+            this.panel2.Size = new System.Drawing.Size(1327, 36);
             this.panel2.TabIndex = 32;
             // 
             // label1
@@ -114,9 +115,10 @@
             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(12, 4);
+            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(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单信息";
             // 
@@ -126,9 +128,10 @@
             | 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(12, 78);
+            this.ma_craftcode_label.Location = new System.Drawing.Point(16, 98);
+            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(74, 21);
+            this.ma_craftcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_craftcode_label.TabIndex = 66;
             this.ma_craftcode_label.Text = "回流途程";
             // 
@@ -138,9 +141,10 @@
             | 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(311, 78);
+            this.st_rstepcode_label.Location = new System.Drawing.Point(415, 98);
+            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(74, 21);
+            this.st_rstepcode_label.Size = new System.Drawing.Size(92, 27);
             this.st_rstepcode_label.TabIndex = 65;
             this.st_rstepcode_label.Text = "回流工序";
             // 
@@ -150,9 +154,10 @@
             | 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(466, 41);
+            this.ms_prodcode_label.Location = new System.Drawing.Point(621, 51);
+            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(74, 21);
+            this.ms_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_prodcode_label.TabIndex = 62;
             this.ms_prodcode_label.Text = "产品编号";
             // 
@@ -162,9 +167,10 @@
             | 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(695, 41);
+            this.pr_detail_label.Location = new System.Drawing.Point(927, 51);
+            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(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 61;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -172,9 +178,10 @@
             // 
             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(741, 154);
+            this.label14.Location = new System.Drawing.Point(988, 192);
+            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(74, 21);
+            this.label14.Size = new System.Drawing.Size(92, 27);
             this.label14.TabIndex = 46;
             this.label14.Text = "不良备注";
             // 
@@ -183,9 +190,10 @@
             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(458, 154);
+            this.bc_name_label.Location = new System.Drawing.Point(611, 192);
+            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(74, 21);
+            this.bc_name_label.Size = new System.Drawing.Size(92, 27);
             this.bc_name_label.TabIndex = 44;
             this.bc_name_label.Text = "不良代码";
             // 
@@ -193,9 +201,10 @@
             // 
             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(176, 152);
+            this.bg_name_label.Location = new System.Drawing.Point(235, 190);
+            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(90, 21);
+            this.bg_name_label.Size = new System.Drawing.Size(112, 27);
             this.bg_name_label.TabIndex = 40;
             this.bg_name_label.Text = "不良代码组";
             // 
@@ -205,9 +214,10 @@
             | 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(12, 39);
+            this.ms_sncode_label.Location = new System.Drawing.Point(16, 49);
+            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(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 38;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -217,9 +227,10 @@
             | 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, 41);
+            this.ms_makecode_label.Location = new System.Drawing.Point(348, 51);
+            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(58, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_makecode_label.TabIndex = 37;
             this.ms_makecode_label.Text = "工单号";
             // 
@@ -228,9 +239,10 @@
             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(176, 197);
+            this.mbr_brgcode_label.Location = new System.Drawing.Point(235, 246);
+            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(90, 21);
+            this.mbr_brgcode_label.Size = new System.Drawing.Size(112, 27);
             this.mbr_brgcode_label.TabIndex = 93;
             this.mbr_brgcode_label.Text = "不良原因组";
             // 
@@ -239,9 +251,10 @@
             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(458, 196);
+            this.nr_name_label.Location = new System.Drawing.Point(611, 245);
+            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(74, 21);
+            this.nr_name_label.Size = new System.Drawing.Size(92, 27);
             this.nr_name_label.TabIndex = 95;
             this.nr_name_label.Text = "不良原因";
             // 
@@ -250,9 +263,10 @@
             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(741, 194);
+            this.mbr_dutycode_label.Location = new System.Drawing.Point(988, 242);
+            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(58, 21);
+            this.mbr_dutycode_label.Size = new System.Drawing.Size(72, 27);
             this.mbr_dutycode_label.TabIndex = 97;
             this.mbr_dutycode_label.Text = "责任别";
             // 
@@ -261,9 +275,10 @@
             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(176, 238);
+            this.mbc_component_label.Location = new System.Drawing.Point(235, 298);
+            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(74, 21);
+            this.mbc_component_label.Size = new System.Drawing.Size(92, 27);
             this.mbc_component_label.TabIndex = 99;
             this.mbc_component_label.Text = "不良组件";
             // 
@@ -272,9 +287,10 @@
             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(458, 239);
+            this.mbr_solution_label.Location = new System.Drawing.Point(611, 299);
+            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(74, 21);
+            this.mbr_solution_label.Size = new System.Drawing.Size(92, 27);
             this.mbr_solution_label.TabIndex = 101;
             this.mbr_solution_label.Text = "解决方案";
             // 
@@ -283,9 +299,10 @@
             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(176, 298);
+            this.mbl_loc_label.Location = new System.Drawing.Point(235, 372);
+            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(74, 21);
+            this.mbl_loc_label.Size = new System.Drawing.Size(92, 27);
             this.mbl_loc_label.TabIndex = 103;
             this.mbl_loc_label.Text = "不良位置";
             // 
@@ -294,19 +311,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(481, 298);
+            this.mbp_part_label.Location = new System.Drawing.Point(641, 372);
+            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(74, 21);
+            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(163, 280);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2);
+            this.panel1.Location = new System.Drawing.Point(217, 350);
+            this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(829, 2);
+            this.panel1.Size = new System.Drawing.Size(1105, 2);
             this.panel1.TabIndex = 108;
             // 
             // GetSNCode_Label
@@ -315,9 +333,10 @@
             | 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(176, 543);
+            this.GetSNCode_Label.Location = new System.Drawing.Point(235, 679);
+            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(58, 21);
+            this.GetSNCode_Label.Size = new System.Drawing.Size(72, 27);
             this.GetSNCode_Label.TabIndex = 113;
             this.GetSNCode_Label.Text = "序列号";
             // 
@@ -326,28 +345,29 @@
             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(12, 127);
+            this.label2.Location = new System.Drawing.Point(16, 159);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 22);
+            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, 117);
-            this.panel3.Margin = new System.Windows.Forms.Padding(2);
+            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(990, 2);
+            this.panel3.Size = new System.Drawing.Size(1320, 2);
             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(16, 154);
-            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(2);
+            this.BadCodeTree.Location = new System.Drawing.Point(21, 192);
+            this.BadCodeTree.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.BadCodeTree.Name = "BadCodeTree";
-            this.BadCodeTree.Size = new System.Drawing.Size(146, 426);
+            this.BadCodeTree.Size = new System.Drawing.Size(193, 532);
             this.BadCodeTree.TabIndex = 118;
             this.BadCodeTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.BadCodeTree_NodeMouseClick);
             // 
@@ -356,9 +376,10 @@
             this.bc_code.AutoSize = true;
             this.bc_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ForeColor = System.Drawing.Color.Black;
-            this.bc_code.Location = new System.Drawing.Point(948, 74);
+            this.bc_code.Location = new System.Drawing.Point(1264, 92);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_code.Name = "bc_code";
-            this.bc_code.Size = new System.Drawing.Size(0, 21);
+            this.bc_code.Size = new System.Drawing.Size(0, 27);
             this.bc_code.TabIndex = 122;
             this.bc_code.Visible = false;
             // 
@@ -367,9 +388,10 @@
             this.bg_code.AutoSize = true;
             this.bg_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bg_code.ForeColor = System.Drawing.Color.Black;
-            this.bg_code.Location = new System.Drawing.Point(948, 41);
+            this.bg_code.Location = new System.Drawing.Point(1264, 51);
+            this.bg_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bg_code.Name = "bg_code";
-            this.bg_code.Size = new System.Drawing.Size(0, 21);
+            this.bg_code.Size = new System.Drawing.Size(0, 27);
             this.bg_code.TabIndex = 123;
             this.bg_code.Visible = false;
             // 
@@ -378,17 +400,19 @@
             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(926, 74);
+            this.nr_code.Location = new System.Drawing.Point(1235, 92);
+            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, 21);
+            this.nr_code.Size = new System.Drawing.Size(0, 27);
             this.nr_code.TabIndex = 125;
             this.nr_code.Visible = false;
             // 
             // mb_badremark
             // 
-            this.mb_badremark.Location = new System.Drawing.Point(822, 154);
+            this.mb_badremark.Location = new System.Drawing.Point(1096, 192);
+            this.mb_badremark.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.mb_badremark.Name = "mb_badremark";
-            this.mb_badremark.Size = new System.Drawing.Size(161, 21);
+            this.mb_badremark.Size = new System.Drawing.Size(215, 26);
             this.mb_badremark.TabIndex = 127;
             // 
             // ms_sncode
@@ -397,9 +421,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_sncode.AutoSize = true;
             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(94, 41);
+            this.ms_sncode.Location = new System.Drawing.Point(125, 51);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.Size = new System.Drawing.Size(0, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(0, 27);
             this.ms_sncode.TabIndex = 126;
             // 
             // prodcode
@@ -409,13 +434,13 @@
             this.prodcode.Condition = null;
             this.prodcode.DBTitle = null;
             this.prodcode.FormName = null;
-            this.prodcode.Location = new System.Drawing.Point(560, 299);
-            this.prodcode.Margin = new System.Windows.Forms.Padding(2);
+            this.prodcode.Location = new System.Drawing.Point(747, 374);
+            this.prodcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.prodcode.Name = "prodcode";
             this.prodcode.Power = null;
             this.prodcode.SelectField = null;
             this.prodcode.SetValueField = null;
-            this.prodcode.Size = new System.Drawing.Size(165, 21);
+            this.prodcode.Size = new System.Drawing.Size(223, 26);
             this.prodcode.TabIndex = 124;
             this.prodcode.TableName = null;
             this.prodcode.TextBoxEnable = true;
@@ -428,11 +453,11 @@
             this.mbp_partdgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.mbp_part1,
             this.mbp_id});
-            this.mbp_partdgv.Location = new System.Drawing.Point(485, 335);
-            this.mbp_partdgv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbp_partdgv.Location = new System.Drawing.Point(647, 419);
+            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;
-            this.mbp_partdgv.Size = new System.Drawing.Size(278, 152);
+            this.mbp_partdgv.Size = new System.Drawing.Size(371, 190);
             this.mbp_partdgv.TabIndex = 121;
             // 
             // mbp_part1
@@ -457,11 +482,11 @@
             this.mbl_locdgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.mbl_loc1,
             this.mbl_id});
-            this.mbl_locdgv.Location = new System.Drawing.Point(180, 335);
-            this.mbl_locdgv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbl_locdgv.Location = new System.Drawing.Point(240, 419);
+            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;
-            this.mbl_locdgv.Size = new System.Drawing.Size(278, 152);
+            this.mbl_locdgv.Size = new System.Drawing.Size(371, 190);
             this.mbl_locdgv.TabIndex = 120;
             // 
             // mbl_loc1
@@ -484,11 +509,11 @@
             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(89, 128);
-            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(2);
+            this.RefreshTreeView.Location = new System.Drawing.Point(119, 160);
+            this.RefreshTreeView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.RefreshTreeView.Name = "RefreshTreeView";
             this.RefreshTreeView.Power = null;
-            this.RefreshTreeView.Size = new System.Drawing.Size(20, 20);
+            this.RefreshTreeView.Size = new System.Drawing.Size(27, 25);
             this.RefreshTreeView.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.RefreshTreeView.TabIndex = 119;
             this.RefreshTreeView.TabStop = false;
@@ -501,10 +526,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.GetSNCode.BackColor = System.Drawing.Color.White;
             this.GetSNCode.ID = null;
-            this.GetSNCode.Location = new System.Drawing.Point(257, 544);
+            this.GetSNCode.Location = new System.Drawing.Point(343, 680);
+            this.GetSNCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GetSNCode.Name = "GetSNCode";
             this.GetSNCode.Power = null;
-            this.GetSNCode.Size = new System.Drawing.Size(188, 21);
+            this.GetSNCode.Size = new System.Drawing.Size(249, 25);
             this.GetSNCode.Str = null;
             this.GetSNCode.Str1 = null;
             this.GetSNCode.Str2 = null;
@@ -519,12 +545,13 @@
             this.NewRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.DownImage")));
             this.NewRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.Image")));
             this.NewRepairInf.IsShowBorder = true;
-            this.NewRepairInf.Location = new System.Drawing.Point(289, 503);
+            this.NewRepairInf.Location = new System.Drawing.Point(385, 629);
+            this.NewRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.MoveImage")));
             this.NewRepairInf.Name = "NewRepairInf";
             this.NewRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.NormalImage")));
             this.NewRepairInf.Power = null;
-            this.NewRepairInf.Size = new System.Drawing.Size(98, 24);
+            this.NewRepairInf.Size = new System.Drawing.Size(131, 30);
             this.NewRepairInf.TabIndex = 112;
             this.NewRepairInf.Tag = "IfWrite";
             this.NewRepairInf.Text = "新增维修信息";
@@ -538,12 +565,13 @@
             this.SaveRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.DownImage")));
             this.SaveRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.Image")));
             this.SaveRepairInf.IsShowBorder = true;
-            this.SaveRepairInf.Location = new System.Drawing.Point(402, 503);
+            this.SaveRepairInf.Location = new System.Drawing.Point(536, 629);
+            this.SaveRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SaveRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.MoveImage")));
             this.SaveRepairInf.Name = "SaveRepairInf";
             this.SaveRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.NormalImage")));
             this.SaveRepairInf.Power = null;
-            this.SaveRepairInf.Size = new System.Drawing.Size(98, 24);
+            this.SaveRepairInf.Size = new System.Drawing.Size(131, 30);
             this.SaveRepairInf.TabIndex = 111;
             this.SaveRepairInf.Tag = "IfWrite";
             this.SaveRepairInf.Text = "保存维修信息";
@@ -557,12 +585,13 @@
             this.DeleteRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.DownImage")));
             this.DeleteRepairInf.Image = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.Image")));
             this.DeleteRepairInf.IsShowBorder = true;
-            this.DeleteRepairInf.Location = new System.Drawing.Point(516, 503);
+            this.DeleteRepairInf.Location = new System.Drawing.Point(688, 629);
+            this.DeleteRepairInf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DeleteRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.MoveImage")));
             this.DeleteRepairInf.Name = "DeleteRepairInf";
             this.DeleteRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.NormalImage")));
             this.DeleteRepairInf.Power = null;
-            this.DeleteRepairInf.Size = new System.Drawing.Size(68, 24);
+            this.DeleteRepairInf.Size = new System.Drawing.Size(91, 30);
             this.DeleteRepairInf.TabIndex = 110;
             this.DeleteRepairInf.Tag = "IfWrite";
             this.DeleteRepairInf.Text = "删除";
@@ -576,10 +605,11 @@
             | 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(266, 299);
+            this.mbl_loc.Location = new System.Drawing.Point(355, 374);
+            this.mbl_loc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
-            this.mbl_loc.Size = new System.Drawing.Size(141, 21);
+            this.mbl_loc.Size = new System.Drawing.Size(187, 25);
             this.mbl_loc.Str = null;
             this.mbl_loc.Str1 = null;
             this.mbl_loc.Str2 = null;
@@ -596,10 +626,11 @@
             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(560, 239);
+            this.mbr_solutioncode.Location = new System.Drawing.Point(747, 299);
+            this.mbr_solutioncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbr_solutioncode.Name = "mbr_solutioncode";
             this.mbr_solutioncode.Power = null;
-            this.mbr_solutioncode.Size = new System.Drawing.Size(141, 21);
+            this.mbr_solutioncode.Size = new System.Drawing.Size(187, 25);
             this.mbr_solutioncode.Str = null;
             this.mbr_solutioncode.Str1 = null;
             this.mbr_solutioncode.Str2 = null;
@@ -614,10 +645,11 @@
             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(266, 239);
+            this.mbc_component.Location = new System.Drawing.Point(355, 299);
+            this.mbc_component.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbc_component.Name = "mbc_component";
             this.mbc_component.Power = null;
-            this.mbc_component.Size = new System.Drawing.Size(141, 21);
+            this.mbc_component.Size = new System.Drawing.Size(187, 25);
             this.mbc_component.Str = null;
             this.mbc_component.Str1 = null;
             this.mbc_component.Str2 = null;
@@ -632,10 +664,11 @@
             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(820, 198);
+            this.mbr_dutycode.Location = new System.Drawing.Point(1093, 248);
+            this.mbr_dutycode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.mbr_dutycode.Name = "mbr_dutycode";
             this.mbr_dutycode.Power = null;
-            this.mbr_dutycode.Size = new System.Drawing.Size(141, 21);
+            this.mbr_dutycode.Size = new System.Drawing.Size(187, 25);
             this.mbr_dutycode.Str = null;
             this.mbr_dutycode.Str1 = null;
             this.mbr_dutycode.Str2 = null;
@@ -650,10 +683,11 @@
             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(560, 196);
+            this.nr_name.Location = new System.Drawing.Point(747, 245);
+            this.nr_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.nr_name.Name = "nr_name";
             this.nr_name.Power = null;
-            this.nr_name.Size = new System.Drawing.Size(141, 21);
+            this.nr_name.Size = new System.Drawing.Size(187, 25);
             this.nr_name.Str = null;
             this.nr_name.Str1 = null;
             this.nr_name.Str2 = null;
@@ -669,10 +703,11 @@
             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(266, 198);
+            this.nrg_name.Location = new System.Drawing.Point(355, 248);
+            this.nrg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.nrg_name.Name = "nrg_name";
             this.nrg_name.Power = null;
-            this.nrg_name.Size = new System.Drawing.Size(141, 21);
+            this.nrg_name.Size = new System.Drawing.Size(187, 25);
             this.nrg_name.Str = null;
             this.nrg_name.Str1 = null;
             this.nrg_name.Str2 = null;
@@ -687,10 +722,11 @@
             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(560, 154);
+            this.bc_name.Location = new System.Drawing.Point(747, 192);
+            this.bc_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
-            this.bc_name.Size = new System.Drawing.Size(141, 21);
+            this.bc_name.Size = new System.Drawing.Size(187, 25);
             this.bc_name.Str = null;
             this.bc_name.Str1 = null;
             this.bc_name.Str2 = null;
@@ -706,10 +742,11 @@
             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(266, 154);
+            this.bg_name.Location = new System.Drawing.Point(355, 192);
+            this.bg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
-            this.bg_name.Size = new System.Drawing.Size(141, 21);
+            this.bg_name.Size = new System.Drawing.Size(187, 25);
             this.bg_name.Str = null;
             this.bg_name.Str1 = null;
             this.bg_name.Str2 = null;
@@ -719,9 +756,10 @@
             // 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(795, 298);
+            this.OperatResult.Location = new System.Drawing.Point(1060, 372);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(186, 255);
+            this.OperatResult.Size = new System.Drawing.Size(247, 318);
             this.OperatResult.TabIndex = 87;
             this.OperatResult.Text = "";
             // 
@@ -731,9 +769,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_makecode.AutoSize = true;
             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(341, 41);
+            this.ms_makecode.Location = new System.Drawing.Point(455, 51);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 21);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 85;
             // 
             // ms_prodcode
@@ -742,9 +781,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ms_prodcode.AutoSize = true;
             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(562, 41);
+            this.ms_prodcode.Location = new System.Drawing.Point(749, 51);
+            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_prodcode.Name = "ms_prodcode";
-            this.ms_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ms_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ms_prodcode.TabIndex = 83;
             // 
             // pr_detail
@@ -753,9 +793,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.pr_detail.AutoSize = true;
             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(791, 41);
+            this.pr_detail.Location = new System.Drawing.Point(1055, 51);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 82;
             // 
             // Clean
@@ -765,12 +806,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(859, 558);
+            this.Clean.Location = new System.Drawing.Point(1145, 698);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 81;
             this.Clean.Tag = "IfWrite";
             this.Clean.Text = "清除";
@@ -786,12 +828,13 @@
             this.cd_stepcode.Condition = null;
             this.cd_stepcode.DBTitle = "回流工序";
             this.cd_stepcode.FormName = null;
-            this.cd_stepcode.Location = new System.Drawing.Point(401, 79);
+            this.cd_stepcode.Location = new System.Drawing.Point(535, 99);
+            this.cd_stepcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cd_stepcode.Name = "cd_stepcode";
             this.cd_stepcode.Power = null;
             this.cd_stepcode.SelectField = null;
             this.cd_stepcode.SetValueField = null;
-            this.cd_stepcode.Size = new System.Drawing.Size(192, 21);
+            this.cd_stepcode.Size = new System.Drawing.Size(263, 26);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
             this.cd_stepcode.Tag = "ms_stepcode";
@@ -806,12 +849,13 @@
             this.cr_code.Condition = null;
             this.cr_code.DBTitle = "回流途程";
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(92, 79);
+            this.cr_code.Location = new System.Drawing.Point(123, 99);
+            this.cr_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = null;
             this.cr_code.SelectField = null;
             this.cr_code.SetValueField = null;
-            this.cr_code.Size = new System.Drawing.Size(191, 21);
+            this.cr_code.Size = new System.Drawing.Size(256, 26);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
             this.cr_code.Tag = "ms_craftcode";
@@ -825,12 +869,13 @@
             this.NewBadCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.DownImage")));
             this.NewBadCode.Image = ((System.Drawing.Image)(resources.GetObject("NewBadCode.Image")));
             this.NewBadCode.IsShowBorder = true;
-            this.NewBadCode.Location = new System.Drawing.Point(177, 503);
+            this.NewBadCode.Location = new System.Drawing.Point(236, 629);
+            this.NewBadCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewBadCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.MoveImage")));
             this.NewBadCode.Name = "NewBadCode";
             this.NewBadCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.NormalImage")));
             this.NewBadCode.Power = null;
-            this.NewBadCode.Size = new System.Drawing.Size(98, 24);
+            this.NewBadCode.Size = new System.Drawing.Size(131, 30);
             this.NewBadCode.TabIndex = 60;
             this.NewBadCode.Tag = "IfWrite";
             this.NewBadCode.Text = "新增不良代码";
@@ -845,12 +890,13 @@
             this.SaveBadLocation.Enabled = false;
             this.SaveBadLocation.Image = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.Image")));
             this.SaveBadLocation.IsShowBorder = true;
-            this.SaveBadLocation.Location = new System.Drawing.Point(412, 298);
+            this.SaveBadLocation.Location = new System.Drawing.Point(549, 372);
+            this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SaveBadLocation.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.MoveImage")));
             this.SaveBadLocation.Name = "SaveBadLocation";
             this.SaveBadLocation.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.NormalImage")));
             this.SaveBadLocation.Power = null;
-            this.SaveBadLocation.Size = new System.Drawing.Size(46, 24);
+            this.SaveBadLocation.Size = new System.Drawing.Size(61, 30);
             this.SaveBadLocation.TabIndex = 59;
             this.SaveBadLocation.Tag = "IfWrite";
             this.SaveBadLocation.Text = "保存";
@@ -864,12 +910,13 @@
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
             this.Scrap.Image = ((System.Drawing.Image)(resources.GetObject("Scrap.Image")));
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(723, 76);
+            this.Scrap.Location = new System.Drawing.Point(964, 95);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
             this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
             this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(68, 24);
+            this.Scrap.Size = new System.Drawing.Size(91, 30);
             this.Scrap.TabIndex = 56;
             this.Scrap.Tag = "IfWrite";
             this.Scrap.Text = "报废";
@@ -883,12 +930,13 @@
             this.RepairComplete.DownImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.DownImage")));
             this.RepairComplete.Image = ((System.Drawing.Image)(resources.GetObject("RepairComplete.Image")));
             this.RepairComplete.IsShowBorder = true;
-            this.RepairComplete.Location = new System.Drawing.Point(628, 76);
+            this.RepairComplete.Location = new System.Drawing.Point(837, 95);
+            this.RepairComplete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.RepairComplete.MoveImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.MoveImage")));
             this.RepairComplete.Name = "RepairComplete";
             this.RepairComplete.NormalImage = ((System.Drawing.Image)(resources.GetObject("RepairComplete.NormalImage")));
             this.RepairComplete.Power = null;
-            this.RepairComplete.Size = new System.Drawing.Size(68, 24);
+            this.RepairComplete.Size = new System.Drawing.Size(91, 30);
             this.RepairComplete.TabIndex = 55;
             this.RepairComplete.Tag = "IfWrite";
             this.RepairComplete.Text = "完成维修";
@@ -897,9 +945,9 @@
             // 
             // Make_Repair
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(995, 588);
+            this.ClientSize = new System.Drawing.Size(1327, 735);
             this.Controls.Add(this.mb_badremark);
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.nr_code);
@@ -955,6 +1003,7 @@
             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, 4, 4, 4);
             this.Name = "Make_Repair";
             this.Tag = "Make!Repair";
             this.Text = "维修作业";

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -181,9 +181,9 @@ namespace UAS_MES.Make
                 mbc_component.Text = dh.getFieldDataByCondition("makebadrscom", "mbc_component", "mbc_mbrid=" + mbr_id).ToString();
                 //加载两个Grid的数据源
                 DataTable dt = (DataTable)dh.ExecuteSql("select mbp_id,mbp_part from makebadrspart where mbp_mbrid=" + mbr_id, "select");
-                BaseUtil.FillDgvWithDataTable(mbp_partdgv,dt);
+                BaseUtil.FillDgvWithDataTable(mbp_partdgv, dt);
                 dt = (DataTable)dh.ExecuteSql("select mbl_id,mbl_loc from makebadrsloc where mbl_mbrid=" + mbr_id, "select");
-                BaseUtil.FillDgvWithDataTable(mbl_locdgv,dt);
+                BaseUtil.FillDgvWithDataTable(mbl_locdgv, dt);
             }
         }
 
@@ -193,7 +193,7 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,nvl(bc_name,mb_badcode) bc_name,nvl(bg_name,mb_bgcode) bg_name,");
             sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup ");
-            sql.Append("on bg_code=mb_bgcode where mb_sncode='" + (GetSNCode.Text == "" ? ms_sncode.Text : GetSNCode.Text) + "' and mb_makecode='" + macode + "'");
+            sql.Append("on bg_code=mb_bgcode where mb_sncode='" + (GetSNCode.Text == "" ? ms_sncode.Text : GetSNCode.Text) + "' and mb_makecode='" + macode + "' and mb_status=0");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             for (int i = 0; i < dt.Rows.Count; i++)
             {
@@ -294,7 +294,8 @@ namespace UAS_MES.Make
                 else
                 {
                     dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
-                    LogicHandler.InsertMakeProcess(ms_sncode.Text,ms_makecode.Text,User.UserSourceCode,"回流工序","完成维修回流",User.UserCode);
+                    dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "'");
+                    LogicHandler.InsertMakeProcess(ms_sncode.Text, ms_makecode.Text, User.UserSourceCode, "回流工序", "完成维修回流", User.UserCode);
                     OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
                     BaseUtil.CleanForm(this);
                     BadCodeTree.Nodes.Clear();
@@ -305,7 +306,8 @@ namespace UAS_MES.Make
 
         private void Scrap_Click(object sender, EventArgs e)
         {
-            if (ms_sncode.Text != "") {
+            if (ms_sncode.Text != "")
+            {
                 //判断是否有无法维修的记录
                 int ScrapNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + ms_sncode.Text + "'").ToString());
                 if (ScrapNum == 0)
@@ -329,18 +331,32 @@ namespace UAS_MES.Make
 
         private void NewBadCode_Click(object sender, EventArgs e)
         {
-            Make_NewBadCode badcode = new Make_NewBadCode(GetSNCode.Text, macode);
-            badcode.FormClosed += LoadBadInfTree;
-            BaseUtil.SetFormCenter(badcode);
-            badcode.ShowDialog();
+            if (GetSNCode.Text == "" || macode == null || macode == "")
+            {
+                OperatResult.AppendText(">>序列号和工单号不允许为空\n", Color.Red);
+            }
+            else
+            {
+                Make_NewBadCode badcode = new Make_NewBadCode(GetSNCode.Text, macode);
+                badcode.FormClosed += LoadBadInfTree;
+                BaseUtil.SetFormCenter(badcode);
+                badcode.ShowDialog();
+            }
         }
 
         private void NewRepairInf_Click(object sender, EventArgs e)
         {
-            Make_NewMatainInf mataininf = new Make_NewMatainInf(bg_name.Text, bg_code.Text, bc_name.Text, bc_code.Text, GetSNCode.Text, msid, mb_id);
-            mataininf.FormClosed += LoadBadInfTree;
-            BaseUtil.SetFormCenter(mataininf);
-            mataininf.ShowDialog();
+            if (bg_name.Text == "" && bc_name.Text == "")
+            {
+                OperatResult.AppendText(">>不良代码组和不良代码不能为空\n", Color.Red);
+            }
+            else
+            {
+                Make_NewMatainInf mataininf = new Make_NewMatainInf(bg_name.Text, bg_code.Text, bc_name.Text, bc_code.Text, GetSNCode.Text, msid, mb_id);
+                mataininf.FormClosed += LoadBadInfTree;
+                BaseUtil.SetFormCenter(mataininf);
+                mataininf.ShowDialog();
+            }
         }
 
         private void SaveRepairInf_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -126,6 +126,12 @@
   <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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

@@ -83,8 +83,9 @@
             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, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(922, 29);
+            this.panel2.Size = new System.Drawing.Size(1229, 36);
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -92,9 +93,10 @@
             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(12, 4);
+            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(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单信息";
             // 
@@ -102,9 +104,10 @@
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_remark_label.Location = new System.Drawing.Point(335, 162);
+            this.bc_remark_label.Location = new System.Drawing.Point(447, 202);
+            this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
-            this.bc_remark_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             // 
@@ -112,9 +115,10 @@
             // 
             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(231, 522);
+            this.ms_sncode_label.Location = new System.Drawing.Point(308, 652);
+            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(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -122,9 +126,10 @@
             // 
             this.bc_groupcode_label.AutoSize = true;
             this.bc_groupcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_groupcode_label.Location = new System.Drawing.Point(20, 162);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(27, 202);
+            this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
-            this.bc_groupcode_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             // 
@@ -133,9 +138,10 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(20, 123);
+            this.label2.Location = new System.Drawing.Point(27, 154);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 0;
             this.label2.Text = "采集信息";
             // 
@@ -143,9 +149,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(20, 202);
+            this.label3.Location = new System.Drawing.Point(27, 252);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             // 
@@ -154,9 +161,10 @@
             this.GoodProduct.AutoSize = true;
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
-            this.GoodProduct.Location = new System.Drawing.Point(23, 518);
+            this.GoodProduct.Location = new System.Drawing.Point(31, 648);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GoodProduct.Name = "GoodProduct";
-            this.GoodProduct.Size = new System.Drawing.Size(68, 29);
+            this.GoodProduct.Size = new System.Drawing.Size(83, 35);
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
@@ -168,9 +176,10 @@
             this.Reject.AutoSize = true;
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
-            this.Reject.Location = new System.Drawing.Point(106, 518);
+            this.Reject.Location = new System.Drawing.Point(141, 648);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Reject.Name = "Reject";
-            this.Reject.Size = new System.Drawing.Size(87, 29);
+            this.Reject.Size = new System.Drawing.Size(107, 35);
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
@@ -185,9 +194,10 @@
             this.columnHeader1,
             this.columnHeader2});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WaitRejectList.Location = new System.Drawing.Point(22, 263);
+            this.WaitRejectList.Location = new System.Drawing.Point(29, 329);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(296, 244);
+            this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -219,9 +229,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(20, 238);
+            this.label4.Location = new System.Drawing.Point(27, 298);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             // 
@@ -229,9 +240,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(406, 238);
+            this.label5.Location = new System.Drawing.Point(541, 298);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(74, 21);
+            this.label5.Size = new System.Drawing.Size(92, 27);
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             // 
@@ -239,9 +251,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(710, 138);
+            this.label6.Location = new System.Drawing.Point(947, 172);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             // 
@@ -254,9 +267,10 @@
             this.columnHeader7,
             this.columnHeader8});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChoosedRejectList.Location = new System.Drawing.Point(408, 263);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 329);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(296, 244);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -288,10 +302,10 @@
             // 
             this.AutoBadCode.AutoSize = true;
             this.AutoBadCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoBadCode.Location = new System.Drawing.Point(94, 241);
-            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(2);
+            this.AutoBadCode.Location = new System.Drawing.Point(125, 301);
+            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoBadCode.Name = "AutoBadCode";
-            this.AutoBadCode.Size = new System.Drawing.Size(123, 21);
+            this.AutoBadCode.Size = new System.Drawing.Size(151, 24);
             this.AutoBadCode.TabIndex = 69;
             this.AutoBadCode.Text = "自动产生不良代码";
             this.AutoBadCode.UseVisualStyleBackColor = true;
@@ -300,9 +314,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(20, 87);
+            this.ma_qty_label.Location = new System.Drawing.Point(27, 109);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 11;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -310,9 +325,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(335, 47);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(447, 59);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 7;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -320,9 +336,10 @@
             // 
             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(594, 47);
+            this.pr_detail_label.Location = new System.Drawing.Point(792, 59);
+            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(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 6;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -330,9 +347,10 @@
             // 
             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(20, 47);
+            this.ms_makecode_label.Location = new System.Drawing.Point(27, 59);
+            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(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 2;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -340,9 +358,10 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(335, 87);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(447, 109);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_inqty_label.TabIndex = 14;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -350,9 +369,10 @@
             // 
             this.mc_restqty_label.AutoSize = true;
             this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mc_restqty_label.Location = new System.Drawing.Point(594, 87);
+            this.mc_restqty_label.Location = new System.Drawing.Point(792, 109);
+            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mc_restqty_label.Name = "mc_restqty_label";
-            this.mc_restqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.mc_restqty_label.TabIndex = 17;
             this.mc_restqty_label.Text = "待采集数";
             // 
@@ -363,13 +383,13 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(529, 520);
-            this.Save.Margin = new System.Windows.Forms.Padding(2);
+            this.Save.Location = new System.Drawing.Point(705, 650);
+            this.Save.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(65, 26);
+            this.Save.Size = new System.Drawing.Size(87, 32);
             this.Save.TabIndex = 70;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -381,10 +401,11 @@
             this.bc_code.BackColor = System.Drawing.Color.White;
             this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ID = null;
-            this.bc_code.Location = new System.Drawing.Point(111, 202);
+            this.bc_code.Location = new System.Drawing.Point(148, 252);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
-            this.bc_code.Size = new System.Drawing.Size(189, 24);
+            this.bc_code.Size = new System.Drawing.Size(251, 28);
             this.bc_code.Str = null;
             this.bc_code.Str1 = null;
             this.bc_code.Str2 = null;
@@ -398,12 +419,13 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(110, 47);
+            this.ma_code.Location = new System.Drawing.Point(147, 59);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(147, 21);
+            this.ma_code.Size = new System.Drawing.Size(207, 26);
             this.ma_code.TabIndex = 67;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -414,10 +436,10 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(271, 48);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(2);
+            this.LockMakeCode.Location = new System.Drawing.Point(361, 60);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(51, 21);
+            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -426,9 +448,10 @@
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(686, 87);
+            this.mcd_remainqty.Location = new System.Drawing.Point(915, 109);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -436,27 +459,30 @@
             // 
             this.pr_detail.AutoSize = true;
             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(686, 47);
+            this.pr_detail.Location = new System.Drawing.Point(915, 59);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 56;
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(112, 87);
+            this.ma_qty.Location = new System.Drawing.Point(149, 109);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 55;
             // 
             // mcd_inqty
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(428, 87);
+            this.mcd_inqty.Location = new System.Drawing.Point(571, 109);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
@@ -464,18 +490,20 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(428, 47);
+            this.ma_prodcode.Location = new System.Drawing.Point(571, 59);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 53;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.ma_prodcode_TextChanged);
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(713, 162);
+            this.OperateResult.Location = new System.Drawing.Point(951, 202);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(207, 345);
+            this.OperateResult.Size = new System.Drawing.Size(275, 430);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -486,12 +514,13 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(786, 518);
+            this.CleanInfo.Location = new System.Drawing.Point(1048, 648);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
             this.CleanInfo.Power = null;
-            this.CleanInfo.Size = new System.Drawing.Size(61, 24);
+            this.CleanInfo.Size = new System.Drawing.Size(81, 30);
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -500,9 +529,10 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(339, 351);
+            this.ChooseedReject.Location = new System.Drawing.Point(452, 439);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -510,9 +540,10 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(339, 414);
+            this.WaitReject.Location = new System.Drawing.Point(452, 518);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -522,11 +553,12 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
-            this.bc_remark.Location = new System.Drawing.Point(410, 163);
+            this.bc_remark.Location = new System.Drawing.Point(547, 204);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(296, 62);
+            this.bc_remark.Size = new System.Drawing.Size(393, 76);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
@@ -536,9 +568,10 @@
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
-            this.bc_groupcode.Location = new System.Drawing.Point(111, 163);
+            this.bc_groupcode.Location = new System.Drawing.Point(148, 204);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.Size = new System.Drawing.Size(189, 22);
+            this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -548,10 +581,11 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(317, 522);
+            this.ms_sncode.Location = new System.Drawing.Point(423, 652);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(181, 24);
+            this.ms_sncode.Size = new System.Drawing.Size(240, 28);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -561,10 +595,10 @@
             // 
             // Make_TestCollection
             // 
-            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.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(922, 560);
+            this.ClientSize = new System.Drawing.Size(1229, 700);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.AutoBadCode);
             this.Controls.Add(this.bc_code);
@@ -603,6 +637,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -207,7 +207,7 @@ namespace UAS_MES.Make
 
         private void bc_groupcode_SelectedIndexChanged(object sender, EventArgs e)
         {
-            LoadBadCodeListView(false);
+            LoadBadCodeListView();
         }
 
         /// <summary>
@@ -231,7 +231,7 @@ namespace UAS_MES.Make
         /// <summary>
         /// 加载不良代码的ListView的信息
         /// </summary>
-        private void LoadBadCodeListView(bool Clear)
+        private void LoadBadCodeListView()
         {
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
@@ -266,7 +266,7 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,mb_badremark from makebad  ");
             sql.Append("left join badgroup on mb_bgcode=bg_code left join badcode on mb_badcode=bc_code ");
-            sql.Append(" where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'");
+            sql.Append(" where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and mb_status=0");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             ChoosedRejectList.Items.Clear();
             ChoosedRejectList.BeginUpdate();
@@ -292,7 +292,7 @@ namespace UAS_MES.Make
             //如果勾选的是不良品
             if (Reject.Checked)
             {
-                LoadBadCodeListView(true);
+                LoadBadCodeListView();
                 LoadChoosedBadListView();
                 OperateResult.AppendText(">>请采集不良代码\n", Color.Green);
                 bc_code.Focus();
@@ -423,8 +423,8 @@ namespace UAS_MES.Make
                     if (checkno != "")
                         dh.UpdateByCondition("makeserial", "ms_checkno=''", "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "'");
                 }
-                //不良信息采集
-                dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'", "delete");
+                //不良信息采集,mb_status<>0的是之前维修保存的,不能删除
+                dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and nvl(mb_status,0)=0", "delete");
                 if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserCode, User.UserSourceCode, "检查未通过", bgcode, bccode, bcremark, out ErrorMessage))
                 {
                     OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green, ms_sncode);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -93,6 +93,7 @@ namespace UAS_MES.OQC
                         if (!(int.Parse(CheckTypeDGV.Rows[i].Cells["oi_sampleqty"].Value.ToString()) > int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text)))
                         {
                             //ID不为0的时候进行更新操作，ID为0的时候进行插入操作
+                            Console.WriteLine(CheckTypeDGV.Rows[i].Cells["oi_id"].Value.ToString());
                             if (CheckTypeDGV.Rows[i].Cells["oi_id"].Value.ToString() != "0")
                             {
                                 ci_kind_update.Add(CheckTypeDGV.Rows[i].Cells["ci_kind"].Value.ToString());
@@ -152,7 +153,7 @@ namespace UAS_MES.OQC
         {
             if (ob_aqlcode.Text != "" || ob_maxngacceptqty.Text != "")
             {
-                SaveConfiguration.PerformClick();
+                SaveConfiguration_Click(sender, e);
                 Checkob_maxngacceptqty();
                 GetBatch.PerformClick();
             }
@@ -165,7 +166,7 @@ namespace UAS_MES.OQC
         {
             if (ob_maxngacceptqty.Text == "0" || ob_maxngacceptqty.Text == "" || int.Parse(ob_maxngacceptqty.Text) < 0)
             {
-                OperateResult.AppendText(">>最大不合格允通过数必须大于0或者为空\n", Color.Red);
+                OperateResult.AppendText(">>最大不合格允通过数必须大于0\n", Color.Red);
                 ob_maxngacceptqty.Text = null;
             }
             else
@@ -175,7 +176,8 @@ namespace UAS_MES.OQC
                 {
                     OperateResult.AppendText(">>保存成功\n", Color.Green);
                 }
-                else {
+                else
+                {
                     OperateResult.AppendText(">>保存失败\n", Color.Red);
                 }
             }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -41,13 +41,17 @@
             this.ob_aqlcode_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.ad_qty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
+            this.ad_qty_label = new System.Windows.Forms.Label();
+            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SaveConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.RefreshConfiguration = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -63,22 +67,19 @@
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.ad_qty_label = new System.Windows.Forms.Label();
-            this.ad_qty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.panel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
             this.SuspendLayout();
             // 
             // ms_sncode_label
             // 
             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(526, 49);
+            this.ms_sncode_label.Location = new System.Drawing.Point(701, 61);
+            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(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 152;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -86,9 +87,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(21, 45);
+            this.ob_checkno_label.Location = new System.Drawing.Point(28, 56);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
             this.ob_checkno_label.TabIndex = 154;
             this.ob_checkno_label.Text = "批次号";
             // 
@@ -99,8 +101,9 @@
             this.panel2.Controls.Add(this.label2);
             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(1022, 33);
+            this.panel2.Size = new System.Drawing.Size(1363, 36);
             this.panel2.TabIndex = 156;
             this.panel2.Tag = "NoAuto";
             // 
@@ -109,9 +112,10 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label2.Location = new System.Drawing.Point(12, 4);
+            this.label2.Location = new System.Drawing.Point(16, 5);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(143, 21);
+            this.label2.Size = new System.Drawing.Size(177, 27);
             this.label2.TabIndex = 0;
             this.label2.Text = "OQC采样计划维护";
             // 
@@ -119,9 +123,10 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(268, 47);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(357, 59);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.obd_outboxcode_label.TabIndex = 157;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -129,9 +134,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(528, 88);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(704, 110);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
             this.ob_batchqty_label.TabIndex = 159;
             this.ob_batchqty_label.Text = "批数量";
             // 
@@ -139,9 +145,10 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(21, 84);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(28, 105);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ob_prodcode_label.TabIndex = 163;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -149,9 +156,10 @@
             // 
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(259, 63);
+            this.ob_remark_label.Location = new System.Drawing.Point(345, 79);
+            this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_remark_label.Name = "ob_remark_label";
-            this.ob_remark_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
             this.ob_remark_label.TabIndex = 172;
             this.ob_remark_label.Text = "备注";
             // 
@@ -159,9 +167,10 @@
             // 
             this.ob_maxacceptqty_label.AutoSize = true;
             this.ob_maxacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(259, 18);
+            this.ob_maxacceptqty_label.Location = new System.Drawing.Point(345, 22);
+            this.ob_maxacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_maxacceptqty_label.Name = "ob_maxacceptqty_label";
-            this.ob_maxacceptqty_label.Size = new System.Drawing.Size(170, 21);
+            this.ob_maxacceptqty_label.Size = new System.Drawing.Size(212, 27);
             this.ob_maxacceptqty_label.TabIndex = 182;
             this.ob_maxacceptqty_label.Text = "最大不合格允许通过数";
             // 
@@ -169,9 +178,10 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(12, 18);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(16, 22);
+            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
             this.ob_aqlcode_label.TabIndex = 184;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -179,9 +189,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(773, 88);
+            this.label1.Location = new System.Drawing.Point(1031, 110);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 186;
             this.label1.Text = "检验方案";
             // 
@@ -189,18 +200,72 @@
             // 
             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(268, 84);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(357, 105);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 188;
             this.pr_detail_label.Text = "产品名称";
             // 
+            // panel1
+            // 
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.ad_qty);
+            this.panel1.Controls.Add(this.ad_qty_label);
+            this.panel1.Controls.Add(this.ob_remark);
+            this.panel1.Controls.Add(this.ob_maxngacceptqty);
+            this.panel1.Controls.Add(this.ob_remark_label);
+            this.panel1.Controls.Add(this.ob_aqlcode);
+            this.panel1.Controls.Add(this.ob_aqlcode_label);
+            this.panel1.Controls.Add(this.ob_maxacceptqty_label);
+            this.panel1.Location = new System.Drawing.Point(33, 162);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(993, 124);
+            this.panel1.TabIndex = 193;
+            // 
+            // ad_qty
+            // 
+            this.ad_qty.Location = new System.Drawing.Point(100, 79);
+            this.ad_qty.Margin = new System.Windows.Forms.Padding(4);
+            this.ad_qty.Name = "ad_qty";
+            this.ad_qty.Size = new System.Drawing.Size(204, 25);
+            this.ad_qty.TabIndex = 194;
+            this.ad_qty.Text = "0";
+            this.ad_qty.TextChanged += new System.EventHandler(this.ad_qty_TextChanged_1);
+            // 
+            // ad_qty_label
+            // 
+            this.ad_qty_label.AutoSize = true;
+            this.ad_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ad_qty_label.Location = new System.Drawing.Point(16, 79);
+            this.ad_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ad_qty_label.Name = "ad_qty_label";
+            this.ad_qty_label.Size = new System.Drawing.Size(72, 27);
+            this.ad_qty_label.TabIndex = 193;
+            this.ad_qty_label.Text = "样本数";
+            // 
+            // ob_remark
+            // 
+            this.ob_remark.AllPower = null;
+            this.ob_remark.BackColor = System.Drawing.Color.White;
+            this.ob_remark.ID = null;
+            this.ob_remark.Location = new System.Drawing.Point(585, 79);
+            this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_remark.Name = "ob_remark";
+            this.ob_remark.Power = null;
+            this.ob_remark.Size = new System.Drawing.Size(224, 25);
+            this.ob_remark.Str = null;
+            this.ob_remark.Str1 = null;
+            this.ob_remark.Str2 = null;
+            this.ob_remark.TabIndex = 173;
+            this.ob_remark.Tag = "NoAuto";
+            // 
             // ob_maxngacceptqty
             // 
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(439, 18);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(585, 22);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(169, 21);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(224, 25);
             this.ob_maxngacceptqty.TabIndex = 192;
             this.ob_maxngacceptqty.Text = "0";
             // 
@@ -211,13 +276,13 @@
             this.ob_aqlcode.Condition = null;
             this.ob_aqlcode.DBTitle = null;
             this.ob_aqlcode.FormName = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(76, 20);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(2);
+            this.ob_aqlcode.Location = new System.Drawing.Point(101, 25);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
             this.ob_aqlcode.SelectField = null;
             this.ob_aqlcode.SetValueField = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(176, 21);
+            this.ob_aqlcode.Size = new System.Drawing.Size(226, 26);
             this.ob_aqlcode.TabIndex = 191;
             this.ob_aqlcode.TableName = null;
             this.ob_aqlcode.Tag = "AL_CODE";
@@ -230,12 +295,12 @@
             this.pr_detail.BackColor = System.Drawing.Color.White;
             this.pr_detail.Enabled = false;
             this.pr_detail.ID = null;
-            this.pr_detail.Location = new System.Drawing.Point(346, 88);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(2);
+            this.pr_detail.Location = new System.Drawing.Point(461, 110);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.ReadOnly = true;
-            this.pr_detail.Size = new System.Drawing.Size(136, 21);
+            this.pr_detail.Size = new System.Drawing.Size(180, 25);
             this.pr_detail.Str = null;
             this.pr_detail.Str1 = null;
             this.pr_detail.Str2 = null;
@@ -249,24 +314,43 @@
             this.ob_projectcode.Condition = null;
             this.ob_projectcode.DBTitle = null;
             this.ob_projectcode.FormName = null;
-            this.ob_projectcode.Location = new System.Drawing.Point(852, 88);
-            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(2);
+            this.ob_projectcode.Location = new System.Drawing.Point(1136, 110);
+            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ob_projectcode.Name = "ob_projectcode";
             this.ob_projectcode.Power = null;
             this.ob_projectcode.SelectField = null;
             this.ob_projectcode.SetValueField = null;
-            this.ob_projectcode.Size = new System.Drawing.Size(159, 21);
+            this.ob_projectcode.Size = new System.Drawing.Size(212, 26);
             this.ob_projectcode.TabIndex = 187;
             this.ob_projectcode.TableName = null;
             this.ob_projectcode.Tag = "pr_code";
             this.ob_projectcode.TextBoxEnable = false;
             // 
+            // ob_status
+            // 
+            this.ob_status.AllPower = null;
+            this.ob_status.BackColor = System.Drawing.Color.White;
+            this.ob_status.Enabled = false;
+            this.ob_status.ID = null;
+            this.ob_status.Location = new System.Drawing.Point(1167, 159);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_status.Name = "ob_status";
+            this.ob_status.Power = null;
+            this.ob_status.Size = new System.Drawing.Size(180, 25);
+            this.ob_status.Str = null;
+            this.ob_status.Str1 = null;
+            this.ob_status.Str2 = null;
+            this.ob_status.TabIndex = 179;
+            this.ob_status.Tag = "NoAuto";
+            this.ob_status.Visible = false;
+            // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(777, 252);
+            this.OperateResult.Location = new System.Drawing.Point(1036, 315);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(233, 318);
+            this.OperateResult.Size = new System.Drawing.Size(309, 396);
             this.OperateResult.TabIndex = 177;
             this.OperateResult.Text = "";
             // 
@@ -278,33 +362,19 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(859, 576);
+            this.Clean.Location = new System.Drawing.Point(1145, 720);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(68, 24);
+            this.Clean.Size = new System.Drawing.Size(91, 30);
             this.Clean.TabIndex = 176;
             this.Clean.Tag = "";
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
             // 
-            // ob_remark
-            // 
-            this.ob_remark.AllPower = null;
-            this.ob_remark.BackColor = System.Drawing.Color.White;
-            this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(439, 63);
-            this.ob_remark.Name = "ob_remark";
-            this.ob_remark.Power = null;
-            this.ob_remark.Size = new System.Drawing.Size(169, 21);
-            this.ob_remark.Str = null;
-            this.ob_remark.Str1 = null;
-            this.ob_remark.Str2 = null;
-            this.ob_remark.TabIndex = 173;
-            this.ob_remark.Tag = "NoAuto";
-            // 
             // GetBatch
             // 
             this.GetBatch.AllPower = "ifall";
@@ -313,12 +383,13 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(777, 51);
+            this.GetBatch.Location = new System.Drawing.Point(1036, 64);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(68, 24);
+            this.GetBatch.Size = new System.Drawing.Size(91, 30);
             this.GetBatch.TabIndex = 171;
             this.GetBatch.Tag = "OQC!Inspection";
             this.GetBatch.Text = "获取批";
@@ -333,12 +404,13 @@
             this.SaveConfiguration.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SaveConfiguration.Image = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.Image")));
             this.SaveConfiguration.IsShowBorder = true;
-            this.SaveConfiguration.Location = new System.Drawing.Point(869, 154);
+            this.SaveConfiguration.Location = new System.Drawing.Point(1159, 192);
+            this.SaveConfiguration.Margin = new System.Windows.Forms.Padding(4);
             this.SaveConfiguration.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.MoveImage")));
             this.SaveConfiguration.Name = "SaveConfiguration";
             this.SaveConfiguration.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.NormalImage")));
             this.SaveConfiguration.Power = "ifWrite";
-            this.SaveConfiguration.Size = new System.Drawing.Size(68, 24);
+            this.SaveConfiguration.Size = new System.Drawing.Size(91, 30);
             this.SaveConfiguration.TabIndex = 170;
             this.SaveConfiguration.Tag = "OQC!Inspection";
             this.SaveConfiguration.Text = "保存配置";
@@ -354,12 +426,13 @@
             this.RefreshConfiguration.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.RefreshConfiguration.Image = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.Image")));
             this.RefreshConfiguration.IsShowBorder = true;
-            this.RefreshConfiguration.Location = new System.Drawing.Point(943, 154);
+            this.RefreshConfiguration.Location = new System.Drawing.Point(1257, 192);
+            this.RefreshConfiguration.Margin = new System.Windows.Forms.Padding(4);
             this.RefreshConfiguration.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.MoveImage")));
             this.RefreshConfiguration.Name = "RefreshConfiguration";
             this.RefreshConfiguration.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.NormalImage")));
             this.RefreshConfiguration.Power = "ifRead";
-            this.RefreshConfiguration.Size = new System.Drawing.Size(68, 24);
+            this.RefreshConfiguration.Size = new System.Drawing.Size(91, 30);
             this.RefreshConfiguration.TabIndex = 169;
             this.RefreshConfiguration.Tag = "OQC!Inspection";
             this.RefreshConfiguration.Text = "刷新配置";
@@ -375,12 +448,13 @@
             this.Save.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(413, 586);
+            this.Save.Location = new System.Drawing.Point(490, 720);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = "ifWrite";
-            this.Save.Size = new System.Drawing.Size(70, 24);
+            this.Save.Size = new System.Drawing.Size(93, 30);
             this.Save.TabIndex = 168;
             this.Save.Tag = "OQC!Inspection";
             this.Save.Text = "保存";
@@ -397,10 +471,11 @@
             this.ci_id,
             this.ci_kind,
             this.oi_sampleqty});
-            this.CheckTypeDGV.Location = new System.Drawing.Point(25, 252);
+            this.CheckTypeDGV.Location = new System.Drawing.Point(33, 315);
+            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowTemplate.Height = 23;
-            this.CheckTypeDGV.Size = new System.Drawing.Size(745, 318);
+            this.CheckTypeDGV.Size = new System.Drawing.Size(993, 398);
             this.CheckTypeDGV.TabIndex = 167;
             // 
             // Choose
@@ -452,10 +527,11 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(101, 88);
+            this.ob_prodcode.Location = new System.Drawing.Point(135, 110);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(136, 21);
+            this.ob_prodcode.Size = new System.Drawing.Size(180, 25);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -468,11 +544,12 @@
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.Enabled = false;
             this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(608, 88);
+            this.ob_batchqty.Location = new System.Drawing.Point(811, 110);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
             this.ob_batchqty.ReadOnly = true;
-            this.ob_batchqty.Size = new System.Drawing.Size(136, 21);
+            this.ob_batchqty.Size = new System.Drawing.Size(180, 25);
             this.ob_batchqty.Str = null;
             this.ob_batchqty.Str1 = null;
             this.ob_batchqty.Str2 = null;
@@ -484,10 +561,11 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(347, 49);
+            this.obd_outboxcode.Location = new System.Drawing.Point(463, 61);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(136, 21);
+            this.obd_outboxcode.Size = new System.Drawing.Size(180, 25);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -500,10 +578,11 @@
             this.ob_checkno.AllPower = null;
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(101, 47);
+            this.ob_checkno.Location = new System.Drawing.Point(135, 59);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
-            this.ob_checkno.Size = new System.Drawing.Size(136, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(180, 25);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -516,10 +595,11 @@
             this.ms_sncode.AllPower = null;
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(608, 51);
+            this.ms_sncode.Location = new System.Drawing.Point(811, 64);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(136, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(180, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -527,63 +607,11 @@
             this.ms_sncode.Tag = "NoAuto";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
             // 
-            // ob_status
-            // 
-            this.ob_status.AllPower = null;
-            this.ob_status.BackColor = System.Drawing.Color.White;
-            this.ob_status.Enabled = false;
-            this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(875, 127);
-            this.ob_status.Name = "ob_status";
-            this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(136, 21);
-            this.ob_status.Str = null;
-            this.ob_status.Str1 = null;
-            this.ob_status.Str2 = null;
-            this.ob_status.TabIndex = 179;
-            this.ob_status.Tag = "NoAuto";
-            this.ob_status.Visible = false;
-            // 
-            // panel1
-            // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.ad_qty);
-            this.panel1.Controls.Add(this.ad_qty_label);
-            this.panel1.Controls.Add(this.ob_remark);
-            this.panel1.Controls.Add(this.ob_maxngacceptqty);
-            this.panel1.Controls.Add(this.ob_remark_label);
-            this.panel1.Controls.Add(this.ob_aqlcode);
-            this.panel1.Controls.Add(this.ob_aqlcode_label);
-            this.panel1.Controls.Add(this.ob_maxacceptqty_label);
-            this.panel1.Location = new System.Drawing.Point(25, 130);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(745, 100);
-            this.panel1.TabIndex = 193;
-            // 
-            // ad_qty_label
-            // 
-            this.ad_qty_label.AutoSize = true;
-            this.ad_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ad_qty_label.Location = new System.Drawing.Point(12, 63);
-            this.ad_qty_label.Name = "ad_qty_label";
-            this.ad_qty_label.Size = new System.Drawing.Size(58, 21);
-            this.ad_qty_label.TabIndex = 193;
-            this.ad_qty_label.Text = "样本数";
-            // 
-            // ad_qty
-            // 
-            this.ad_qty.Location = new System.Drawing.Point(75, 63);
-            this.ad_qty.Name = "ad_qty";
-            this.ad_qty.Size = new System.Drawing.Size(154, 21);
-            this.ad_qty.TabIndex = 194;
-            this.ad_qty.Text = "0";
-            this.ad_qty.TextChanged += new System.EventHandler(this.ad_qty_TextChanged_1);
-            // 
             // OQC_PlanMaintain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1022, 625);
+            this.ClientSize = new System.Drawing.Size(1363, 781);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail_label);
@@ -609,6 +637,7 @@
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.ms_sncode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_PlanMaintain";
             this.Tag = "OQC!PlanMaintain";
             this.Text = "抽样计划维护";
@@ -616,9 +645,9 @@
             this.SizeChanged += new System.EventHandler(this.抽样计划维护_SizeChanged);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -39,7 +39,7 @@
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
+            this.sncode_label = new System.Windows.Forms.Label();
             this.ob_remark_label = new System.Windows.Forms.Label();
             this.obd_makecode_label = new System.Windows.Forms.Label();
             this.ob_prodcode_label = new System.Windows.Forms.Label();
@@ -65,6 +65,13 @@
             this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
+            this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_ng = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_leveldefect = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ois_remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ois_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ois_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ChooseedReject = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
             this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -85,13 +92,6 @@
             this.obd_outboxcode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_makecode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.obd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.oi_ng = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.oi_leveldefect = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ois_remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ois_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ois_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -103,9 +103,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(13, 26);
+            this.ob_checkno_label.Location = new System.Drawing.Point(17, 32);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
             this.ob_checkno_label.TabIndex = 156;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -115,9 +116,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(13, 58);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(17, 72);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.obd_outboxcode_label.TabIndex = 154;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -127,9 +129,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             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(13, 92);
+            this.ms_sncode_label.Location = new System.Drawing.Point(17, 115);
+            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(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
             this.ms_sncode_label.TabIndex = 152;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -139,9 +142,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.bc_code_label.AutoSize = true;
             this.bc_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_code_label.Location = new System.Drawing.Point(807, 171);
+            this.bc_code_label.Location = new System.Drawing.Point(1076, 214);
+            this.bc_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_code_label.Name = "bc_code_label";
-            this.bc_code_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_code_label.Size = new System.Drawing.Size(92, 27);
             this.bc_code_label.TabIndex = 177;
             this.bc_code_label.Text = "不良代码";
             // 
@@ -151,9 +155,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(807, 41);
+            this.label1.Location = new System.Drawing.Point(1076, 51);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.Size = new System.Drawing.Size(72, 27);
             this.label1.TabIndex = 179;
             this.label1.Text = "实批数";
             // 
@@ -163,9 +168,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(807, 139);
+            this.label4.Location = new System.Drawing.Point(1076, 174);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 185;
             this.label4.Text = "不合格数";
             // 
@@ -175,9 +181,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(807, 105);
+            this.label5.Location = new System.Drawing.Point(1076, 131);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(58, 21);
+            this.label5.Size = new System.Drawing.Size(72, 27);
             this.label5.TabIndex = 187;
             this.label5.Text = "合格数";
             // 
@@ -187,9 +194,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(807, 72);
+            this.label6.Location = new System.Drawing.Point(1076, 90);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(58, 21);
+            this.label6.Size = new System.Drawing.Size(72, 27);
             this.label6.TabIndex = 189;
             this.label6.Text = "抽检数";
             // 
@@ -197,23 +205,25 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(466, 174);
+            this.label9.Location = new System.Drawing.Point(621, 218);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(74, 21);
+            this.label9.Size = new System.Drawing.Size(92, 27);
             this.label9.TabIndex = 192;
             this.label9.Text = "待选不良";
             // 
-            // label10
+            // sncode_label
             // 
-            this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.label10.AutoSize = true;
-            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(13, 531);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(58, 21);
-            this.label10.TabIndex = 200;
-            this.label10.Text = "录入框";
+            this.sncode_label.AutoSize = true;
+            this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sncode_label.Location = new System.Drawing.Point(17, 664);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Name = "sncode_label";
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.sncode_label.TabIndex = 200;
+            this.sncode_label.Text = "录入框";
             // 
             // ob_remark_label
             // 
@@ -221,9 +231,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(13, 565);
+            this.ob_remark_label.Location = new System.Drawing.Point(17, 706);
+            this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_remark_label.Name = "ob_remark_label";
-            this.ob_remark_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
             this.ob_remark_label.TabIndex = 202;
             this.ob_remark_label.Text = "备注";
             // 
@@ -233,9 +244,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.obd_makecode_label.AutoSize = true;
             this.obd_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_makecode_label.Location = new System.Drawing.Point(13, 128);
+            this.obd_makecode_label.Location = new System.Drawing.Point(17, 160);
+            this.obd_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_makecode_label.Name = "obd_makecode_label";
-            this.obd_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.obd_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.obd_makecode_label.TabIndex = 206;
             this.obd_makecode_label.Text = "工单号";
             // 
@@ -243,18 +255,20 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(240, 128);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(320, 160);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ob_prodcode_label.TabIndex = 208;
             this.ob_prodcode_label.Text = "产品编号";
             // 
             // ob_status
             // 
             this.ob_status.AutoSize = true;
-            this.ob_status.Location = new System.Drawing.Point(15, 9);
+            this.ob_status.Location = new System.Drawing.Point(20, 11);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_status.Name = "ob_status";
-            this.ob_status.Size = new System.Drawing.Size(0, 12);
+            this.ob_status.Size = new System.Drawing.Size(0, 15);
             this.ob_status.TabIndex = 212;
             this.ob_status.Visible = false;
             // 
@@ -264,9 +278,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(807, 7);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(1076, 9);
+            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
             this.ob_aqlcode_label.TabIndex = 214;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -276,9 +291,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ob_maxngacceptqty_label.AutoSize = true;
             this.ob_maxngacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(641, 7);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(855, 9);
+            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_maxngacceptqty_label.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(138, 21);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(172, 27);
             this.ob_maxngacceptqty_label.TabIndex = 216;
             this.ob_maxngacceptqty_label.Text = "最大不合格通过数";
             // 
@@ -288,9 +304,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ob_projectcode_label.AutoSize = true;
             this.ob_projectcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_projectcode_label.Location = new System.Drawing.Point(641, 72);
+            this.ob_projectcode_label.Location = new System.Drawing.Point(855, 90);
+            this.ob_projectcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_projectcode_label.Name = "ob_projectcode_label";
-            this.ob_projectcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_projectcode_label.Size = new System.Drawing.Size(92, 27);
             this.ob_projectcode_label.TabIndex = 218;
             this.ob_projectcode_label.Text = "检验方案";
             // 
@@ -300,10 +317,11 @@
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.Enabled = false;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(645, 41);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(860, 51);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = null;
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(146, 21);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(193, 25);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -316,10 +334,11 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(908, 7);
+            this.ob_aqlcode.Location = new System.Drawing.Point(1211, 9);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(146, 21);
+            this.ob_aqlcode.Size = new System.Drawing.Size(193, 25);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -332,10 +351,11 @@
             this.ob_projectcode.BackColor = System.Drawing.Color.White;
             this.ob_projectcode.Enabled = false;
             this.ob_projectcode.ID = null;
-            this.ob_projectcode.Location = new System.Drawing.Point(645, 106);
+            this.ob_projectcode.Location = new System.Drawing.Point(860, 132);
+            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_projectcode.Name = "ob_projectcode";
             this.ob_projectcode.Power = null;
-            this.ob_projectcode.Size = new System.Drawing.Size(146, 21);
+            this.ob_projectcode.Size = new System.Drawing.Size(193, 25);
             this.ob_projectcode.Str = null;
             this.ob_projectcode.Str1 = null;
             this.ob_projectcode.Str2 = null;
@@ -350,12 +370,13 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1012, 569);
+            this.Clean.Location = new System.Drawing.Point(1349, 711);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(48, 24);
+            this.Clean.Size = new System.Drawing.Size(64, 30);
             this.Clean.TabIndex = 211;
             this.Clean.Tag = "OQC!Inspection";
             this.Clean.Text = "清除";
@@ -365,9 +386,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(687, 470);
+            this.OperateResult.Location = new System.Drawing.Point(916, 588);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(320, 123);
+            this.OperateResult.Size = new System.Drawing.Size(425, 153);
             this.OperateResult.TabIndex = 210;
             this.OperateResult.Text = "";
             // 
@@ -377,10 +399,11 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(345, 131);
+            this.ob_prodcode.Location = new System.Drawing.Point(460, 164);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(116, 21);
+            this.ob_prodcode.Size = new System.Drawing.Size(153, 25);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -393,10 +416,11 @@
             this.ob_makecode.BackColor = System.Drawing.Color.White;
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
-            this.ob_makecode.Location = new System.Drawing.Point(95, 131);
+            this.ob_makecode.Location = new System.Drawing.Point(127, 164);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(116, 21);
+            this.ob_makecode.Size = new System.Drawing.Size(153, 25);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -411,11 +435,12 @@
             this.or_id,
             this.bc_code1,
             this.bc_name1});
-            this.ChoosedDGV.Location = new System.Drawing.Point(810, 204);
+            this.ChoosedDGV.Location = new System.Drawing.Point(1080, 255);
+            this.ChoosedDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChoosedDGV.Name = "ChoosedDGV";
             this.ChoosedDGV.RowHeadersWidth = 20;
             this.ChoosedDGV.RowTemplate.Height = 23;
-            this.ChoosedDGV.Size = new System.Drawing.Size(244, 257);
+            this.ChoosedDGV.Size = new System.Drawing.Size(325, 321);
             this.ChoosedDGV.TabIndex = 205;
             // 
             // or_id
@@ -449,11 +474,12 @@
             this.Column3,
             this.bg_code,
             this.bg_name});
-            this.WaitChooseDGV.Location = new System.Drawing.Point(472, 204);
+            this.WaitChooseDGV.Location = new System.Drawing.Point(629, 255);
+            this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitChooseDGV.Name = "WaitChooseDGV";
             this.WaitChooseDGV.RowHeadersWidth = 20;
             this.WaitChooseDGV.RowTemplate.Height = 23;
-            this.WaitChooseDGV.Size = new System.Drawing.Size(268, 256);
+            this.WaitChooseDGV.Size = new System.Drawing.Size(357, 320);
             this.WaitChooseDGV.TabIndex = 204;
             this.WaitChooseDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.WaitChooseDGV_CellContentClick);
             this.WaitChooseDGV.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.WaitChooseDGV_CellValueChanged);
@@ -489,10 +515,11 @@
             this.ob_remark.AllPower = null;
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(92, 567);
+            this.ob_remark.Location = new System.Drawing.Point(123, 709);
+            this.ob_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
-            this.ob_remark.Size = new System.Drawing.Size(366, 21);
+            this.ob_remark.Size = new System.Drawing.Size(487, 25);
             this.ob_remark.Str = null;
             this.ob_remark.Str1 = null;
             this.ob_remark.Str2 = null;
@@ -504,10 +531,11 @@
             this.sncode.AllPower = null;
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(92, 534);
+            this.sncode.Location = new System.Drawing.Point(123, 668);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(366, 21);
+            this.sncode.Size = new System.Drawing.Size(487, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -527,23 +555,80 @@
             this.ois_remark,
             this.ois_status,
             this.ois_id});
-            this.CheckTypeDGV.Location = new System.Drawing.Point(16, 168);
+            this.CheckTypeDGV.Location = new System.Drawing.Point(21, 210);
+            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowHeadersWidth = 20;
             this.CheckTypeDGV.RowTemplate.Height = 23;
-            this.CheckTypeDGV.Size = new System.Drawing.Size(442, 325);
+            this.CheckTypeDGV.Size = new System.Drawing.Size(589, 406);
             this.CheckTypeDGV.TabIndex = 198;
             this.CheckTypeDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckTypeDGV_CellContentClick);
             this.CheckTypeDGV.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckTypeDGV_CellValueChanged);
             this.CheckTypeDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.CheckTypeDGV_DataError);
             this.CheckTypeDGV.RowHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.CheckTypeDGV_RowHeaderMouseClick);
             // 
+            // choose
+            // 
+            this.choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.choose.DataPropertyName = "choose";
+            this.choose.HeaderText = "勾选";
+            this.choose.Name = "choose";
+            this.choose.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.choose.Width = 60;
+            // 
+            // oi_itemcode
+            // 
+            this.oi_itemcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.oi_itemcode.DataPropertyName = "oi_checkkind";
+            this.oi_itemcode.HeaderText = "检验类型";
+            this.oi_itemcode.Name = "oi_itemcode";
+            this.oi_itemcode.Width = 78;
+            // 
+            // oi_ng
+            // 
+            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.oi_ng.DataPropertyName = "oi_count";
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle1;
+            this.oi_ng.HeaderText = "样本数量";
+            this.oi_ng.Name = "oi_ng";
+            this.oi_ng.Width = 96;
+            // 
+            // oi_leveldefect
+            // 
+            this.oi_leveldefect.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.oi_leveldefect.DataPropertyName = "oi_checkedcount";
+            this.oi_leveldefect.HeaderText = "已检数量";
+            this.oi_leveldefect.Name = "oi_leveldefect";
+            this.oi_leveldefect.Width = 75;
+            // 
+            // ois_remark
+            // 
+            this.ois_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ois_remark.HeaderText = "";
+            this.ois_remark.Name = "ois_remark";
+            // 
+            // ois_status
+            // 
+            this.ois_status.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ois_status.HeaderText = "";
+            this.ois_status.Name = "ois_status";
+            // 
+            // ois_id
+            // 
+            this.ois_id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ois_id.DataPropertyName = "ois_id";
+            this.ois_id.HeaderText = "";
+            this.ois_id.Name = "ois_id";
+            this.ois_id.Visible = false;
+            // 
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(750, 295);
+            this.ChooseedReject.Location = new System.Drawing.Point(1000, 369);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
             this.ChooseedReject.TabIndex = 195;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -551,9 +636,10 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(750, 354);
+            this.WaitReject.Location = new System.Drawing.Point(1000, 442);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(67, 29);
             this.WaitReject.TabIndex = 194;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -564,10 +650,11 @@
             this.oi_checkqty.BackColor = System.Drawing.Color.White;
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(908, 73);
+            this.oi_checkqty.Location = new System.Drawing.Point(1211, 91);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(147, 21);
+            this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -580,10 +667,11 @@
             this.ob_okqty.BackColor = System.Drawing.Color.White;
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
-            this.ob_okqty.Location = new System.Drawing.Point(908, 106);
+            this.ob_okqty.Location = new System.Drawing.Point(1211, 132);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_okqty.Size = new System.Drawing.Size(195, 25);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -596,10 +684,11 @@
             this.ob_ngqty.BackColor = System.Drawing.Color.White;
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
-            this.ob_ngqty.Location = new System.Drawing.Point(908, 140);
+            this.ob_ngqty.Location = new System.Drawing.Point(1211, 175);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -612,10 +701,11 @@
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.Enabled = false;
             this.ob_batchqty.ID = null;
-            this.ob_batchqty.Location = new System.Drawing.Point(908, 42);
+            this.ob_batchqty.Location = new System.Drawing.Point(1211, 52);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
-            this.ob_batchqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_batchqty.Size = new System.Drawing.Size(195, 25);
             this.ob_batchqty.Str = null;
             this.ob_batchqty.Str1 = null;
             this.ob_batchqty.Str2 = null;
@@ -627,10 +717,11 @@
             this.bccode.AllPower = null;
             this.bccode.BackColor = System.Drawing.Color.White;
             this.bccode.ID = null;
-            this.bccode.Location = new System.Drawing.Point(908, 175);
+            this.bccode.Location = new System.Drawing.Point(1211, 219);
+            this.bccode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.bccode.Name = "bccode";
             this.bccode.Power = null;
-            this.bccode.Size = new System.Drawing.Size(147, 21);
+            this.bccode.Size = new System.Drawing.Size(195, 25);
             this.bccode.Str = null;
             this.bccode.Str1 = null;
             this.bccode.Str2 = null;
@@ -646,12 +737,13 @@
             this.Refresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Refresh.Image = ((System.Drawing.Image)(resources.GetObject("Refresh.Image")));
             this.Refresh.IsShowBorder = true;
-            this.Refresh.Location = new System.Drawing.Point(472, 29);
+            this.Refresh.Location = new System.Drawing.Point(629, 36);
+            this.Refresh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Refresh.MoveImage = ((System.Drawing.Image)(resources.GetObject("Refresh.MoveImage")));
             this.Refresh.Name = "Refresh";
             this.Refresh.NormalImage = ((System.Drawing.Image)(resources.GetObject("Refresh.NormalImage")));
             this.Refresh.Power = "ifRead";
-            this.Refresh.Size = new System.Drawing.Size(60, 24);
+            this.Refresh.Size = new System.Drawing.Size(80, 30);
             this.Refresh.TabIndex = 176;
             this.Refresh.Tag = "IFREAD";
             this.Refresh.Text = "刷新";
@@ -666,12 +758,13 @@
             this.GetBatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(472, 94);
+            this.GetBatch.Location = new System.Drawing.Point(629, 118);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifRead";
-            this.GetBatch.Size = new System.Drawing.Size(60, 24);
+            this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 175;
             this.GetBatch.Tag = "IFREAD";
             this.GetBatch.Text = "获取批";
@@ -686,12 +779,13 @@
             this.BatchPass.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(557, 95);
+            this.BatchPass.Location = new System.Drawing.Point(743, 119);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "ifWrite";
-            this.BatchPass.Size = new System.Drawing.Size(60, 24);
+            this.BatchPass.Size = new System.Drawing.Size(80, 30);
             this.BatchPass.TabIndex = 174;
             this.BatchPass.Tag = "OQC!Inspection";
             this.BatchPass.Text = "批判过";
@@ -706,12 +800,13 @@
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Cancel.Image = ((System.Drawing.Image)(resources.GetObject("Cancel.Image")));
             this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(557, 567);
+            this.Cancel.Location = new System.Drawing.Point(743, 709);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
             this.Cancel.Name = "Cancel";
             this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
             this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(60, 24);
+            this.Cancel.Size = new System.Drawing.Size(80, 30);
             this.Cancel.TabIndex = 173;
             this.Cancel.Tag = "OQC!Inspection";
             this.Cancel.Text = "取消";
@@ -726,12 +821,13 @@
             this.Confirm.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(472, 567);
+            this.Confirm.Location = new System.Drawing.Point(629, 709);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = "ifWrite";
-            this.Confirm.Size = new System.Drawing.Size(60, 24);
+            this.Confirm.Size = new System.Drawing.Size(80, 30);
             this.Confirm.TabIndex = 172;
             this.Confirm.Tag = "ifWrite";
             this.Confirm.Text = "确认";
@@ -743,10 +839,11 @@
             this.ob_checkno.AllPower = "ifall";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(95, 29);
+            this.ob_checkno.Location = new System.Drawing.Point(127, 36);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "ifread";
-            this.ob_checkno.Size = new System.Drawing.Size(366, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(487, 25);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -759,10 +856,11 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(95, 61);
+            this.obd_outboxcode.Location = new System.Drawing.Point(127, 76);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(366, 21);
+            this.obd_outboxcode.Size = new System.Drawing.Size(487, 25);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -774,10 +872,11 @@
             this.ms_sncode.AllPower = "ifall";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(95, 95);
+            this.ms_sncode.Location = new System.Drawing.Point(127, 119);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "ifread";
-            this.ms_sncode.Size = new System.Drawing.Size(366, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(487, 25);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -820,66 +919,11 @@
             this.obd_id.Name = "obd_id";
             this.obd_id.Visible = false;
             // 
-            // choose
-            // 
-            this.choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.choose.DataPropertyName = "choose";
-            this.choose.HeaderText = "勾选";
-            this.choose.Name = "choose";
-            this.choose.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.choose.Width = 60;
-            // 
-            // oi_itemcode
-            // 
-            this.oi_itemcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.oi_itemcode.DataPropertyName = "oi_checkkind";
-            this.oi_itemcode.HeaderText = "检验类型";
-            this.oi_itemcode.Name = "oi_itemcode";
-            this.oi_itemcode.Width = 78;
-            // 
-            // oi_ng
-            // 
-            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.oi_ng.DataPropertyName = "oi_count";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle1;
-            this.oi_ng.HeaderText = "样本数量";
-            this.oi_ng.Name = "oi_ng";
-            this.oi_ng.Width = 78;
-            // 
-            // oi_leveldefect
-            // 
-            this.oi_leveldefect.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.oi_leveldefect.DataPropertyName = "oi_checkedcount";
-            this.oi_leveldefect.HeaderText = "已检数量";
-            this.oi_leveldefect.Name = "oi_leveldefect";
-            this.oi_leveldefect.Width = 78;
-            // 
-            // ois_remark
-            // 
-            this.ois_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ois_remark.HeaderText = "";
-            this.ois_remark.Name = "ois_remark";
-            // 
-            // ois_status
-            // 
-            this.ois_status.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ois_status.HeaderText = "";
-            this.ois_status.Name = "ois_status";
-            // 
-            // ois_id
-            // 
-            this.ois_id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ois_id.DataPropertyName = "ois_id";
-            this.ois_id.HeaderText = "";
-            this.ois_id.Name = "ois_id";
-            this.ois_id.Visible = false;
-            // 
             // OQC_SamplingDataCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1065, 610);
+            this.ClientSize = new System.Drawing.Size(1420, 762);
             this.Controls.Add(this.ob_projectcode_label);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_maxngacceptqty_label);
@@ -898,7 +942,7 @@
             this.Controls.Add(this.ob_remark);
             this.Controls.Add(this.ob_remark_label);
             this.Controls.Add(this.sncode);
-            this.Controls.Add(this.label10);
+            this.Controls.Add(this.sncode_label);
             this.Controls.Add(this.CheckTypeDGV);
             this.Controls.Add(this.ChooseedReject);
             this.Controls.Add(this.WaitReject);
@@ -925,6 +969,7 @@
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.ms_sncode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "OQC_SamplingDataCollection";
             this.Tag = "OQC!SamplingDataCollection";
             this.Text = " ";
@@ -966,7 +1011,7 @@
         private System.Windows.Forms.Label label9;
         private CustomControl.DataGrid_View.DataGridViewExpand CheckTypeDGV;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
-        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label sncode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
         private CustomControl.DataGrid_View.DataGridViewExpand WaitChooseDGV;

UAS-MES/Login.cs

@@ -5,6 +5,8 @@ using UAS_MES.DataOperate;
 using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 using System.Security.Cryptography.X509Certificates;
+using System.Net;
+using System.Net.Sockets;
 
 namespace UAS_MES
 {
@@ -60,12 +62,7 @@ namespace UAS_MES
                 PassWord.Select();
             else
                 UserName.Select();
-            //本来static是不要实例化的，但是需要调用触发添加键值对的构造函数
-            if (lgc == null)
-                lgc = new LogicHandler();
             BaseUtil.SetFormCenter(this);
-            //try { CertImport(); }
-            //catch (Exception) { }
         }
 
         //点击登陆按钮的时候
@@ -82,7 +79,6 @@ namespace UAS_MES
                     SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;
                     SystemInf.ScreenHeight = Screen.PrimaryScreen.WorkingArea.Height;
                     SystemInf.ConnectionString = "Data Source=" + DbComboxData.Rows[i]["ma_address"] + ";User ID=" + DbComboxData.Rows[i]["ma_user"] + ";PassWord=" + DbComboxData.Rows[i]["ms_pwd"];
-                    Console.WriteLine(SystemInf.ConnectionString);
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //重新执行一遍构造函数使得重置之后的链接字符串生效
                     dh = new DataHelper();
@@ -98,7 +94,24 @@ namespace UAS_MES
                 {
                     this.Hide();
                     SetInf();//设置User的全局变量
-                    LogManager.DoLog("登陆成功" + User.UserName +"  "+User.UserAccountType);
+
+                    try
+                    {
+                        IPHostEntry IpEntry = Dns.GetHostEntry(Dns.GetHostName());
+                        string IPAddress = "";
+                        for (int i = 0; i < IpEntry.AddressList.Length; i++)
+                        {
+                            if (IpEntry.AddressList[i].AddressFamily == AddressFamily.InterNetwork)
+                                IPAddress = IpEntry.AddressList[i].ToString();
+                        }
+                        string version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                        LogicHandler.RecordLogInfo(User.UserCode, User.UserName, version, "CS", IPAddress);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.DoLog(ex.Message);
+                    }
+                    LogManager.DoLog("登陆成功" + User.UserName + "  " + User.UserAccountType);
                     Main dialog = new Main();
                     dialog.ShowDialog();
                     this.Close();

UAS-MES/PublicMethod/LogicHandler.cs

@@ -367,6 +367,14 @@ namespace UAS_MES.PublicMethod
             }
         }
 
+        /// <summary>
+        /// 记录登陆信息
+        /// </summary>
+        public static void RecordLogInfo(string iUserCode,string iUserName,string iVersion,string iType,string iIP)
+        {
+            dh.ExecuteSql("insert into LogInfo(id,sip,usname,indate,uscode,versioncode,terminaltype) values (LogInfo_seq.nextval,'"+iIP+"','"+iUserName+"',sysdate,'"+iUserCode+"','"+ iVersion + "','"+iType+"')", "insert");
+        }
+
         /// <summary>
         /// 验证用户身份信息和岗位资源
         /// </summary>
@@ -996,7 +1004,8 @@ namespace UAS_MES.PublicMethod
                 InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);
                 return true;
             }
-            else {
+            else
+            {
                 return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, out oErrorMessage);
             }
         }

UAS-MES/UAS-MES.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
     <SccProjectName>
     </SccProjectName>
@@ -22,9 +22,9 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <PublishUrl>ftp://192.168.253.9/MESSetting/</PublishUrl>
+    <PublishUrl>F:\MESRelease\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
+    <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
@@ -32,7 +32,6 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://218.17.158.219:8888/</InstallUrl>
     <UpdateUrl>http://218.17.158.219:8888/publish.htm/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
@@ -41,7 +40,8 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>256</ApplicationRevision>
+    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
+    <ApplicationRevision>263</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -70,7 +70,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>01BF432DDD776482A81ACE90FD6AEDAE068A5216</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>0702B5BD480611CA32663309A8FD3717B722E307</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestKeyFile>