工位修改，模块测试功能添加

UAS_MES_JC/CustomControl/HeadBar/HeadBar.cs

@@ -81,7 +81,7 @@ namespace UAS_MES_NEW.CustomControl
 
         private void HeadBar_Load(object sender, EventArgs e)
         {
-            TitleLabel.Text = Title1;
+            TitleLabel.Text = Title1 + "       当前工位【" + User.CurrentStepCode+"】";
             if (!NeedConfirm.Contains(this.FindForm().Name))
             {
                 LoginOut.Visible = false;

UAS_MES_JC/FunctionCode/Make/Make_RePrintLabel.Designer.cs

@@ -354,9 +354,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_MES_JC/FunctionCode/Make/Make_RePrintLabel.cs

@@ -58,6 +58,24 @@ namespace UAS_MES_NEW.Make
             stw.ShowDialog();
             inputText.Focus();
             dh = SystemInf.dh;
+
+            if (fuselagel.Checked)
+                type = "机身标";
+            else if (giftBox.Checked)
+                type = "SN标签";
+            else
+                type = "卡通箱标";
+
+            getlabel = "select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where  la_templatetype='" + type + "' and la_statuscode='AUDITED' order by la_isdefault";
+
+            listA = (DataTable)dh.ExecuteSql(getlabel, "select");
+            if (listA.Rows.Count == 0)
+            {
+                OperateResult.AppendText("<<产品:" + pr_code.Text + "未维护" + type + "模板\n", Color.Red);
+            }
+            PrintLabel.DataSource = listA;
+            PrintLabel.DisplayMember = "la_url";
+            PrintLabel.ValueMember = "la_id";
         }
 
         private void InPrint()
@@ -194,10 +212,10 @@ namespace UAS_MES_NEW.Make
 
         private void PrintLabel_TextChanged(object sender, EventArgs e)
         {
-            if (pr_code.Text == "")
-            {
-                return;
-            }
+            //if (pr_code.Text == "")
+            //{
+            //    return;
+            //}
             if (fuselagel.Checked)
                 type = "机身标";
             else if (giftBox.Checked)
@@ -205,7 +223,7 @@ namespace UAS_MES_NEW.Make
             else
                 type = "卡通箱标";
 
-            getlabel = "select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='" + type + "' and la_statuscode='AUDITED' order by la_isdefault";
+            getlabel = "select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where  la_templatetype='" + type + "' and la_statuscode='AUDITED' order by la_isdefault";
 
             listA = (DataTable)dh.ExecuteSql(getlabel, "select");
             if (listA.Rows.Count == 0)

UAS_MES_JC/FunctionCode/Make/Make_SingleBoard.cs

@@ -102,29 +102,34 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select sp_fsoncode from make left join stepbom on ma_bomversion=sb_bomversion " +
-                    "left join stepproduct on sp_sbid=sb_id where ma_code='"+ma_code.Text+"'","select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select ma_prodcode,sp_fsoncode,pr_oldcode from make left join stepbom on ma_bomversion=sb_bomversion " +
+                    "left join stepproduct on sp_sbid=sb_id left join product on pr_code=ma_prodcode  where ma_code='" + ma_code.Text + "'", "select");
                 bool checksn = false;
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    if (SN.Text.Contains(dt.Rows[i]["sp_fsoncode"].ToString())) {
+                    string sp_fsoncode = dt.Rows[i]["sp_fsoncode"].ToString();
+                    string pr_oldcode = dt.Rows[i]["pr_oldcode"].ToString();
+                    string ma_prodcode = dt.Rows[i]["ma_prodcode"].ToString();
+                    if (SN.Text.Contains(dt.Rows[i]["ma_prodcode"].ToString()) || (pr_oldcode != "" && SN.Text.Contains(dt.Rows[i]["pr_oldcode"].ToString())))
+                    {
                         checksn = true;
                     }
                 }
                 if (!User.CurrentStepCode.Contains("单板上料"))
                 {
-                    OperateResult.AppendText(">>单板上料界面，请登录【单板上料】资源\n", Color.Red);
+                    OperateResult.AppendText(">>单板上料界面，请登录【单板上料】资源\n", Color.Red, SN);
                     return;
                 }
-                if (!checksn) {
-                    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
+                if (!checksn)
+                {
+                    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red, SN);
                     return;
                 }
                 if (User.CurrentStepCode == "单板上料")
                 {
                     if (dh.CheckExist("singleboard", "sb_sncode='" + SN.Text + "'"))
                     {
-                        OperateResult.AppendText(">>" + SN.Text + "已执行单板上料\n", Color.Red);
+                        OperateResult.AppendText(">>" + SN.Text + "已执行单板上料\n", Color.Red, SN);
                         return;
                     }
                     else
@@ -191,7 +196,7 @@ namespace UAS_MES_NEW.Make
                     }
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserName, ma_code.Text, User.UserLineCode, User.UserSourceCode, User.CurrentStepCode, User.CurrentStepCode + "结果为良品", SN.Text, "");
                 }
-                OperateResult.AppendText("序列号" + SN.Text + User.CurrentStepCode + "采集成功\n", System.Drawing.Color.Green);
+                OperateResult.AppendText("序列号" + SN.Text + User.CurrentStepCode + "采集成功\n", System.Drawing.Color.Green, SN);
             }
         }
 
@@ -278,7 +283,7 @@ namespace UAS_MES_NEW.Make
                 {
                     if (OK.Checked)
                     {
-                        OperateResult.AppendText(">>" + SN.Text + "已执行单板测试\n", Color.Red);
+                        OperateResult.AppendText(">>" + SN.Text + "已执行单板测试\n", Color.Red, SN);
                         return;
                     }
                 }
@@ -295,7 +300,7 @@ namespace UAS_MES_NEW.Make
                 string sb_status = dt.Rows[0]["sb_status"].ToString();
                 if (sb_status == "3")
                 {
-                    OperateResult.AppendText(">>" + SN.Text + "已经采集不良，不允许重复采集\n", Color.Red);
+                    OperateResult.AppendText(">>" + SN.Text + "已经采集不良，不允许重复采集\n", Color.Red, SN);
                     return;
                 }
             }
@@ -342,7 +347,7 @@ namespace UAS_MES_NEW.Make
                 }
                 dh.ExecuteSql("update singleboard set sb_status=3,SB_BADTIMS=nvl(SB_BADTIMS,0)+1,sb_nextstepcode='',sb_stepcode='" + User.CurrentStepCode + "' where sb_sncode='" + SN.Text + "'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserName, ma_code.Text, User.UserLineCode, User.UserSourceCode, User.CurrentStepCode, User.CurrentStepCode + "结果不良品", SN.Text, "");
-                OperateResult.AppendText("序列号" + SN.Text + "采集不良成功\n", System.Drawing.Color.Green);
+                OperateResult.AppendText("序列号" + SN.Text + "采集不良成功\n", System.Drawing.Color.Green, SN);
             }
         }
     }

UAS_MES_JC/FunctionCode/Make/Make_SingleBoard1.cs

@@ -103,26 +103,29 @@ namespace UAS_MES_NEW.Make
             if (e.KeyCode == Keys.Enter)
             {
                 DataTable dt = (DataTable)dh.ExecuteSql("select sp_fsoncode from make left join stepbom on ma_bomversion=sb_bomversion " +
-                    "left join stepproduct on sp_sbid=sb_id where ma_code='"+ma_code.Text+"'","select");
+                  "left join stepproduct on sp_sbid=sb_id where ma_code='" + ma_code.Text + "'", "select");
                 bool checksn = false;
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    if (SN.Text.Contains(dt.Rows[i]["sp_fsoncode"].ToString())) {
+                    if (SN.Text.Contains(dt.Rows[i]["sp_fsoncode"].ToString()))
+                    {
                         checksn = true;
                     }
                 }
                 if (!User.CurrentStepCode.Contains("单板测试"))
                 {
-                    OperateResult.AppendText(">>单板采集界面，请登录【单板测试】资源\n", Color.Red);
-                    return;
-                }
-                if (!checksn) {
-                    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
+                    OperateResult.AppendText(">>单板测试界面，请登录【单板测试】资源\n", Color.Red);
                     return;
                 }
+                //if (!checksn)
+                //{
+                //    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
+                //    return;
+                //}
                 if (User.CurrentStepCode == "单板测试")
                 {
-                     dt = (DataTable)dh.ExecuteSql("select SB_NEXTSTEPCODE,sb_status from singleboard where sb_sncode='" + SN.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select SB_NEXTSTEPCODE,sb_status from singleboard where " +
+                        "sb_sncode='" + SN.Text + "'", "select");
                     if (dt.Rows.Count > 0)
                     {
                         string SB_NEXTSTEPCODE = dt.Rows[0]["SB_NEXTSTEPCODE"].ToString();
@@ -132,15 +135,26 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText(">>" + SN.Text + "测试不良不允许采集，请先进行维修\n", Color.Red);
                             return;
                         }
+                        if (sb_status == "2")
+                        {
+                            OperateResult.AppendText(">>" + SN.Text + "已完工\n", Color.Red);
+                            return;
+                        }
                         if (SB_NEXTSTEPCODE == User.CurrentStepCode)
                         {
                             dh.ExecuteSql("update singleboard set sb_nextstepcode='刷三防漆' where sb_sncode='" + SN.Text + "'", "update"); ;
                         }
-                        else {
-                            OperateResult.AppendText(">>" + SN.Text + "当前所属工序"+ SB_NEXTSTEPCODE + ",当前资源不允许采集\n", Color.Red);
+                        else
+                        {
+                            OperateResult.AppendText(">>" + SN.Text + "当前所属工序" + SB_NEXTSTEPCODE + ",当前资源不允许采集\n", Color.Red);
                             return;
                         }
                     }
+                    else
+                    {
+                        dh.ExecuteSql("insert into singleboard(SB_ID, SB_MAKECODE, SB_SNCODE, SB_INDATE, SB_NEXTSTEPCODE, SB_BADTIMS, SB_STATUS,sb_stepcode)" +
+                              "values(singleboard_seq.nextval,'" + ma_code.Text + "','" + SN.Text + "',sysdate,'刷三防漆',0,'1','单板测试')", "insert");
+                    }
                 }
                 if (OK.Checked)
                 {
@@ -182,7 +196,7 @@ namespace UAS_MES_NEW.Make
                     }
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserName, ma_code.Text, User.UserLineCode, User.UserSourceCode, User.CurrentStepCode, User.CurrentStepCode + "结果为良品", SN.Text, "");
                 }
-                OperateResult.AppendText("序列号" + SN.Text + User.CurrentStepCode + "采集成功\n", System.Drawing.Color.Green);
+                OperateResult.AppendText("序列号" + SN.Text + User.CurrentStepCode + "采集成功\n", System.Drawing.Color.Green, SN);
             }
         }
 

UAS_MES_JC/FunctionCode/Make/Make_SingleBoard2.cs

@@ -117,11 +117,11 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(">>单板采集界面，请登录【刷三防漆】资源\n", Color.Red);
                     return;
                 }
-                if (!checksn)
-                {
-                    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
-                    return;
-                }
+                //if (!checksn)
+                //{
+                //    OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
+                //    return;
+                //}
                 //if (User.CurrentStepCode == "单板测试")
                 //{
                 //    if (dh.CheckExist("singleboard", "sb_sncode='" + SN.Text + "'"))

UAS_MES_JC/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -102,9 +102,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(287, 181);
+            this.bc_remark_label.Location = new System.Drawing.Point(574, 362);
+            this.bc_remark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             // 
@@ -112,9 +113,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(214, 498);
+            this.ms_sncode_label.Location = new System.Drawing.Point(428, 996);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -122,9 +124,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(3, 181);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(6, 362);
+            this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             // 
@@ -133,9 +136,10 @@
             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.Blue;
-            this.label2.Location = new System.Drawing.Point(3, 151);
+            this.label2.Location = new System.Drawing.Point(6, 302);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 22);
+            this.label2.Size = new System.Drawing.Size(146, 42);
             this.label2.TabIndex = 0;
             this.label2.Text = "采集信息";
             // 
@@ -143,9 +147,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(3, 221);
+            this.label3.Location = new System.Drawing.Point(6, 442);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             // 
@@ -154,9 +159,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(6, 495);
+            this.GoodProduct.Location = new System.Drawing.Point(12, 990);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.GoodProduct.Name = "GoodProduct";
-            this.GoodProduct.Size = new System.Drawing.Size(68, 29);
+            this.GoodProduct.Size = new System.Drawing.Size(129, 54);
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
@@ -168,9 +174,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(88, 495);
+            this.Reject.Location = new System.Drawing.Point(176, 990);
+            this.Reject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Reject.Name = "Reject";
-            this.Reject.Size = new System.Drawing.Size(87, 29);
+            this.Reject.Size = new System.Drawing.Size(167, 54);
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
@@ -187,9 +194,11 @@
             this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WaitRejectList.FullRowSelect = true;
-            this.WaitRejectList.Location = new System.Drawing.Point(4, 282);
+            this.WaitRejectList.HideSelection = false;
+            this.WaitRejectList.Location = new System.Drawing.Point(8, 564);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(266, 206);
+            this.WaitRejectList.Size = new System.Drawing.Size(528, 408);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
@@ -227,9 +236,10 @@
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label4.ForeColor = System.Drawing.Color.Black;
-            this.label4.Location = new System.Drawing.Point(3, 257);
+            this.label4.Location = new System.Drawing.Point(6, 514);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 22);
+            this.label4.Size = new System.Drawing.Size(146, 42);
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             // 
@@ -238,9 +248,10 @@
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label5.ForeColor = System.Drawing.Color.Black;
-            this.label5.Location = new System.Drawing.Point(366, 257);
+            this.label5.Location = new System.Drawing.Point(732, 514);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(74, 22);
+            this.label5.Size = new System.Drawing.Size(146, 42);
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             // 
@@ -248,9 +259,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(641, 151);
+            this.label6.Location = new System.Drawing.Point(1282, 302);
+            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 22);
+            this.label6.Size = new System.Drawing.Size(146, 42);
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             // 
@@ -264,9 +276,11 @@
             this.columnHeader8,
             this.columnHeader10});
             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(368, 282);
+            this.ChoosedRejectList.HideSelection = false;
+            this.ChoosedRejectList.Location = new System.Drawing.Point(736, 564);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(266, 206);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(528, 408);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -302,10 +316,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(720, 151);
-            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.AutoBadCode.Location = new System.Drawing.Point(1440, 302);
+            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.AutoBadCode.Name = "AutoBadCode";
-            this.AutoBadCode.Size = new System.Drawing.Size(123, 21);
+            this.AutoBadCode.Size = new System.Drawing.Size(238, 35);
             this.AutoBadCode.TabIndex = 69;
             this.AutoBadCode.Text = "自动产生不良代码";
             this.AutoBadCode.UseVisualStyleBackColor = true;
@@ -315,9 +329,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(287, 14);
+            this.ma_qty_label.Location = new System.Drawing.Point(574, 28);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ma_qty_label.TabIndex = 11;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -325,9 +340,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(3, 64);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(6, 128);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ma_prodcode_label.TabIndex = 7;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -335,9 +351,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(3, 13);
+            this.ms_makecode_label.Location = new System.Drawing.Point(6, 26);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ms_makecode_label.TabIndex = 2;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -345,9 +362,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(157, 12);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(314, 24);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.mcd_inqty_label.TabIndex = 14;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -355,9 +373,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(16, 12);
+            this.mc_restqty_label.Location = new System.Drawing.Point(32, 24);
+            this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.mc_restqty_label.TabIndex = 17;
             this.mc_restqty_label.Text = "待采集数";
             // 
@@ -376,10 +395,10 @@
             this.panel1.Controls.Add(this.mc_restqty_label);
             this.panel1.Controls.Add(this.mcd_inqty);
             this.panel1.Controls.Add(this.mcd_inqty_label);
-            this.panel1.Location = new System.Drawing.Point(537, 14);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel1.Location = new System.Drawing.Point(1074, 28);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(315, 127);
+            this.panel1.Size = new System.Drawing.Size(628, 252);
             this.panel1.TabIndex = 71;
             // 
             // ob_sendqty
@@ -388,10 +407,11 @@
             this.ob_sendqty.CutLength = null;
             this.ob_sendqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_sendqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_sendqty.Location = new System.Drawing.Point(109, 91);
-            this.ob_sendqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_sendqty.Location = new System.Drawing.Point(218, 182);
+            this.ob_sendqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_sendqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_sendqty.Name = "ob_sendqty";
-            this.ob_sendqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_sendqty.Size = new System.Drawing.Size(0, 41);
             this.ob_sendqty.TabIndex = 78;
             this.ob_sendqty.Tag = "ob_batchqty";
             // 
@@ -400,9 +420,10 @@
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label7.ForeColor = System.Drawing.Color.Black;
-            this.label7.Location = new System.Drawing.Point(16, 91);
+            this.label7.Location = new System.Drawing.Point(32, 182);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(74, 21);
+            this.label7.Size = new System.Drawing.Size(146, 41);
             this.label7.TabIndex = 77;
             this.label7.Text = "已送检数";
             // 
@@ -411,9 +432,10 @@
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_checkno.ForeColor = System.Drawing.Color.Black;
-            this.ob_checkno.Location = new System.Drawing.Point(285, 90);
+            this.ob_checkno.Location = new System.Drawing.Point(570, 180);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 41);
             this.ob_checkno.TabIndex = 76;
             this.ob_checkno.Tag = "ob_checkno";
             this.ob_checkno.Visible = false;
@@ -427,13 +449,13 @@
             this.SendCheck.Enabled = false;
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(229, 90);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.SendCheck.Location = new System.Drawing.Point(458, 180);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
             this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
             this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(65, 26);
+            this.SendCheck.Size = new System.Drawing.Size(130, 52);
             this.SendCheck.TabIndex = 72;
             this.SendCheck.Text = "送检";
             this.SendCheck.UseVisualStyleBackColor = false;
@@ -445,10 +467,11 @@
             this.ob_batchqty.CutLength = null;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_batchqty.Location = new System.Drawing.Point(109, 51);
-            this.ob_batchqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_batchqty.Location = new System.Drawing.Point(218, 102);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_batchqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
             this.ob_batchqty.TabIndex = 75;
             this.ob_batchqty.Tag = "ob_batchqty";
             // 
@@ -457,9 +480,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.ForeColor = System.Drawing.Color.Black;
-            this.ob_batchqty_label.Location = new System.Drawing.Point(16, 51);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(32, 102);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
             this.ob_batchqty_label.TabIndex = 74;
             this.ob_batchqty_label.Text = "抽检批数";
             // 
@@ -469,10 +493,11 @@
             this.ob_nowcheckqty.CutLength = null;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(248, 51);
-            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(496, 102);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
             this.ob_nowcheckqty.TabIndex = 73;
             this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
             // 
@@ -481,9 +506,10 @@
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ob_nowcheckqty_label.ForeColor = System.Drawing.Color.Black;
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(157, 51);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(314, 102);
+            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
             this.ob_nowcheckqty_label.TabIndex = 72;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
@@ -492,10 +518,11 @@
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.CutLength = null;
             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(109, 12);
-            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(218, 24);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(300, 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, 41);
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -504,10 +531,11 @@
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.CutLength = null;
             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(248, 12);
-            this.mcd_inqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_inqty.Location = new System.Drawing.Point(496, 24);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(300, 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, 41);
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
@@ -515,9 +543,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(287, 64);
+            this.pr_detail_label.Location = new System.Drawing.Point(574, 128);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.pr_detail_label.TabIndex = 6;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -525,9 +554,10 @@
             // 
             this.ma_softversion_label.AutoSize = true;
             this.ma_softversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_softversion_label.Location = new System.Drawing.Point(3, 112);
+            this.ma_softversion_label.Location = new System.Drawing.Point(6, 224);
+            this.ma_softversion_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_softversion_label.Name = "ma_softversion_label";
-            this.ma_softversion_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_softversion_label.Size = new System.Drawing.Size(146, 41);
             this.ma_softversion_label.TabIndex = 72;
             this.ma_softversion_label.Text = "软件版本";
             // 
@@ -537,10 +567,10 @@
             this.NoteForChange.Checked = true;
             this.NoteForChange.CheckState = System.Windows.Forms.CheckState.Checked;
             this.NoteForChange.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NoteForChange.Location = new System.Drawing.Point(290, 112);
-            this.NoteForChange.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.NoteForChange.Location = new System.Drawing.Point(580, 224);
+            this.NoteForChange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NoteForChange.Name = "NoteForChange";
-            this.NoteForChange.Size = new System.Drawing.Size(99, 21);
+            this.NoteForChange.Size = new System.Drawing.Size(190, 35);
             this.NoteForChange.TabIndex = 75;
             this.NoteForChange.Text = "切换工单提示";
             this.NoteForChange.UseVisualStyleBackColor = true;
@@ -550,9 +580,10 @@
             this.Lock_label.AutoSize = true;
             this.Lock_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Lock_label.ForeColor = System.Drawing.Color.Red;
-            this.Lock_label.Location = new System.Drawing.Point(569, 500);
+            this.Lock_label.Location = new System.Drawing.Point(1138, 1000);
+            this.Lock_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Lock_label.Name = "Lock_label";
-            this.Lock_label.Size = new System.Drawing.Size(126, 21);
+            this.Lock_label.Size = new System.Drawing.Size(250, 41);
             this.Lock_label.TabIndex = 77;
             this.Lock_label.Text = "Ctrl+Q解除锁定";
             this.Lock_label.Visible = false;
@@ -560,18 +591,20 @@
             // ma_salecode
             // 
             this.ma_salecode.AutoSize = true;
-            this.ma_salecode.Location = new System.Drawing.Point(477, 151);
+            this.ma_salecode.Location = new System.Drawing.Point(954, 302);
+            this.ma_salecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 12);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 24);
             this.ma_salecode.TabIndex = 78;
             this.ma_salecode.Visible = false;
             // 
             // pr_sendchecktype
             // 
             this.pr_sendchecktype.AutoSize = true;
-            this.pr_sendchecktype.Location = new System.Drawing.Point(477, 155);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(954, 310);
+            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 12);
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 24);
             this.pr_sendchecktype.TabIndex = 79;
             this.pr_sendchecktype.Visible = false;
             // 
@@ -579,11 +612,11 @@
             // 
             this.Filter.BackColor = System.Drawing.Color.Transparent;
             this.Filter.Font = new System.Drawing.Font("宋体", 10.8F);
-            this.Filter.Location = new System.Drawing.Point(93, 257);
-            this.Filter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Filter.Location = new System.Drawing.Point(186, 514);
+            this.Filter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Filter.Name = "Filter";
             this.Filter.PlaceHolder = "不良名称搜索";
-            this.Filter.Size = new System.Drawing.Size(176, 22);
+            this.Filter.Size = new System.Drawing.Size(352, 44);
             this.Filter.TabIndex = 76;
             this.Filter.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnTextChange(this.Filter_UserControlTextChanged);
             // 
@@ -592,10 +625,11 @@
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.CutLength = null;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_softversion.Location = new System.Drawing.Point(94, 112);
-            this.ma_softversion.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_softversion.Location = new System.Drawing.Point(188, 224);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_softversion.MaximumSize = new System.Drawing.Size(300, 0);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 21);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 41);
             this.ma_softversion.TabIndex = 73;
             // 
             // Save
@@ -605,13 +639,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(477, 497);
-            this.Save.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Save.Location = new System.Drawing.Point(954, 994);
+            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 = null;
-            this.Save.Size = new System.Drawing.Size(65, 26);
+            this.Save.Size = new System.Drawing.Size(130, 52);
             this.Save.TabIndex = 70;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -623,10 +657,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(94, 221);
+            this.bc_code.Location = new System.Drawing.Point(188, 442);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
-            this.bc_code.Size = new System.Drawing.Size(176, 24);
+            this.bc_code.Size = new System.Drawing.Size(348, 40);
             this.bc_code.Str = null;
             this.bc_code.Str1 = null;
             this.bc_code.Str2 = null;
@@ -640,13 +675,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(93, 13);
+            this.ma_code.Location = new System.Drawing.Point(186, 26);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(115, 21);
+            this.ma_code.Size = new System.Drawing.Size(230, 42);
             this.ma_code.TabIndex = 67;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -658,10 +694,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(224, 15);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.LockMakeCode.Location = new System.Drawing.Point(448, 30);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(51, 21);
+            this.LockMakeCode.Size = new System.Drawing.Size(94, 35);
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -671,10 +707,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = "qweqwe";
             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(380, 64);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_detail.Location = new System.Drawing.Point(760, 128);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 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, 41);
             this.pr_detail.TabIndex = 56;
             // 
             // ma_qty
@@ -682,10 +719,11 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             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(379, 14);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_qty.Location = new System.Drawing.Point(758, 28);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(300, 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, 41);
             this.ma_qty.TabIndex = 55;
             // 
             // ma_prodcode
@@ -693,19 +731,21 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             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(94, 64);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(188, 128);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(300, 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, 41);
             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(644, 181);
+            this.OperateResult.Location = new System.Drawing.Point(1288, 362);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(207, 307);
+            this.OperateResult.Size = new System.Drawing.Size(410, 610);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -716,12 +756,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(718, 497);
+            this.CleanInfo.Location = new System.Drawing.Point(1436, 994);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(122, 48);
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -730,9 +771,10 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(292, 347);
+            this.ChooseedReject.Location = new System.Drawing.Point(584, 694);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(100, 46);
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -740,9 +782,10 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(292, 410);
+            this.WaitReject.Location = new System.Drawing.Point(584, 820);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(100, 46);
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -752,11 +795,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(370, 182);
+            this.bc_remark.Location = new System.Drawing.Point(740, 364);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(264, 62);
+            this.bc_remark.Size = new System.Drawing.Size(524, 120);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
@@ -766,9 +810,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(94, 182);
+            this.bc_groupcode.Location = new System.Drawing.Point(188, 364);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.Size = new System.Drawing.Size(176, 22);
+            this.bc_groupcode.Size = new System.Drawing.Size(348, 37);
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -778,10 +823,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(280, 498);
+            this.ms_sncode.Location = new System.Drawing.Point(569, 990);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(358, 40);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -792,20 +838,20 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(291, 146);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7);
+            this.StepCount.Location = new System.Drawing.Point(582, 292);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(8, 14, 8, 14);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(64, 22);
+            this.StepCount.Size = new System.Drawing.Size(128, 44);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 194;
             // 
             // Make_TestCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(862, 535);
+            this.ClientSize = new System.Drawing.Size(1724, 1070);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.ma_salecode);
@@ -848,6 +894,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(6, 6, 6, 6);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";

UAS_MES_JC/FunctionCode/Make/Make_TestCollection.cs

@@ -178,6 +178,26 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
+                if (User.CurrentStepCode == "单板上料")
+                {
+                    dt = (DataTable)dh.ExecuteSql("select ma_prodcode,sp_fsoncode,pr_oldcode from make left join stepbom on ma_bomversion=sb_bomversion " +
+                                    "left join stepproduct on sp_sbid=sb_id left join product on pr_code=ma_prodcode  where ma_code='" + ma_code.Text + "'", "select");
+                    bool checksn = false;
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        string sp_fsoncode = dt.Rows[i]["sp_fsoncode"].ToString();
+                        string pr_oldcode = dt.Rows[i]["pr_oldcode"].ToString();
+                        string ma_prodcode = dt.Rows[i]["ma_prodcode"].ToString();
+                        if (ms_sncode.Text.Contains(dt.Rows[i]["ma_prodcode"].ToString()) || (pr_oldcode != "" && ms_sncode.Text.Contains(dt.Rows[i]["pr_oldcode"].ToString())))
+                        {
+                            checksn = true;
+                        }
+                    }
+                    if (!checksn)
+                    {
+                        OperateResult.AppendText(">>" + ms_sncode.Text + "不对应工单料号,请检查条码内容\n", Color.Red);
+                    }
+                }
                 ChoosedRejectList.Items.Clear();
                 WaitList.Clear();
                 ChoosedList.Clear();
@@ -193,7 +213,7 @@ namespace UAS_MES_NEW.Make
                     if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
                         //是否提示过工单切换框，检测前后执行
-                        if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text,oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
+                        if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
                         {
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                             return;
@@ -271,7 +291,7 @@ namespace UAS_MES_NEW.Make
             sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
             sql.Append("from product left join productkind on pk_name=pr_kind ");
             sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
-            sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
+            sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and bg_code='"+User.DefaultBadGroup+"' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";
@@ -516,19 +536,19 @@ namespace UAS_MES_NEW.Make
                     }
                 }
                 //如果之前是良品的
-                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno","ms_outboxcode" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
+                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno", "ms_outboxcode" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
                 if (dt.Rows.Count > 0)
                 {
                     string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
                     if (ms_outboxcode != "")
                     {
-                        OperateResult.AppendText(">>SN已装箱"+ms_outboxcode+",采集不良请先解除装箱\n",Color.Red);
+                        OperateResult.AppendText(">>SN已装箱" + ms_outboxcode + ",采集不良请先解除装箱\n", Color.Red);
                         return;
                     }
                     string status = dt.Rows[0]["ms_status"].ToString();
                     if (status == "1" || status == "2")
                     {
-                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss'),sp_linecode = '"+User.UserLineCode+"',sp_sccode = '"+User.UserSourceCode+"'", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
+                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss'),sp_linecode = '" + User.UserLineCode + "',sp_sccode = '" + User.UserSourceCode + "'", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);
@@ -539,7 +559,8 @@ namespace UAS_MES_NEW.Make
                     if (checkno != "")
                         dh.UpdateByCondition("makeserial", "ms_checkno=''", "ms_id='" + oMSID + "'");
                 }
-                else {
+                else
+                {
                     LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "采集成不良", "测试不良", User.UserCode);
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集成不良", "测试不良", ms_sncode.Text, ob_checkno.Text);
                 }

UAS_MES_JC/FunctionCode/Make/Make_TestCollection.resx

@@ -259,7 +259,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS_MES_JC/FunctionCode/Make/Make_TestCollection_DCW.Designer.cs → UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.Designer.cs

@@ -1,6 +1,6 @@
 namespace UAS_MES_NEW.Make
 {
-    partial class Make_TestCollection_DCW
+    partial class Make_TestCollectionModule
     {
         /// <summary>
         /// Required designer variable.
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_TestCollection_DCW));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_TestCollectionModule));
             this.bc_remark_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
             this.bc_groupcode_label = new System.Windows.Forms.Label();
@@ -59,6 +59,14 @@
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.mc_restqty_label = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.ob_sendqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.label7 = new System.Windows.Forms.Label();
+            this.ob_checkno = new System.Windows.Forms.Label();
+            this.SendCheck = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ob_batchqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.ob_batchqty_label = new System.Windows.Forms.Label();
+            this.ob_nowcheckqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.ob_nowcheckqty_label = new System.Windows.Forms.Label();
             this.mcd_remainqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.mcd_inqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail_label = new System.Windows.Forms.Label();
@@ -69,14 +77,13 @@
             this.Lock_label = new System.Windows.Forms.Label();
             this.ma_salecode = new System.Windows.Forms.Label();
             this.pr_sendchecktype = new System.Windows.Forms.Label();
-            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.Filter = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder();
             this.ma_softversion = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.Save = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.bc_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.pr_spec = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.pr_detail = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ma_prodcode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
@@ -86,13 +93,12 @@
             this.bc_remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.BaudRate_label = new System.Windows.Forms.Label();
-            this.BaudRate = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.SerialPortComBox_label = new System.Windows.Forms.Label();
-            this.StartTest = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.ComList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.SerialPortCombox();
+            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.passqty = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.passqty)).BeginInit();
             this.SuspendLayout();
             // 
             // bc_remark_label
@@ -191,6 +197,7 @@
             this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WaitRejectList.FullRowSelect = true;
+            this.WaitRejectList.HideSelection = false;
             this.WaitRejectList.Location = new System.Drawing.Point(8, 564);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(6);
             this.WaitRejectList.Name = "WaitRejectList";
@@ -272,6 +279,7 @@
             this.columnHeader8,
             this.columnHeader10});
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ChoosedRejectList.HideSelection = false;
             this.ChoosedRejectList.Location = new System.Drawing.Point(736, 564);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(6);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
@@ -378,6 +386,14 @@
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.ob_sendqty);
+            this.panel1.Controls.Add(this.label7);
+            this.panel1.Controls.Add(this.ob_checkno);
+            this.panel1.Controls.Add(this.SendCheck);
+            this.panel1.Controls.Add(this.ob_batchqty);
+            this.panel1.Controls.Add(this.ob_batchqty_label);
+            this.panel1.Controls.Add(this.ob_nowcheckqty);
+            this.panel1.Controls.Add(this.ob_nowcheckqty_label);
             this.panel1.Controls.Add(this.mcd_remainqty);
             this.panel1.Controls.Add(this.mc_restqty_label);
             this.panel1.Controls.Add(this.mcd_inqty);
@@ -385,9 +401,121 @@
             this.panel1.Location = new System.Drawing.Point(1074, 28);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(628, 89);
+            this.panel1.Size = new System.Drawing.Size(628, 252);
             this.panel1.TabIndex = 71;
             // 
+            // ob_sendqty
+            // 
+            this.ob_sendqty.AutoSize = true;
+            this.ob_sendqty.CutLength = null;
+            this.ob_sendqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_sendqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_sendqty.Location = new System.Drawing.Point(218, 182);
+            this.ob_sendqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_sendqty.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ob_sendqty.Name = "ob_sendqty";
+            this.ob_sendqty.Size = new System.Drawing.Size(0, 41);
+            this.ob_sendqty.TabIndex = 78;
+            this.ob_sendqty.Tag = "ob_batchqty";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.ForeColor = System.Drawing.Color.Black;
+            this.label7.Location = new System.Drawing.Point(32, 182);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(146, 41);
+            this.label7.TabIndex = 77;
+            this.label7.Text = "已送检数";
+            // 
+            // ob_checkno
+            // 
+            this.ob_checkno.AutoSize = true;
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_checkno.ForeColor = System.Drawing.Color.Black;
+            this.ob_checkno.Location = new System.Drawing.Point(570, 180);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_checkno.Name = "ob_checkno";
+            this.ob_checkno.Size = new System.Drawing.Size(0, 41);
+            this.ob_checkno.TabIndex = 76;
+            this.ob_checkno.Tag = "ob_checkno";
+            this.ob_checkno.Visible = false;
+            this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
+            // 
+            // SendCheck
+            // 
+            this.SendCheck.AllPower = null;
+            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
+            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
+            this.SendCheck.Enabled = false;
+            this.SendCheck.Image = null;
+            this.SendCheck.IsShowBorder = true;
+            this.SendCheck.Location = new System.Drawing.Point(458, 180);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
+            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
+            this.SendCheck.Name = "SendCheck";
+            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
+            this.SendCheck.Power = null;
+            this.SendCheck.Size = new System.Drawing.Size(130, 52);
+            this.SendCheck.TabIndex = 72;
+            this.SendCheck.Text = "送检";
+            this.SendCheck.UseVisualStyleBackColor = false;
+            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
+            // 
+            // ob_batchqty
+            // 
+            this.ob_batchqty.AutoSize = true;
+            this.ob_batchqty.CutLength = null;
+            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_batchqty.Location = new System.Drawing.Point(218, 102);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_batchqty.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ob_batchqty.Name = "ob_batchqty";
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
+            this.ob_batchqty.TabIndex = 75;
+            this.ob_batchqty.Tag = "ob_batchqty";
+            // 
+            // ob_batchqty_label
+            // 
+            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.ForeColor = System.Drawing.Color.Black;
+            this.ob_batchqty_label.Location = new System.Drawing.Point(32, 102);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_batchqty_label.Name = "ob_batchqty_label";
+            this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
+            this.ob_batchqty_label.TabIndex = 74;
+            this.ob_batchqty_label.Text = "抽检批数";
+            // 
+            // ob_nowcheckqty
+            // 
+            this.ob_nowcheckqty.AutoSize = true;
+            this.ob_nowcheckqty.CutLength = null;
+            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(496, 102);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
+            this.ob_nowcheckqty.TabIndex = 73;
+            this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
+            // 
+            // ob_nowcheckqty_label
+            // 
+            this.ob_nowcheckqty_label.AutoSize = true;
+            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_nowcheckqty_label.ForeColor = System.Drawing.Color.Black;
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(314, 102);
+            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
+            this.ob_nowcheckqty_label.TabIndex = 72;
+            this.ob_nowcheckqty_label.Text = "当前批数";
+            // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
@@ -423,7 +551,7 @@
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 6;
-            this.pr_detail_label.Text = "产品规格";
+            this.pr_detail_label.Text = "产品名称";
             // 
             // ma_softversion_label
             // 
@@ -455,7 +583,7 @@
             this.Lock_label.AutoSize = true;
             this.Lock_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Lock_label.ForeColor = System.Drawing.Color.Red;
-            this.Lock_label.Location = new System.Drawing.Point(1138, 1000);
+            this.Lock_label.Location = new System.Drawing.Point(990, 302);
             this.Lock_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Lock_label.Name = "Lock_label";
             this.Lock_label.Size = new System.Drawing.Size(250, 41);
@@ -483,17 +611,6 @@
             this.pr_sendchecktype.TabIndex = 79;
             this.pr_sendchecktype.Visible = false;
             // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(582, 292);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(8, 14, 8, 14);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(128, 44);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 194;
-            // 
             // Filter
             // 
             this.Filter.BackColor = System.Drawing.Color.Transparent;
@@ -525,7 +642,7 @@
             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(954, 994);
+            this.Save.Location = new System.Drawing.Point(958, 983);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -588,24 +705,24 @@
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
-            // pr_spec
+            // pr_detail
             // 
-            this.pr_spec.AutoSize = true;
-            this.pr_spec.CutLength = "qweqwe";
-            this.pr_spec.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_spec.Location = new System.Drawing.Point(748, 128);
-            this.pr_spec.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_spec.MaximumSize = new System.Drawing.Size(360, 0);
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(0, 41);
-            this.pr_spec.TabIndex = 56;
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.CutLength = "qweqwe";
+            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(760, 128);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
+            this.pr_detail.TabIndex = 56;
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             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(746, 28);
+            this.ma_qty.Location = new System.Drawing.Point(758, 28);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_qty.MaximumSize = new System.Drawing.Size(300, 0);
             this.ma_qty.Name = "ma_qty";
@@ -709,7 +826,7 @@
             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(560, 996);
+            this.ms_sncode.Location = new System.Drawing.Point(569, 990);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(6);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
@@ -721,90 +838,48 @@
             this.ms_sncode.Tag = "IfRead";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
-            // BaudRate_label
-            // 
-            this.BaudRate_label.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.BaudRate_label.AutoSize = true;
-            this.BaudRate_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate_label.Location = new System.Drawing.Point(1179, 196);
-            this.BaudRate_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.BaudRate_label.Name = "BaudRate_label";
-            this.BaudRate_label.Size = new System.Drawing.Size(114, 41);
-            this.BaudRate_label.TabIndex = 199;
-            this.BaudRate_label.Text = "波特率";
-            // 
-            // BaudRate
-            // 
-            this.BaudRate.AllPower = null;
-            this.BaudRate.BackColor = System.Drawing.Color.White;
-            this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(1324, 205);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4);
-            this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Negative = false;
-            this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(276, 35);
-            this.BaudRate.Str = null;
-            this.BaudRate.Str1 = null;
-            this.BaudRate.Str2 = null;
-            this.BaudRate.TabIndex = 198;
-            this.BaudRate.Text = "115200";
-            // 
-            // SerialPortComBox_label
-            // 
-            this.SerialPortComBox_label.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.SerialPortComBox_label.AutoSize = true;
-            this.SerialPortComBox_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SerialPortComBox_label.Location = new System.Drawing.Point(1150, 142);
-            this.SerialPortComBox_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.SerialPortComBox_label.Name = "SerialPortComBox_label";
-            this.SerialPortComBox_label.Size = new System.Drawing.Size(153, 41);
-            this.SerialPortComBox_label.TabIndex = 197;
-            this.SerialPortComBox_label.Text = "Com端口";
-            // 
-            // StartTest
-            // 
-            this.StartTest.AllPower = null;
-            this.StartTest.BackColor = System.Drawing.Color.Transparent;
-            this.StartTest.DownImage = ((System.Drawing.Image)(resources.GetObject("StartTest.DownImage")));
-            this.StartTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StartTest.Image = ((System.Drawing.Image)(resources.GetObject("StartTest.Image")));
-            this.StartTest.IsShowBorder = true;
-            this.StartTest.Location = new System.Drawing.Point(1401, 252);
-            this.StartTest.Margin = new System.Windows.Forms.Padding(4);
-            this.StartTest.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartTest.MoveImage")));
-            this.StartTest.Name = "StartTest";
-            this.StartTest.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartTest.NormalImage")));
-            this.StartTest.Power = null;
-            this.StartTest.Size = new System.Drawing.Size(134, 46);
-            this.StartTest.TabIndex = 196;
-            this.StartTest.Text = "开始调试";
-            this.StartTest.UseVisualStyleBackColor = true;
-            this.StartTest.Click += new System.EventHandler(this.StartTest_Click);
-            // 
-            // ComList
-            // 
-            this.ComList.Location = new System.Drawing.Point(1324, 143);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4);
-            this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(280, 40);
-            this.ComList.TabIndex = 195;
-            // 
-            // Make_TestCollection_DCW
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(582, 292);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(8, 14, 8, 14);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(128, 44);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 194;
+            // 
+            // passqty
+            // 
+            this.passqty.Location = new System.Drawing.Point(1262, 995);
+            this.passqty.Name = "passqty";
+            this.passqty.Size = new System.Drawing.Size(120, 35);
+            this.passqty.TabIndex = 195;
+            this.passqty.Value = new decimal(new int[] {
+            2,
+            0,
+            0,
+            0});
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(1107, 989);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(146, 41);
+            this.label1.TabIndex = 196;
+            this.label1.Text = "过站数量";
+            // 
+            // Make_TestCollectionModule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1724, 1070);
-            this.Controls.Add(this.BaudRate_label);
-            this.Controls.Add(this.BaudRate);
-            this.Controls.Add(this.SerialPortComBox_label);
-            this.Controls.Add(this.StartTest);
-            this.Controls.Add(this.ComList);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.passqty);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.ma_salecode);
@@ -820,7 +895,7 @@
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.label2);
-            this.Controls.Add(this.pr_spec);
+            this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_qty);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.OperateResult);
@@ -848,7 +923,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
             this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Make_TestCollection_DCW";
+            this.Name = "Make_TestCollectionModule";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_TestCollection_FormClosing);
@@ -858,6 +933,7 @@
             this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.passqty)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();
 
@@ -895,7 +971,7 @@
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private CustomControl.ValueLabel.ValueLabel mcd_inqty;
         private CustomControl.ValueLabel.ValueLabel ma_qty;
-        private CustomControl.ValueLabel.ValueLabel pr_spec;
+        private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
@@ -905,9 +981,17 @@
         private System.Windows.Forms.ColumnHeader columnHeader4;
         private CustomControl.ButtonUtil.NormalButton Save;
         private System.Windows.Forms.Panel panel1;
+        private CustomControl.ValueLabel.ValueLabel ob_batchqty;
+        private System.Windows.Forms.Label ob_batchqty_label;
+        private CustomControl.ValueLabel.ValueLabel ob_nowcheckqty;
+        private System.Windows.Forms.Label ob_nowcheckqty_label;
+        private CustomControl.ButtonUtil.NormalButton SendCheck;
+        private System.Windows.Forms.Label ob_checkno;
         private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader8;
+        private CustomControl.ValueLabel.ValueLabel ob_sendqty;
+        private System.Windows.Forms.Label label7;
         private CustomControl.ValueLabel.ValueLabel ma_softversion;
         private System.Windows.Forms.Label ma_softversion_label;
         private System.Windows.Forms.ColumnHeader columnHeader9;
@@ -920,10 +1004,7 @@
         private System.Windows.Forms.Label ma_salecode;
         private System.Windows.Forms.Label pr_sendchecktype;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
-        private System.Windows.Forms.Label BaudRate_label;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox BaudRate;
-        private System.Windows.Forms.Label SerialPortComBox_label;
-        private CustomControl.ButtonUtil.NormalButton StartTest;
-        private CustomControl.ComBoxWithFocus.SerialPortCombox ComList;
+        private System.Windows.Forms.NumericUpDown passqty;
+        private System.Windows.Forms.Label label1;
     }
 }

UAS_MES_JC/FunctionCode/Make/Make_TestCollection_DCW.cs → UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.cs

@@ -9,12 +9,10 @@ using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
 using System.Collections.Generic;
 using UAS_MES_NEW.CustomControl.PowerControlForm;
-using System.IO.Ports;
-using System.IO;
 
 namespace UAS_MES_NEW.Make
 {
-    public partial class Make_TestCollection_DCW : Form
+    public partial class Make_TestCollectionModule : Form
     {
         DataHelper dh = null;
         DataTable dt = null;
@@ -48,15 +46,11 @@ namespace UAS_MES_NEW.Make
 
         bool LockSn = false;
 
-        SerialPort serialPort1 = new SerialPort();
-
-        bool ReadData = true;
-
-        Thread thread;
-
         DataTable Dbfind;
 
-        public Make_TestCollection_DCW()
+        List<string> passsnlist = new List<string>();
+
+        public Make_TestCollectionModule()
         {
             InitializeComponent();
         }
@@ -74,9 +68,9 @@ namespace UAS_MES_NEW.Make
 
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_spec # 产品规格,ma_softversion # 软件版本,ma_salecode # 销售单号,pr_sendchecktype # 产品送检方式";
+            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称,ma_softversion # 软件版本,ma_salecode # 销售单号,pr_sendchecktype # 产品送检方式";
             ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_spec", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
+            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_softversion", "ma_salecode", "nvl(pr_sendchecktype,'LineCode')pr_sendchecktype" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
             dh = SystemInf.dh;
@@ -99,6 +93,7 @@ namespace UAS_MES_NEW.Make
             BaseUtil.SetFormValue(this.Controls, Dbfind);
             LoadBadGroupData();
             LoadCollectedNum();
+            LoadCheckQTY();
         }
 
         /// <summary>
@@ -185,70 +180,94 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                ChoosedRejectList.Items.Clear();
-                WaitList.Clear();
-                ChoosedList.Clear();
-                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
+                if (passsnlist.ToArray().Length != passqty.Value)
                 {
-                    bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
-                    if (!NoteAlready)
-                    {
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                        return;
-                    }
-                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    passsnlist.Add(ms_sncode.Text);
+                }
+                if (passsnlist.ToArray().Length == passqty.Value)
+                {
+                    string[] arr = passsnlist.ToArray();
+                    for (int i = 0; i < arr.Length; i++)
                     {
-                        //是否提示过工单切换框，检测前后执行
-                        if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
-                        {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                            return;
-                        }
-                        if (ma_code.Text != oMakeCode && oMakeCode != null)
+                        ms_sncode.Text = arr[i];
+                        ChoosedRejectList.Items.Clear();
+                        WaitList.Clear();
+                        ChoosedList.Clear();
+                        if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                         {
-                            dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,ma_salecode,pr_spec,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
-                            if (dt.Rows.Count > 0)
+                            //是否提示过工单切换框，检测前执行
+                            bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
+                            if (!NoteAlready)
                             {
-                                BaseUtil.SetFormValue(this.Controls, dt);
-                                LockMakeCode.Checked = true;
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                                return;
                             }
-                        }
-                        dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
-                        string status = dt.Rows[0]["ms_status"].ToString();
-                        reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
-                        string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                        string ifrepair = dt.Rows[0]["st_ifrepair"].ToString();
-                        string sncode = dt.Rows[0]["ms_sncode"].ToString();
-                        if (sncode != ms_sncode.Text)
-                        {
-                            OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过转号,不允许使用TSN采集\n", Color.Red, ms_sncode);
-                            return;
-                        }
-                        ifrework = dt.Rows[0]["ms_ifrework"].ToString();
-                        if (GoodProduct.Checked)
-                        {
-                            if (ifrework != "0")
+                            if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                             {
-                                if (stepcode == User.CurrentStepCode && (reworkstatus == "1" || reworkstatus == "2") && ifrepair == "0")
+                                //是否提示过工单切换框，检测前后执行
+                                if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
                                 {
-                                    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
+                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                                     return;
                                 }
-                            }
-                            else
-                            {
-                                if (stepcode == User.CurrentStepCode && (status == "1" || status == "2") && ifrepair == "0")
+                                if (ma_code.Text != oMakeCode && oMakeCode != null)
                                 {
-                                    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
+                                    dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,ma_salecode,pr_detail,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                                    if (dt.Rows.Count > 0)
+                                    {
+                                        BaseUtil.SetFormValue(this.Controls, dt);
+                                        LockMakeCode.Checked = true;
+                                    }
+                                }
+                                //if (dh.CheckExist("makeserial LEFT JOIN craft ON ms_craftcode = cr_code and ms_prodcode = cr_prodcode LEFT JOIN craftdetail ON cr_id = cd_crid LEFT JOIN STEP ON  CD_NEXTSTEPCODE = ST_CODE ", "ms_id = '"+ oMSID + "' AND CD_STEPCODE = '" + User.CurrentStepCode + "'  AND ST_IFOQC = -1 "))
+                                //{
+                                //    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号即将送检,此序列号经过维修，提示\n", Color.Purple);
+                                //}
+                                string mscode = dh.getFieldDataByCondition("makeserial LEFT JOIN craft ON ms_craftcode = cr_code and ms_prodcode = cr_prodcode LEFT JOIN craftdetail ON cr_id = cd_crid LEFT JOIN STEP ON  CD_NEXTSTEPCODE = ST_CODE", "ms_code", "ms_id = '" + oMSID + "' AND CD_STEPCODE = '" + User.CurrentStepCode + "'  AND ST_IFOQC = -1").ToString();
+                                if (mscode != "" && (dh.CheckExist("makeserial", "ms_id = '" + oMSID + "' and NVL(MS_BADTIMES,0)>0 ") || dh.CheckExist("makeserial", "ms_sncode = '" + mscode + "' and NVL(MS_BADTIMES,0)>0 ")))
+                                {
+                                    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号即将送检,此序列号经过维修，提示\n", Color.Purple);
+                                }
+
+                                dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
+                                string status = dt.Rows[0]["ms_status"].ToString();
+                                reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
+                                string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
+                                string ifrepair = dt.Rows[0]["st_ifrepair"].ToString();
+                                string sncode = dt.Rows[0]["ms_sncode"].ToString();
+                                if (sncode != ms_sncode.Text)
+                                {
+                                    OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过转号,不允许使用TSN采集\n", Color.Red, ms_sncode);
                                     return;
                                 }
+                                ifrework = dt.Rows[0]["ms_ifrework"].ToString();
+                                if (GoodProduct.Checked)
+                                {
+                                    if (ifrework != "0")
+                                    {
+                                        if (stepcode == User.CurrentStepCode && (reworkstatus == "1" || reworkstatus == "2") && ifrepair == "0")
+                                        {
+                                            OperateResult.AppendText(">>" + ms_sncode.Text + "序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
+                                            return;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if (stepcode == User.CurrentStepCode && (status == "1" || status == "2") && ifrepair == "0")
+                                        {
+                                            OperateResult.AppendText(">>" + ms_sncode.Text + "序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red, ms_sncode);
+                                            return;
+                                        }
+                                    }
+                                }
+                                SetCollectResult();
+                                passsnlist.Clear();
                             }
+                            else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                         }
-                        SetCollectResult();
+                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
-                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                 }
-                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
             }
         }
 
@@ -267,7 +286,7 @@ namespace UAS_MES_NEW.Make
             sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
             sql.Append("from product left join productkind on pk_name=pr_kind ");
             sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
-            sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
+            sql.Append("on pb_badgroup=bg_code where bg_statuscode='AUDITED' and bg_code='" + User.DefaultBadGroup + "' order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";
@@ -376,7 +395,7 @@ namespace UAS_MES_NEW.Make
                             LastSncode = ms_sncode.Text;
                             OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
                             //记录操作日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
@@ -393,7 +412,7 @@ namespace UAS_MES_NEW.Make
                             LastSncode = ms_sncode.Text;
                             OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为良品\n", Color.Green, ms_sncode);
                             //记录操作日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", LastSncode, ob_checkno.Text);
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
@@ -405,6 +424,7 @@ namespace UAS_MES_NEW.Make
             }
             //加载页面信息
             LoadCollectedNum();
+            LoadCheckQTY();
         }
 
         private void 测试采集_SizeChanged(object sender, EventArgs e)
@@ -443,12 +463,22 @@ namespace UAS_MES_NEW.Make
                     }
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,pr_spec,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
                         if (dt.Rows.Count > 0)
                         {
                             BaseUtil.SetFormValue(this.Controls, dt);
                             LockMakeCode.Checked = true;
                         }
+                        dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno", "ms_outboxcode" }, "ms_id='" + oMSID + "' ");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
+                            if (ms_outboxcode != "")
+                            {
+                                OperateResult.AppendText(">>SN已装箱" + ms_outboxcode + ",采集不良请先解除装箱\n", Color.Red);
+                                return;
+                            }
+                        }
                     }
                     else
                     {
@@ -501,17 +531,23 @@ namespace UAS_MES_NEW.Make
                     }
                 }
                 //如果之前是良品的
-                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
+                dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno", "ms_outboxcode" }, "ms_id='" + oMSID + "' and ms_stepcode='" + User.CurrentStepCode + "'");
                 if (dt.Rows.Count > 0)
                 {
+                    string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
+                    if (ms_outboxcode != "")
+                    {
+                        OperateResult.AppendText(">>SN已装箱" + ms_outboxcode + ",采集不良请先解除装箱\n", Color.Red);
+                        return;
+                    }
                     string status = dt.Rows[0]["ms_status"].ToString();
                     if (status == "1" || status == "2")
                     {
-                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
+                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss'),sp_linecode = '" + User.UserLineCode + "',sp_sccode = '" + User.UserSourceCode + "'", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);
-                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "测试不良", "良品采集成不良", ms_sncode.Text, "");
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "测试不良", "良品采集成不良", ms_sncode.Text, ob_checkno.Text);
                     }
                     string checkno = dt.Rows[0]["ms_checkno"].ToString();
                     //存在抽检批次更新为空
@@ -521,7 +557,7 @@ namespace UAS_MES_NEW.Make
                 else
                 {
                     LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "采集成不良", "测试不良", User.UserCode);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集成不良", "测试不良", ms_sncode.Text, "");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "采集成不良", "测试不良", ms_sncode.Text, ob_checkno.Text);
                 }
                 //不良信息采集,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");
@@ -549,7 +585,7 @@ namespace UAS_MES_NEW.Make
                         {
                             dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and mb_stepcode='" + User.CurrentStepCode + "'");
                             dh.UpdateByCondition("makeserial", "ms_stepcode='',ms_status=1,ms_nextstepcode='" + User.CurrentStepCode + "'", "ms_id='" + oMSID + "'");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修成功", "快速维修", "", "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修成功", "快速维修", "", ob_checkno.Text);
                             OperateResult.AppendText(">>本次采集不良代码" + badname + "存在于本工序" + User.CurrentStepCode + "中，请解除故障后重新测试本站\n", Color.Black);
                         }
                         else OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
@@ -600,7 +636,66 @@ namespace UAS_MES_NEW.Make
             }
         }
 
-
+        private void LoadCheckQTY()
+        {
+            sql.Clear();
+            string condition = "";
+            int nowcheckqty = int.Parse(ob_nowcheckqty.Text == "" ? "0" : ob_nowcheckqty.Text);
+            int batchqty = int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text);
+            if (nowcheckqty + 1 == batchqty && AutoCut)
+            {
+                condition = "and ob_status='UNCHECK' and ob_checkno='" + ob_checkno.Text + "'";
+            }
+            else
+            {
+                condition = "and ob_status='ENTERING' ";
+            }
+            if (pr_sendchecktype.Text == "SaleCode")
+            {
+                condition += " and ob_salecode='" + ma_salecode.Text + "'";
+            }
+            else if (pr_sendchecktype.Text == "MakeCode")
+            {
+                condition += " and ob_makecode='" + ma_code.Text + "'";
+            }
+            sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
+            sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + ma_prodcode.Text + "' and ");
+            sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                ob_sendqty.Text = dh.getFieldDataByCondition("oqcbatch", "sum(ob_nowcheckqty)", "ob_makecode='" + ma_code.Text + "' and  ob_status<>'ENTERING'").ToString();
+                ob_batchqty.Text = dt.Rows[0]["ob_batchqty"].ToString();
+                ob_nowcheckqty.Text = dt.Rows[0]["ob_nowcheckqty"].ToString();
+                ob_checkno.Text = dt.Rows[0]["ob_checkno"].ToString();
+                nowcheckqty = int.Parse(ob_nowcheckqty.Text == "" ? "0" : ob_nowcheckqty.Text);
+                batchqty = int.Parse(ob_batchqty.Text == "" ? "0" : ob_batchqty.Text);
+                if (nowcheckqty == batchqty)
+                {
+                    ob_nowcheckqty.ForeColor = Color.Red;
+                    OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
+                    if (AutoCut)
+                    {
+                        OperateResult.AppendText(">>批次" + ob_checkno.Text + "自动断批\n", Color.Green);
+                    }
+                }
+            }
+            else
+            {
+                ob_batchqty.Text = "";
+                ob_nowcheckqty.Text = "";
+                ob_checkno.Text = "";
+                SendCheck.Enabled = false;
+            }
+            if (ob_batchqty.Text != "")
+            {
+                SendCheck.Enabled = true;
+            }
+            else
+            {
+                SendCheck.Enabled = false;
+            }
+        }
 
         private void GoodProduct_CheckedChanged(object sender, EventArgs e)
         {
@@ -624,6 +719,36 @@ namespace UAS_MES_NEW.Make
             }
         }
 
+        private void SendCheck_Click(object sender, EventArgs e)
+        {
+            sql.Clear();
+            sql.Append("update oqcbatch set ob_status='UNCHECK',ob_breakingdate=sysdate where ob_checkno ='" + ob_checkno.Text + "'");
+            dh.ExecuteSql(sql.GetString(), "select");
+            ob_sendqty.Text = dh.getFieldDataByCondition("oqcbatch", "sum(ob_nowcheckqty)", "ob_makecode='" + ma_code.Text + "' and  ob_status<>'ENTERING'").ToString();
+            ob_nowcheckqty.Text = "";
+            ob_batchqty.Text = "";
+            ob_nowcheckqty.ForeColor = Color.Black;
+            SendCheck.Enabled = false;
+            OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
+            ms_sncode.Focus();
+            LogicHandler.InsertMakeProcess(LastSncode, ma_code.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+            //记录操作日志
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
+            ob_checkno.Text = "";
+        }
+
+        private void ob_checkno_TextChanged(object sender, EventArgs e)
+        {
+            if (ob_checkno.Text != "")
+            {
+                string Cut = dh.getFieldDataByCondition("product left join oqcbatch on ob_prodcode=pr_code", "pr_ifautocutcheckno", "ob_checkno='" + ob_checkno.Text + "'").ToString();
+                if (Cut == "" || Cut == "0")
+                    AutoCut = false;
+                else
+                    AutoCut = true;
+                SendCheck.Enabled = true;
+            }
+        }
 
         /// <summary>
         /// 工单变化修改数量
@@ -634,9 +759,13 @@ namespace UAS_MES_NEW.Make
         {
             if (ma_code.Text.Length > 4)
             {
-                BaseUtil.CleanControlsText(mcd_inqty, mcd_remainqty);
+                mcd_inqty.Text = "";
+                mcd_remainqty.Text = "";
+                ob_batchqty.Text = "";
+                ob_nowcheckqty.Text = "";
+                ob_sendqty.Text = "";
                 LoadCollectedNum();
-
+                LoadCheckQTY();
             }
         }
 
@@ -713,74 +842,5 @@ namespace UAS_MES_NEW.Make
                 }
             }
         }
-
-        private void StartTest_Click(object sender, EventArgs e)
-        {
-            if (this.ComList.Text == "")
-            {
-                MessageBox.Show("端口号不可为空");
-                return;
-            }
-            if (this.BaudRate.Text == "")
-            {
-                MessageBox.Show("波特率不可为空");
-                return;
-            }
-            thread = new Thread(GetSerialData);
-            try
-            {
-                ReadData = true;
-                serialPort1.PortName = this.ComList.Text;
-                serialPort1.BaudRate = int.Parse(BaudRate.Text);
-                BaseUtil.SetCacheData("PortName", this.ComList.Text);
-                BaseUtil.SetCacheData("BaudRate", BaudRate.Text);
-                serialPort1.Open();
-                thread.Start();
-            }
-            catch (Exception mes) { MessageBox.Show(mes.Message); }
-        }
-
-        private void GetSerialData()
-        {
-            if (serialPort1.IsOpen)
-            {
-                if (!SystemInf.OpenPort.Contains(serialPort1.PortName))
-                {
-                    SystemInf.OpenPort.Add(serialPort1.PortName);
-                    try
-                    {
-                        while (ReadData)
-                        {
-                            try
-                            {
-                                string resulttext = serialPort1.ReadLine().Trim();
-                                //需要拆分字符串
-                                if (resulttext.IndexOf(";") > 0)
-                                {
-                                    string[] sncode = resulttext.Split(';');
-                                    for (int i = 0; i < sncode.Length; i++)
-                                    {
-                                        ms_sncode.Text = sncode[i];
-                                        ms_code_KeyDown(ms_sncode, new KeyEventArgs(Keys.Enter));
-                                    }
-                                }
-                                else
-                                {
-                                    ms_sncode.Text = resulttext;
-                                    ms_code_KeyDown(ms_sncode, new KeyEventArgs(Keys.Enter));
-                                }
-                            }
-                            catch (Exception)
-                            {
-                                ReadData = false;
-                            }
-                        }
-                    }
-                    catch (IOException ex) { MessageBox.Show(ex.Message); }
-                }
-                else
-                    MessageBox.Show("端口已被占用，请关闭其他窗口");
-            }
-        }
     }
 }

UAS_MES_JC/FunctionCode/Make/Make_TestCollection_DCW.resx → UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.resx

@@ -117,13 +117,51 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="SendCheck.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="SendCheck.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <metadata name="BadInfSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="ControlLockTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>172, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Save.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -221,7 +259,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -329,137 +367,6 @@
         ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
         zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
         fgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="StartTest.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="StartTest.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
-        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
-        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
-        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
-        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
-        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
-        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
-        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
-        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
-        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
-        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
-        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
-        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
-        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
-        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
-        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
-        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
-        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
-        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
-        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
-        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
-        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
-        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
-        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
-        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
-        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
-        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
-        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
-        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
-        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
-        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
-        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
-        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
-        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
-        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
-        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
-        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
-        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
-        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
-        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
-        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
-        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
-        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
-        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
-        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
-        heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
-        X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
-        HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
-        ZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSw
-        I4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOA
-        DHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2
-        BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOADHYEkMGOADLYEUAGOwLIYEf5/vsnj6pvqpnqr6oAePDU
-        qppVu49c2+PsWC/8urpZXV0rR8fH5f2HD+XDGH0N4GH47zbVrNpVw2rZNX7voy/qi7+sHvd6C2U0Oi03
-        7z+Um5v35RpAZ6hZtauG1bKaVtvjrd/76Iv6om/7/UG9+PZGV9c3d67L5RWAh06t3nfbHAa1ZTVd2/5m
-        vPV7f/+hvuCr6q8r3UQ3u7wqF9X5xSWAjlG7avi+ZbVd/Ws8fhk/AL5dXl75O/qz84tyenZ+56yMTgE8
-        dGr1vls1fH8YLNW2a+P/eAoYPwAWD4ZH5fT8sozqxSf1Zsejs3J0cgqgY9SuGlbLavrgcKgDYDAev4wf
-        AH+OTmv4o/NyrJscjcqwOhyeAOgYtauG1fJ907Xxs/H4ZfwAqC+sf+Mfn9aLT+qJcVwdlf0DAF2jdtWw
-        WlbTaluN3/d+76MDQC88PDxpbrC7N6wOy7tdAF2jdtWwWlbTarv1ANCJsbc/bG6ws7Nftrb3AHSUGlbL
-        avqwtt16AOzV02Jn96Bs1Qs3t3fLxua7sg6gc9SuGlbLalpttx4AOi10wcbmblnb2Cmr69tlZQ1A16hd
-        NayW1bTabj0AtncObuNf3ykrq1tleWWzLC0D6Bq1q4bVsppW260HwObWbfy6eHFpo7xdXC9v3q4B6Bi1
-        q4bVsppW260HwPr6u3rBVr14owzerJWFwWrpL6wA6Bi1q4bVsppW260HwMrqdnNq6MJef6W87i2X+ddL
-        ADpG7aphtaym1XbrAbBUHxcG9fGht7Bc5l4vllfzb8vs3BsAHaN21bBaVtNqu/UA0PcNenzQhTOv3pSX
-        s4MyPbMAoGPUrhpWy2pabbceAHpceN1bKrOKv95karpfJqd6ADpG7aphtaym1XbrAdAf1L/95xfrhYMy
-        Od0rLyZfl+cT8wA6Ru2qYbWsptV26wHQ6y833z9MvezXG8yXP17Mld+fvwLQMWpXDatlNa22Ww8AvXuo
-        E2Nislf+eD5Xnv3+qjx9NgugY9SuGlbLalpttx4Ac3OLZXp6oTx/MV9vMFt+ezpTfv3tJYCOUbtqWC2r
-        abXdegDMzr2t3zf06yPEXPnt2Uz5pd7o51+nAXSM2lXDallNq+3WA2BmdtC8eaCTQzf46Zep8uPPkwA6
-        Ru2qYbWsptV26wGg7xX0DuLT32eaU0Q3evLTBICOUbtqWC2rabXdegDoBwiev7h9/NcJohv98OMLAB2j
-        dtWwWlbTarv1AJh6udC8c/jr05l6gkzVG02U75+8ANAxalcNq2U1rbbbD4C7NwD1vcOTnyabGz3+4TmA
-        jlG7algtq2m1zQEAhOAAAIJ92gHAewDAZ+GT3gPgXwGAz8Mn/SsAPwcAfB4+6ecA+ElA4POgdtXw//WT
-        gPxfAODzoHbVsFr+n/8vgD44YPrlQn1kqE8Bf7yqN5ht3kQA0C1qVw2rZTWttlsPgPneUvNZYhNTveYD
-        BXSDp/URAkC3qF01rJbVtNpuPQB6CyvlVX1U0DuGE1O3HwemmwDoFrWrhtWymlbbrQfAYLDafHLIzOyb
-        +thw+4GgE5OvAXSM2lXDallNq+3WA+DN4vrtU0D9fqE5BGYGzQ8QAOgWtauG1bKaVtutB8Di8mZZ0EeD
-        95ebC/XOoT5bHEC3qF01rJbVtNpuPQD020TfLq3XC1abC/XGgX6xAIBuUbu38a82Tavt1gNgbf1dWVrZ
-        qo8LG82p0a/fN+jxAUC3qF01rJbVtNpuPQD49eDA5+GTfj349s5B2di8PQT020R18VL93gFAt6hdNayW
-        1bTabj0AdncP6wv3y2a9YH1jp168XVbXAHSN2lXDallN7+4dth8A+wfHd4fAQdna3quPDXvN6QGgW9Su
-        GlbLalpttx4Aw+FJfeFRPS2G5d3uQdl5d9CcHgC6Re2qYbWsptV22wHw59HxqAyPTsrB4XFz0d7+sHl0
-        ANAtalcNq2U1LbXxy/H4ZfwAWNk/GJaT0Vk5Oj6tF4zKYT01dAMA3aJ21bBaVtN7+817AIPx+GX8APhu
-        aXmlnJ1flNHZeXPR8clpOboz1NMBgAftvle1q4bVsppeXGr+M9C34/HL+AHwVfXXxcVVOa/Ozi/L6dlF
-        dV5GpwC6Qs2qXTWsltW02lbj4/HLR1/UF3zX7w/K1fVNuby6LheXt4fBLd3sjm4M4GEYb/OuV7WrhtWy
-        mq5t/+Nvf/noi/qiL6vHvV6/PkKMynW9WDe4uq43qjfTDQE8TGq0abU2q3bVsFpW02p7vPV7/xikvvjr
-        6mZlZbUcHR2Xm/cfxrwH8OD8p1E1q3bVsFp2jd+zo9QLH1XfVHOVbgagG9Ss2n3k2h5nRwAZ7Agggx0B
-        ZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSw
-        I4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOA
-        DHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2
-        BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQ
-        wY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCDHQFksCOADHYEkMGO
-        ADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy
-        2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="StartTest.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="StartTest.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

UAS_MES_JC/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OQC_SamplingDataCollection));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.ob_checkno_label = new System.Windows.Forms.Label();
             this.obd_outboxcode_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
@@ -57,6 +57,12 @@
             this.ob_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_makecode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ChoosedDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewExpand();
+            this.choose1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bg_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bg_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WaitChooseDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.bg_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -96,12 +102,6 @@
             this.Filter = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder();
             this.BadInfoSource = new System.Windows.Forms.BindingSource(this.components);
             this.label2 = new System.Windows.Forms.Label();
-            this.choose1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -114,9 +114,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(26, 52);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ob_checkno_label.TabIndex = 156;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -126,9 +127,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(26, 116);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(82, 41);
             this.obd_outboxcode_label.TabIndex = 154;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -138,9 +140,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(26, 184);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.ms_sncode_label.TabIndex = 152;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -150,9 +153,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(1614, 342);
+            this.bc_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.bc_code_label.Name = "bc_code_label";
-            this.bc_code_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_code_label.Size = new System.Drawing.Size(146, 41);
             this.bc_code_label.TabIndex = 177;
             this.bc_code_label.Text = "不良代码";
             // 
@@ -162,9 +166,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(1614, 82);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.Size = new System.Drawing.Size(114, 41);
             this.label1.TabIndex = 179;
             this.label1.Text = "实批数";
             // 
@@ -174,9 +179,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(1614, 278);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(146, 41);
             this.label4.TabIndex = 185;
             this.label4.Text = "不合格数";
             // 
@@ -186,9 +192,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(1614, 210);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(58, 21);
+            this.label5.Size = new System.Drawing.Size(114, 41);
             this.label5.TabIndex = 187;
             this.label5.Text = "合格数";
             // 
@@ -198,9 +205,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.oi_sampleqty_label.AutoSize = true;
             this.oi_sampleqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.oi_sampleqty_label.Location = new System.Drawing.Point(807, 72);
+            this.oi_sampleqty_label.Location = new System.Drawing.Point(1614, 144);
+            this.oi_sampleqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.oi_sampleqty_label.Name = "oi_sampleqty_label";
-            this.oi_sampleqty_label.Size = new System.Drawing.Size(58, 21);
+            this.oi_sampleqty_label.Size = new System.Drawing.Size(114, 41);
             this.oi_sampleqty_label.TabIndex = 189;
             this.oi_sampleqty_label.Text = "样本数";
             // 
@@ -208,9 +216,10 @@
             // 
             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(932, 348);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(106, 21);
+            this.label9.Size = new System.Drawing.Size(210, 41);
             this.label9.TabIndex = 192;
             this.label9.Text = "待选不良分组";
             // 
@@ -220,9 +229,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             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(13, 531);
+            this.sncode_label.Location = new System.Drawing.Point(26, 1062);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(114, 41);
             this.sncode_label.TabIndex = 200;
             this.sncode_label.Text = "序列号";
             // 
@@ -232,9 +242,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(26, 1130);
+            this.ob_remark_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(82, 41);
             this.ob_remark_label.TabIndex = 202;
             this.ob_remark_label.Text = "备注";
             // 
@@ -244,9 +255,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(26, 256);
+            this.obd_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(114, 41);
             this.obd_makecode_label.TabIndex = 206;
             this.obd_makecode_label.Text = "工单号";
             // 
@@ -254,18 +266,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(480, 256);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             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(30, 18);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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, 24);
             this.ob_status.TabIndex = 212;
             this.ob_status.Visible = false;
             // 
@@ -275,9 +289,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(1614, 14);
+            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(83, 41);
             this.ob_aqlcode_label.TabIndex = 214;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -287,9 +302,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(1282, 14);
+            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(274, 41);
             this.ob_maxngacceptqty_label.TabIndex = 216;
             this.ob_maxngacceptqty_label.Text = "最大不合格通过数";
             // 
@@ -299,19 +315,20 @@
             | 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(1282, 144);
+            this.ob_projectcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 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(146, 41);
             this.ob_projectcode_label.TabIndex = 218;
             this.ob_projectcode_label.Text = "检验方案";
             // 
             // BadGroupCode
             // 
             this.BadGroupCode.FormattingEnabled = true;
-            this.BadGroupCode.Location = new System.Drawing.Point(570, 177);
-            this.BadGroupCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.BadGroupCode.Location = new System.Drawing.Point(1140, 354);
+            this.BadGroupCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BadGroupCode.Name = "BadGroupCode";
-            this.BadGroupCode.Size = new System.Drawing.Size(131, 20);
+            this.BadGroupCode.Size = new System.Drawing.Size(258, 32);
             this.BadGroupCode.TabIndex = 219;
             this.BadGroupCode.SelectedIndexChanged += new System.EventHandler(this.BadGroupCode_SelectedIndexChanged);
             // 
@@ -320,10 +337,11 @@
             this.ob_maxngacceptqty.AllPower = null;
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(645, 41);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(1290, 82);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(288, 35);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -336,10 +354,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(1816, 14);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(288, 35);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -352,10 +371,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(1290, 212);
+            this.ob_projectcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(288, 35);
             this.ob_projectcode.Str = null;
             this.ob_projectcode.Str1 = null;
             this.ob_projectcode.Str2 = null;
@@ -370,12 +390,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(2024, 1138);
+            this.Clean.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(96, 48);
             this.Clean.TabIndex = 211;
             this.Clean.Tag = "OQC!Inspection";
             this.Clean.Text = "清除";
@@ -385,9 +406,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(1374, 940);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(320, 123);
+            this.OperateResult.Size = new System.Drawing.Size(636, 242);
             this.OperateResult.TabIndex = 210;
             this.OperateResult.Text = "";
             // 
@@ -397,10 +419,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(690, 262);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(228, 35);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -413,10 +436,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(190, 262);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(228, 35);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -434,13 +458,67 @@
             this.bg_code1,
             this.bc_code1,
             this.bc_name1});
-            this.ChoosedDGV.Location = new System.Drawing.Point(810, 204);
+            this.ChoosedDGV.Location = new System.Drawing.Point(1620, 408);
+            this.ChoosedDGV.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(488, 514);
             this.ChoosedDGV.TabIndex = 205;
             // 
+            // choose1
+            // 
+            this.choose1.HeaderText = "勾选";
+            this.choose1.MinimumWidth = 50;
+            this.choose1.Name = "choose1";
+            this.choose1.Width = 50;
+            // 
+            // or_id
+            // 
+            this.or_id.DataPropertyName = "or_id";
+            this.or_id.HeaderText = "or_id";
+            this.or_id.MinimumWidth = 10;
+            this.or_id.Name = "or_id";
+            this.or_id.Visible = false;
+            this.or_id.Width = 200;
+            // 
+            // bg_name1
+            // 
+            this.bg_name1.DataPropertyName = "bg_name";
+            this.bg_name1.HeaderText = "不良组别名称";
+            this.bg_name1.MinimumWidth = 10;
+            this.bg_name1.Name = "bg_name1";
+            this.bg_name1.Visible = false;
+            this.bg_name1.Width = 200;
+            // 
+            // bg_code1
+            // 
+            this.bg_code1.DataPropertyName = "bg_code";
+            this.bg_code1.HeaderText = "不良组别编号";
+            this.bg_code1.MinimumWidth = 10;
+            this.bg_code1.Name = "bg_code1";
+            this.bg_code1.Visible = false;
+            this.bg_code1.Width = 200;
+            // 
+            // bc_code1
+            // 
+            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.bc_code1.DataPropertyName = "bc_code";
+            this.bc_code1.HeaderText = "不良代码";
+            this.bc_code1.MinimumWidth = 10;
+            this.bc_code1.Name = "bc_code1";
+            this.bc_code1.ReadOnly = true;
+            this.bc_code1.Width = 200;
+            // 
+            // bc_name1
+            // 
+            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.bc_name1.DataPropertyName = "bc_name";
+            this.bc_name1.HeaderText = "不良名称 ";
+            this.bc_name1.MinimumWidth = 10;
+            this.bc_name1.Name = "bc_name1";
+            this.bc_name1.ReadOnly = true;
+            // 
             // WaitChooseDGV
             // 
             this.WaitChooseDGV.AllowUserToAddRows = false;
@@ -451,11 +529,12 @@
             this.bg_code,
             this.bc_code,
             this.bc_name});
-            this.WaitChooseDGV.Location = new System.Drawing.Point(472, 204);
+            this.WaitChooseDGV.Location = new System.Drawing.Point(944, 408);
+            this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(536, 512);
             this.WaitChooseDGV.TabIndex = 204;
             this.WaitChooseDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.WaitChooseDGV_DataError);
             // 
@@ -464,6 +543,7 @@
             this.ChooseAll.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.ChooseAll.DataPropertyName = "ChooseAll";
             this.ChooseAll.HeaderText = "勾选";
+            this.ChooseAll.MinimumWidth = 10;
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.ChooseAll.Width = 60;
@@ -472,21 +552,26 @@
             // 
             this.bg_name.DataPropertyName = "bg_name";
             this.bg_name.HeaderText = "不良组别名称";
+            this.bg_name.MinimumWidth = 10;
             this.bg_name.Name = "bg_name";
             this.bg_name.Visible = false;
+            this.bg_name.Width = 200;
             // 
             // bg_code
             // 
             this.bg_code.DataPropertyName = "bg_code";
             this.bg_code.HeaderText = "不良组别编号";
+            this.bg_code.MinimumWidth = 10;
             this.bg_code.Name = "bg_code";
             this.bg_code.Visible = false;
+            this.bg_code.Width = 200;
             // 
             // bc_code
             // 
             this.bc_code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.bc_code.DataPropertyName = "bc_code";
             this.bc_code.HeaderText = "不良代码";
+            this.bc_code.MinimumWidth = 10;
             this.bc_code.Name = "bc_code";
             this.bc_code.ReadOnly = true;
             this.bc_code.Width = 130;
@@ -495,18 +580,21 @@
             // 
             this.bc_name.DataPropertyName = "bc_name";
             this.bc_name.HeaderText = "不良名称";
+            this.bc_name.MinimumWidth = 10;
             this.bc_name.Name = "bc_name";
             this.bc_name.ReadOnly = true;
+            this.bc_name.Width = 200;
             // 
             // 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(92, 567);
+            this.ob_remark.Location = new System.Drawing.Point(184, 1134);
+            this.ob_remark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(728, 35);
             this.ob_remark.Str = null;
             this.ob_remark.Str1 = null;
             this.ob_remark.Str2 = null;
@@ -518,10 +606,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(184, 1068);
+            this.sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(366, 21);
+            this.sncode.Size = new System.Drawing.Size(728, 35);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -543,11 +632,12 @@
             this.oi_leveldefect,
             this.ois_remark,
             this.ois_status});
-            this.CheckTypeDGV.Location = new System.Drawing.Point(16, 171);
+            this.CheckTypeDGV.Location = new System.Drawing.Point(32, 342);
+            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowHeadersWidth = 20;
             this.CheckTypeDGV.RowTemplate.Height = 23;
-            this.CheckTypeDGV.Size = new System.Drawing.Size(442, 332);
+            this.CheckTypeDGV.Size = new System.Drawing.Size(884, 664);
             this.CheckTypeDGV.TabIndex = 198;
             this.CheckTypeDGV.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckTypeDGV_CellValueChanged);
             this.CheckTypeDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.CheckTypeDGV_DataError);
@@ -557,6 +647,7 @@
             this.choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.choose.DataPropertyName = "choose";
             this.choose.HeaderText = "勾选";
+            this.choose.MinimumWidth = 10;
             this.choose.Name = "choose";
             this.choose.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.choose.Width = 60;
@@ -565,16 +656,19 @@
             // 
             this.oi_itemcode.DataPropertyName = "oi_itemcode";
             this.oi_itemcode.HeaderText = "项目编号";
+            this.oi_itemcode.MinimumWidth = 10;
             this.oi_itemcode.Name = "oi_itemcode";
             this.oi_itemcode.Visible = false;
+            this.oi_itemcode.Width = 200;
             // 
             // ci_name
             // 
             this.ci_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.ci_name.DataPropertyName = "ci_name";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.ci_name.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.ci_name.DefaultCellStyle = dataGridViewCellStyle2;
             this.ci_name.HeaderText = "项目名称";
+            this.ci_name.MinimumWidth = 10;
             this.ci_name.Name = "ci_name";
             this.ci_name.ReadOnly = true;
             // 
@@ -583,6 +677,7 @@
             this.oi_sampleqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_sampleqty.DataPropertyName = "oi_sampleqty";
             this.oi_sampleqty.HeaderText = "样本数";
+            this.oi_sampleqty.MinimumWidth = 10;
             this.oi_sampleqty.Name = "oi_sampleqty";
             this.oi_sampleqty.ReadOnly = true;
             this.oi_sampleqty.Width = 96;
@@ -592,48 +687,58 @@
             this.oi_checkqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
             this.oi_checkqty.DataPropertyName = "oi_checkqty";
             this.oi_checkqty.HeaderText = "已检数";
+            this.oi_checkqty.MinimumWidth = 10;
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.ReadOnly = true;
-            this.oi_checkqty.Width = 66;
+            this.oi_checkqty.Width = 127;
             // 
             // oi_ng
             // 
             this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_ng.DataPropertyName = "oi_ng";
             this.oi_ng.HeaderText = "是否NG";
+            this.oi_ng.MinimumWidth = 10;
             this.oi_ng.Name = "oi_ng";
             this.oi_ng.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.oi_ng.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.oi_ng.Width = 200;
             // 
             // oi_leveldefect
             // 
             this.oi_leveldefect.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_leveldefect.DataPropertyName = "oi_leveldefect";
             this.oi_leveldefect.HeaderText = "缺陷等级";
+            this.oi_leveldefect.MinimumWidth = 10;
             this.oi_leveldefect.Name = "oi_leveldefect";
             this.oi_leveldefect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.oi_leveldefect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.oi_leveldefect.Width = 200;
             // 
             // ois_remark
             // 
             this.ois_remark.DataPropertyName = "ois_remark";
             this.ois_remark.HeaderText = "备注";
+            this.ois_remark.MinimumWidth = 10;
             this.ois_remark.Name = "ois_remark";
             this.ois_remark.Visible = false;
+            this.ois_remark.Width = 200;
             // 
             // ois_status
             // 
             this.ois_status.DataPropertyName = "ois_status";
             this.ois_status.HeaderText = "是否检验";
+            this.ois_status.MinimumWidth = 10;
             this.ois_status.Name = "ois_status";
             this.ois_status.Visible = false;
+            this.ois_status.Width = 200;
             // 
             // 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(1500, 590);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(50, 23);
+            this.ChooseedReject.Size = new System.Drawing.Size(100, 46);
             this.ChooseedReject.TabIndex = 195;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -641,9 +746,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(1500, 708);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(50, 23);
+            this.WaitReject.Size = new System.Drawing.Size(100, 46);
             this.WaitReject.TabIndex = 194;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -654,10 +760,11 @@
             this.oi_checkqty1.BackColor = System.Drawing.Color.White;
             this.oi_checkqty1.Enabled = false;
             this.oi_checkqty1.ID = null;
-            this.oi_checkqty1.Location = new System.Drawing.Point(908, 73);
+            this.oi_checkqty1.Location = new System.Drawing.Point(1816, 146);
+            this.oi_checkqty1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.oi_checkqty1.Name = "oi_checkqty1";
             this.oi_checkqty1.Power = null;
-            this.oi_checkqty1.Size = new System.Drawing.Size(147, 21);
+            this.oi_checkqty1.Size = new System.Drawing.Size(290, 35);
             this.oi_checkqty1.Str = null;
             this.oi_checkqty1.Str1 = null;
             this.oi_checkqty1.Str2 = null;
@@ -670,10 +777,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(1816, 212);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -686,10 +794,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(1816, 280);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(290, 35);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -702,10 +811,11 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(908, 42);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(1816, 84);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(290, 35);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -717,10 +827,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(1816, 350);
+            this.bccode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.bccode.Name = "bccode";
             this.bccode.Power = null;
-            this.bccode.Size = new System.Drawing.Size(147, 21);
+            this.bccode.Size = new System.Drawing.Size(290, 35);
             this.bccode.Str = null;
             this.bccode.Str1 = null;
             this.bccode.Str2 = null;
@@ -736,15 +847,16 @@
             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(944, 188);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(45, 24);
+            this.GetBatch.Size = new System.Drawing.Size(122, 48);
             this.GetBatch.TabIndex = 175;
             this.GetBatch.Tag = "IFREAD";
-            this.GetBatch.Text = "获取批";
+            this.GetBatch.Text = "获取批次";
             this.GetBatch.UseVisualStyleBackColor = true;
             this.GetBatch.Click += new System.EventHandler(this.GetBatch_Click);
             // 
@@ -756,15 +868,16 @@
             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(539, 95);
+            this.BatchPass.Location = new System.Drawing.Point(1078, 190);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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 = "ifread";
-            this.BatchPass.Size = new System.Drawing.Size(45, 24);
+            this.BatchPass.Size = new System.Drawing.Size(136, 48);
             this.BatchPass.TabIndex = 174;
             this.BatchPass.Tag = "OQC!Inspection";
-            this.BatchPass.Text = "批判过";
+            this.BatchPass.Text = "批次通过";
             this.BatchPass.UseVisualStyleBackColor = true;
             this.BatchPass.Click += new System.EventHandler(this.BatchPass_Click);
             // 
@@ -776,12 +889,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(944, 1134);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = "IFREAD";
-            this.Confirm.Size = new System.Drawing.Size(60, 24);
+            this.Confirm.Size = new System.Drawing.Size(120, 48);
             this.Confirm.TabIndex = 172;
             this.Confirm.Tag = "ifread";
             this.Confirm.Text = "确认";
@@ -793,10 +907,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(190, 58);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(728, 35);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -809,10 +924,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(190, 122);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(728, 35);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -825,10 +941,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(190, 190);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             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(728, 35);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -840,6 +957,7 @@
             // 
             this.勾选.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.勾选.HeaderText = "勾选";
+            this.勾选.MinimumWidth = 10;
             this.勾选.Name = "勾选";
             this.勾选.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.勾选.Width = 42;
@@ -848,6 +966,7 @@
             // 
             this.ob_batchqty_dgv.DataPropertyName = "ob_batchqty";
             this.ob_batchqty_dgv.HeaderText = "检验类型";
+            this.ob_batchqty_dgv.MinimumWidth = 10;
             this.ob_batchqty_dgv.Name = "ob_batchqty_dgv";
             this.ob_batchqty_dgv.Width = 110;
             // 
@@ -855,12 +974,15 @@
             // 
             this.obd_outboxcode_dgv.DataPropertyName = "obd_outboxcode";
             this.obd_outboxcode_dgv.HeaderText = "已检数";
+            this.obd_outboxcode_dgv.MinimumWidth = 10;
             this.obd_outboxcode_dgv.Name = "obd_outboxcode_dgv";
+            this.obd_outboxcode_dgv.Width = 200;
             // 
             // ob_makecode_dgv
             // 
             this.ob_makecode_dgv.DataPropertyName = "ob_makecode";
             this.ob_makecode_dgv.HeaderText = "应检数";
+            this.ob_makecode_dgv.MinimumWidth = 10;
             this.ob_makecode_dgv.Name = "ob_makecode_dgv";
             this.ob_makecode_dgv.Width = 190;
             // 
@@ -868,18 +990,20 @@
             // 
             this.obd_id.DataPropertyName = "obd_id";
             this.obd_id.HeaderText = "ob_id";
+            this.obd_id.MinimumWidth = 10;
             this.obd_id.Name = "obd_id";
             this.obd_id.Visible = false;
+            this.obd_id.Width = 200;
             // 
             // Filter
             // 
             this.Filter.BackColor = System.Drawing.Color.Transparent;
             this.Filter.Font = new System.Drawing.Font("宋体", 10.8F);
-            this.Filter.Location = new System.Drawing.Point(570, 142);
-            this.Filter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Filter.Location = new System.Drawing.Point(1140, 284);
+            this.Filter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Filter.Name = "Filter";
             this.Filter.PlaceHolder = "不良名称搜索";
-            this.Filter.Size = new System.Drawing.Size(129, 24);
+            this.Filter.Size = new System.Drawing.Size(258, 48);
             this.Filter.TabIndex = 220;
             this.Filter.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnTextChange(this.Filter_UserControlTextChanged);
             // 
@@ -889,61 +1013,18 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             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(514, 139);
+            this.label2.Location = new System.Drawing.Point(1028, 278);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(42, 21);
+            this.label2.Size = new System.Drawing.Size(82, 41);
             this.label2.TabIndex = 221;
             this.label2.Text = "搜索";
             // 
-            // choose1
-            // 
-            this.choose1.HeaderText = "勾选";
-            this.choose1.MinimumWidth = 50;
-            this.choose1.Name = "choose1";
-            this.choose1.Width = 50;
-            // 
-            // or_id
-            // 
-            this.or_id.DataPropertyName = "or_id";
-            this.or_id.HeaderText = "or_id";
-            this.or_id.Name = "or_id";
-            this.or_id.Visible = false;
-            // 
-            // bg_name1
-            // 
-            this.bg_name1.DataPropertyName = "bg_name";
-            this.bg_name1.HeaderText = "不良组别名称";
-            this.bg_name1.Name = "bg_name1";
-            this.bg_name1.Visible = false;
-            // 
-            // bg_code1
-            // 
-            this.bg_code1.DataPropertyName = "bg_code";
-            this.bg_code1.HeaderText = "不良组别编号";
-            this.bg_code1.Name = "bg_code1";
-            this.bg_code1.Visible = false;
-            // 
-            // bc_code1
-            // 
-            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.bc_code1.DataPropertyName = "bc_code";
-            this.bc_code1.HeaderText = "不良代码";
-            this.bc_code1.Name = "bc_code1";
-            this.bc_code1.ReadOnly = true;
-            // 
-            // bc_name1
-            // 
-            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.bc_name1.DataPropertyName = "bc_name";
-            this.bc_name1.HeaderText = "不良名称 ";
-            this.bc_name1.Name = "bc_name1";
-            this.bc_name1.ReadOnly = true;
-            // 
             // OQC_SamplingDataCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1065, 610);
+            this.ClientSize = new System.Drawing.Size(2130, 1220);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.Filter);
             this.Controls.Add(this.BadGroupCode);
@@ -990,6 +1071,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(6, 6, 6, 6);
             this.Name = "OQC_SamplingDataCollection";
             this.Tag = "OQC!SamplingDataCollection";
             this.Text = " ";

UAS_MES_JC/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -177,7 +177,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -267,6 +267,39 @@
   <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="choose1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -309,6 +342,33 @@
   <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_checkqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_leveldefect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="ChooseedReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -406,7 +466,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -537,7 +597,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -668,7 +728,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -38,11 +38,13 @@
             this.ms_firstsn = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.CraftInfDgv = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.mp_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MP_RESULT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mp_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ma_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mp_sourcecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mp_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ma_craftcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MP_SNCHECKNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sc_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mp_inman = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -56,19 +58,27 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.CraftMaterial = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_fsoncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.当前状态 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_inman = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CraftMaterial)).BeginInit();
             this.SuspendLayout();
             // 
             // sn_code_label
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(20, 26);
+            this.sn_code_label.Location = new System.Drawing.Point(20, 13);
             this.sn_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sn_code_label.Name = "sn_code_label";
             this.sn_code_label.Size = new System.Drawing.Size(114, 41);
@@ -81,10 +91,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.SerialPanel.AutoScroll = true;
             this.SerialPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.SerialPanel.Location = new System.Drawing.Point(28, 212);
-            this.SerialPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SerialPanel.Location = new System.Drawing.Point(28, 152);
+            this.SerialPanel.Margin = new System.Windows.Forms.Padding(4);
             this.SerialPanel.Name = "SerialPanel";
-            this.SerialPanel.Size = new System.Drawing.Size(1896, 504);
+            this.SerialPanel.Size = new System.Drawing.Size(1896, 318);
             this.SerialPanel.TabIndex = 194;
             this.SerialPanel.Scroll += new System.Windows.Forms.ScrollEventHandler(this.SerialPanel_Scroll);
             this.SerialPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.SerialPanel_Paint);
@@ -93,7 +103,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(514, 24);
+            this.ma_code_label.Location = new System.Drawing.Point(514, 11);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(114, 41);
@@ -104,7 +114,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(664, 26);
+            this.ma_code.Location = new System.Drawing.Point(664, 13);
             this.ma_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code.Name = "ma_code";
             this.ma_code.Size = new System.Drawing.Size(0, 41);
@@ -114,7 +124,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(944, 26);
+            this.label5.Location = new System.Drawing.Point(944, 13);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -125,7 +135,7 @@
             // 
             this.ms_checkno.AutoSize = true;
             this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_checkno.Location = new System.Drawing.Point(1124, 26);
+            this.ms_checkno.Location = new System.Drawing.Point(1124, 13);
             this.ms_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_checkno.Name = "ms_checkno";
             this.ms_checkno.Size = new System.Drawing.Size(0, 41);
@@ -135,7 +145,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(1386, 24);
+            this.label7.Location = new System.Drawing.Point(1386, 11);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(178, 41);
@@ -147,7 +157,7 @@
             this.ms_firstsn.AllPower = null;
             this.ms_firstsn.BackColor = System.Drawing.Color.White;
             this.ms_firstsn.ID = null;
-            this.ms_firstsn.Location = new System.Drawing.Point(1576, 30);
+            this.ms_firstsn.Location = new System.Drawing.Point(1576, 17);
             this.ms_firstsn.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.ms_firstsn.Name = "ms_firstsn";
             this.ms_firstsn.Power = null;
@@ -165,33 +175,46 @@
             this.CraftInfDgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.CraftInfDgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.mp_sncode,
+            this.MP_RESULT,
             this.mp_makecode,
             this.ma_prodcode,
             this.mp_sourcecode,
             this.mp_indate,
             this.ma_craftcode,
+            this.MP_SNCHECKNO,
             this.sc_linecode,
             this.mp_inman,
             this.em_name});
             this.CraftInfDgv.EnableContentClick = true;
-            this.CraftInfDgv.Location = new System.Drawing.Point(0, 776);
+            this.CraftInfDgv.Location = new System.Drawing.Point(0, 775);
             this.CraftInfDgv.Margin = new System.Windows.Forms.Padding(4);
             this.CraftInfDgv.Name = "CraftInfDgv";
+            this.CraftInfDgv.RowHeadersWidth = 82;
             this.CraftInfDgv.RowTemplate.Height = 27;
-            this.CraftInfDgv.Size = new System.Drawing.Size(1950, 380);
+            this.CraftInfDgv.Size = new System.Drawing.Size(1950, 362);
             this.CraftInfDgv.TabIndex = 193;
             // 
             // mp_sncode
             // 
             this.mp_sncode.DataPropertyName = "mp_sncode";
             this.mp_sncode.HeaderText = "序列号";
+            this.mp_sncode.MinimumWidth = 10;
             this.mp_sncode.Name = "mp_sncode";
             this.mp_sncode.Width = 120;
             // 
+            // MP_RESULT
+            // 
+            this.MP_RESULT.DataPropertyName = "MP_RESULT";
+            this.MP_RESULT.HeaderText = "操作内容";
+            this.MP_RESULT.MinimumWidth = 10;
+            this.MP_RESULT.Name = "MP_RESULT";
+            this.MP_RESULT.Width = 200;
+            // 
             // mp_makecode
             // 
             this.mp_makecode.DataPropertyName = "mp_makecode";
             this.mp_makecode.HeaderText = "工单代码";
+            this.mp_makecode.MinimumWidth = 10;
             this.mp_makecode.Name = "mp_makecode";
             this.mp_makecode.Width = 120;
             // 
@@ -199,6 +222,7 @@
             // 
             this.ma_prodcode.DataPropertyName = "ma_prodcode";
             this.ma_prodcode.HeaderText = "产品代码";
+            this.ma_prodcode.MinimumWidth = 10;
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Width = 120;
             // 
@@ -206,6 +230,7 @@
             // 
             this.mp_sourcecode.DataPropertyName = "mp_sourcecode";
             this.mp_sourcecode.HeaderText = "资源编号";
+            this.mp_sourcecode.MinimumWidth = 10;
             this.mp_sourcecode.Name = "mp_sourcecode";
             this.mp_sourcecode.Width = 120;
             // 
@@ -213,6 +238,7 @@
             // 
             this.mp_indate.DataPropertyName = "mp_indate";
             this.mp_indate.HeaderText = "过站时间";
+            this.mp_indate.MinimumWidth = 10;
             this.mp_indate.Name = "mp_indate";
             this.mp_indate.Width = 120;
             // 
@@ -220,13 +246,23 @@
             // 
             this.ma_craftcode.DataPropertyName = "ma_craftcode";
             this.ma_craftcode.HeaderText = "途程代码";
+            this.ma_craftcode.MinimumWidth = 10;
             this.ma_craftcode.Name = "ma_craftcode";
             this.ma_craftcode.Width = 120;
             // 
+            // MP_SNCHECKNO
+            // 
+            this.MP_SNCHECKNO.DataPropertyName = "MP_SNCHECKNO";
+            this.MP_SNCHECKNO.HeaderText = "抽检批次";
+            this.MP_SNCHECKNO.MinimumWidth = 10;
+            this.MP_SNCHECKNO.Name = "MP_SNCHECKNO";
+            this.MP_SNCHECKNO.Width = 200;
+            // 
             // sc_linecode
             // 
             this.sc_linecode.DataPropertyName = "sc_linecode";
             this.sc_linecode.HeaderText = "产线";
+            this.sc_linecode.MinimumWidth = 10;
             this.sc_linecode.Name = "sc_linecode";
             this.sc_linecode.Width = 120;
             // 
@@ -234,13 +270,17 @@
             // 
             this.mp_inman.DataPropertyName = "mp_inman";
             this.mp_inman.HeaderText = "人员工号";
+            this.mp_inman.MinimumWidth = 10;
             this.mp_inman.Name = "mp_inman";
+            this.mp_inman.Width = 200;
             // 
             // em_name
             // 
             this.em_name.DataPropertyName = "em_name";
             this.em_name.HeaderText = "人员姓名";
+            this.em_name.MinimumWidth = 10;
             this.em_name.Name = "em_name";
+            this.em_name.Width = 200;
             // 
             // groupBoxWithBorder1
             // 
@@ -256,7 +296,7 @@
             this.groupBoxWithBorder1.Controls.Add(this.label2);
             this.groupBoxWithBorder1.Controls.Add(this.label3);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(24, 80);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(24, 62);
             this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
             this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(6, 4, 6, 4);
@@ -270,7 +310,7 @@
             // 
             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(1700, 28);
+            this.label1.Location = new System.Drawing.Point(1712, 32);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -301,7 +341,7 @@
             // 
             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(1310, 28);
+            this.label4.Location = new System.Drawing.Point(1322, 32);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(114, 41);
@@ -332,7 +372,7 @@
             // 
             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(344, 28);
+            this.label2.Location = new System.Drawing.Point(356, 32);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(242, 41);
@@ -343,7 +383,7 @@
             // 
             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(824, 28);
+            this.label3.Location = new System.Drawing.Point(836, 32);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(274, 41);
@@ -355,7 +395,7 @@
             this.sn_code.AllPower = null;
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(184, 28);
+            this.sn_code.Location = new System.Drawing.Point(184, 15);
             this.sn_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
@@ -367,11 +407,83 @@
             this.sn_code.Tag = "NoAuto";
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
+            // CraftMaterial
+            // 
+            this.CraftMaterial.AllowUserToAddRows = false;
+            this.CraftMaterial.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.CraftMaterial.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.CraftMaterial.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.cm_barcode,
+            this.cm_fsoncode,
+            this.cm_indate,
+            this.当前状态,
+            this.cm_sncode,
+            this.cm_inman});
+            this.CraftMaterial.EnableContentClick = true;
+            this.CraftMaterial.Location = new System.Drawing.Point(0, 478);
+            this.CraftMaterial.Margin = new System.Windows.Forms.Padding(4);
+            this.CraftMaterial.Name = "CraftMaterial";
+            this.CraftMaterial.RowHeadersWidth = 82;
+            this.CraftMaterial.RowTemplate.Height = 27;
+            this.CraftMaterial.Size = new System.Drawing.Size(1950, 276);
+            this.CraftMaterial.TabIndex = 202;
+            // 
+            // cm_barcode
+            // 
+            this.cm_barcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.cm_barcode.DataPropertyName = "cm_barcode";
+            this.cm_barcode.HeaderText = "单板条码";
+            this.cm_barcode.MinimumWidth = 10;
+            this.cm_barcode.Name = "cm_barcode";
+            this.cm_barcode.Width = 10;
+            // 
+            // cm_fsoncode
+            // 
+            this.cm_fsoncode.DataPropertyName = "cm_fsoncode";
+            this.cm_fsoncode.HeaderText = "物料编号";
+            this.cm_fsoncode.MinimumWidth = 10;
+            this.cm_fsoncode.Name = "cm_fsoncode";
+            this.cm_fsoncode.Width = 200;
+            // 
+            // cm_indate
+            // 
+            this.cm_indate.DataPropertyName = "cm_indate";
+            this.cm_indate.HeaderText = "上料时间";
+            this.cm_indate.MinimumWidth = 10;
+            this.cm_indate.Name = "cm_indate";
+            this.cm_indate.Width = 120;
+            // 
+            // 当前状态
+            // 
+            this.当前状态.DataPropertyName = "cm_status";
+            this.当前状态.HeaderText = "当前状态";
+            this.当前状态.MinimumWidth = 10;
+            this.当前状态.Name = "当前状态";
+            this.当前状态.Width = 120;
+            // 
+            // cm_sncode
+            // 
+            this.cm_sncode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.cm_sncode.DataPropertyName = "cm_sncode";
+            this.cm_sncode.HeaderText = "模块条码号";
+            this.cm_sncode.MinimumWidth = 10;
+            this.cm_sncode.Name = "cm_sncode";
+            this.cm_sncode.Width = 10;
+            // 
+            // cm_inman
+            // 
+            this.cm_inman.DataPropertyName = "cm_inman";
+            this.cm_inman.HeaderText = "上料人";
+            this.cm_inman.MinimumWidth = 10;
+            this.cm_inman.Name = "cm_inman";
+            this.cm_inman.Width = 200;
+            // 
             // Query_ExeProgress
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1950, 1156);
+            this.Controls.Add(this.CraftMaterial);
             this.Controls.Add(this.ms_firstsn);
             this.Controls.Add(this.label7);
             this.Controls.Add(this.ms_checkno);
@@ -397,6 +509,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CraftMaterial)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();
 
@@ -416,20 +529,29 @@
         private System.Windows.Forms.Panel SerialPanel;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.PictureBox pictureBox4;
+        private System.Windows.Forms.Label ma_code_label;
+        private System.Windows.Forms.Label ma_code;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label ms_checkno;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_firstsn;
         private System.Windows.Forms.DataGridViewTextBoxColumn mp_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MP_RESULT;
         private System.Windows.Forms.DataGridViewTextBoxColumn mp_makecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn ma_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mp_sourcecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mp_indate;
         private System.Windows.Forms.DataGridViewTextBoxColumn ma_craftcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MP_SNCHECKNO;
         private System.Windows.Forms.DataGridViewTextBoxColumn sc_linecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mp_inman;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_name;
-        private System.Windows.Forms.Label ma_code_label;
-        private System.Windows.Forms.Label ma_code;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label ms_checkno;
-        private System.Windows.Forms.Label label7;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_firstsn;
+        private CustomControl.DataGrid_View.DataGridViewWithSerialNum CraftMaterial;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_barcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_fsoncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_indate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 当前状态;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_inman;
     }
 }

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -1,4 +1,5 @@
-using System;
+using DevComponents.DotNetBar;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -114,7 +115,7 @@ namespace UAS_MES_NEW.Query
                 //设置界面工单号
                 ma_code.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_makecode"].ToString();
                 ms_checkno.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_checkno"].ToString();
-                ms_firstsn.Text= ms_id.Rows[ms_id.Rows.Count - 1]["ms_firstsn"].ToString();
+                ms_firstsn.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_firstsn"].ToString();
                 int idCount = ms_id.Rows.Count;
                 for (int i = 0; i < idCount; i++)
                 {
@@ -343,11 +344,28 @@ namespace UAS_MES_NEW.Query
                         makecodes.Append("'" + ListA.Rows[i]["ms_makecode"].ToString() + "',");
                     }
                     sql.Clear();
-                    sql.Append("select mp_makecode,ma_prodcode,sc_linecode,ma_craftcode,mp_sourcecode,mp_sncode,");
+                    sql.Append("select MP_RESULT,MP_SNCHECKNO,mp_makecode,ma_prodcode,sc_linecode,ma_craftcode,mp_sourcecode,mp_sncode,");
                     sql.Append("mp_indate,mp_inman,em_name from makeprocess left join make on mp_makecode=ma_code left join employee on mp_inman = em_code left join source on ");
                     sql.Append("mp_sourcecode=sc_code where mp_sncode in (" + mp_sncodes.ToString().Substring(0, mp_sncodes.ToString().Length - 1) + ") and ma_code in (" + makecodes.ToString().Substring(0, makecodes.ToString().Length - 1) + ") order by mp_indate");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.FillDgvWithDataTable(CraftInfDgv, dt);
+
+                    sql.Clear();
+                    sql.Append("select cm_barcode,cm_fsoncode,cm_sncode,cm_indate,cm_inman," +
+                        "case when cm_status=0 then '上线' else '已拆解' end cm_status from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ma_code.Text + "'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        BaseUtil.FillDgvWithDataTable(CraftMaterial, dt);
+                    }
+                    else
+                    {
+                        sql.Clear();
+                        sql.Append("select cm_barcode,cm_fsoncode,cm_sncode,cm_indate,cm_inman," +
+                            "case when cm_status=0 then '上线' else '已拆解' end cm_status from craftmaterial where cm_barcode='" + sn_code.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        BaseUtil.FillDgvWithDataTable(CraftMaterial, dt);
+                    }
                 }
                 else MessageBox.Show("序列号" + sn_code.Text + "不存在");
             }
@@ -390,7 +408,7 @@ namespace UAS_MES_NEW.Query
                         Param.Text = j + " " + StepName[j];
                         Param.Name = j + Step[j] + "_label";
                         Param.AutoSize = true;
-                        Param.Margin = new Padding(0, 0, 0, 0);
+                        Param.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
                         Param.Anchor = AnchorStyles.Left;
                         Param.Anchor = AnchorStyles.Top;
                         //获取param的宽度和高度

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.resx

@@ -120,6 +120,9 @@
   <metadata name="mp_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MP_RESULT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mp_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -135,6 +138,9 @@
   <metadata name="ma_craftcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MP_SNCHECKNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="sc_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,4 +150,22 @@
   <metadata name="em_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="cm_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cm_fsoncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cm_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="当前状态.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cm_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cm_inman.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_JC/Main.Designer.cs

@@ -86,10 +86,11 @@
             this.MainTabControl.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(167, 32);
+            this.MainTabControl.Location = new System.Drawing.Point(334, 64);
+            this.MainTabControl.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(811, 565);
+            this.MainTabControl.Size = new System.Drawing.Size(1622, 1130);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.Selected += new System.Windows.Forms.TabControlEventHandler(this.MainTabControl_Selected);
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
@@ -113,15 +114,16 @@
             this.NavBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NavBar.LinkInterval = 2;
             this.NavBar.Location = new System.Drawing.Point(0, 0);
+            this.NavBar.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.NavBar.Name = "NavBar";
             this.NavBar.NavigationPaneGroupClientHeight = 300;
-            this.NavBar.OptionsNavPane.ExpandedWidth = 167;
+            this.NavBar.OptionsNavPane.ExpandedWidth = 334;
             this.NavBar.OptionsNavPane.ShowOverflowButton = false;
             this.NavBar.OptionsNavPane.ShowOverflowPanel = false;
             this.NavBar.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane;
             this.NavBar.ShowGroupHint = false;
             this.NavBar.ShowLinkHint = false;
-            this.NavBar.Size = new System.Drawing.Size(167, 597);
+            this.NavBar.Size = new System.Drawing.Size(334, 1248);
             this.NavBar.TabIndex = 8;
             this.NavBar.Text = " ";
             this.NavBar.SizeChanged += new System.EventHandler(this.NavBar_SizeChanged);
@@ -223,28 +225,32 @@
             this.barDockControl1.CausesValidation = false;
             this.barDockControl1.Dock = System.Windows.Forms.DockStyle.Top;
             this.barDockControl1.Location = new System.Drawing.Point(0, 0);
-            this.barDockControl1.Size = new System.Drawing.Size(978, 0);
+            this.barDockControl1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.barDockControl1.Size = new System.Drawing.Size(1956, 0);
             // 
             // barDockControl2
             // 
             this.barDockControl2.CausesValidation = false;
             this.barDockControl2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.barDockControl2.Location = new System.Drawing.Point(0, 597);
-            this.barDockControl2.Size = new System.Drawing.Size(978, 27);
+            this.barDockControl2.Location = new System.Drawing.Point(0, 1248);
+            this.barDockControl2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.barDockControl2.Size = new System.Drawing.Size(1956, 0);
             // 
             // barDockControl3
             // 
             this.barDockControl3.CausesValidation = false;
             this.barDockControl3.Dock = System.Windows.Forms.DockStyle.Left;
             this.barDockControl3.Location = new System.Drawing.Point(0, 0);
-            this.barDockControl3.Size = new System.Drawing.Size(0, 597);
+            this.barDockControl3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.barDockControl3.Size = new System.Drawing.Size(0, 1248);
             // 
             // barDockControl4
             // 
             this.barDockControl4.CausesValidation = false;
             this.barDockControl4.Dock = System.Windows.Forms.DockStyle.Right;
-            this.barDockControl4.Location = new System.Drawing.Point(978, 0);
-            this.barDockControl4.Size = new System.Drawing.Size(0, 597);
+            this.barDockControl4.Location = new System.Drawing.Point(1956, 0);
+            this.barDockControl4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.barDockControl4.Size = new System.Drawing.Size(0, 1248);
             // 
             // barButtonItem1
             // 
@@ -400,18 +406,19 @@
             this.headBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.headBar1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.headBar1.Location = new System.Drawing.Point(167, 0);
+            this.headBar1.Location = new System.Drawing.Point(334, 0);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(12, 12, 12, 12);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(811, 32);
+            this.headBar1.Size = new System.Drawing.Size(1622, 62);
             this.headBar1.TabIndex = 13;
             this.headBar1.Title = "UAS制造执行系统";
             this.headBar1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.headBar_MouseDown);
             // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(978, 624);
+            this.ClientSize = new System.Drawing.Size(1956, 1248);
             this.Controls.Add(this.headBar1);
             this.Controls.Add(this.NavBar);
             this.Controls.Add(this.MainTabControl);
@@ -421,6 +428,7 @@
             this.Controls.Add(this.barDockControl1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
@@ -428,7 +436,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NavBar)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.BarManagerBottom)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS_MES_JC/Main.resx

@@ -117,8 +117,11 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="NavBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="BarManagerBottom.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>39, 20</value>
+    <value>158, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

UAS_MES_JC/PublicMethod/LogicHandler.cs

@@ -1168,7 +1168,7 @@ namespace UAS_MES_NEW.PublicMethod
                             return false;
                         }
                     }
-                    if (!dh.CheckExist("singleboard", "sb_sncode='" + iSN + "' and sb_status=2"))
+                    if (!dh.CheckExist("makeserial", "ms_sncode='" + iSN + "' and ms_status=2"))
                     {
                         ErrMessage = "单板条码" + iSN + "未完成测试";
                         return false;

UAS_MES_JC/UAS_MES_JC.csproj

@@ -646,6 +646,12 @@
     <Compile Include="FunctionCode\Make\Make_SmtTestCollection.Designer.cs">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_TestCollectionModule.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_TestCollectionModule.Designer.cs">
+      <DependentUpon>Make_TestCollectionModule.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_TestCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -664,12 +670,6 @@
     <Compile Include="FunctionCode\Make\Make_TestCollectionOnlyBad.Designer.cs">
       <DependentUpon>Make_TestCollectionOnlyBad.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.Designer.cs">
-      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Make\Make_SingleBoard.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1542,6 +1542,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollectionModule.resx">
+      <DependentUpon>Make_TestCollectionModule.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection.resx">
       <DependentUpon>Make_TestCollection.cs</DependentUpon>
     </EmbeddedResource>
@@ -1551,9 +1554,6 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_TestCollectionOnlyBad.resx">
       <DependentUpon>Make_TestCollectionOnlyBad.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_DCW.resx">
-      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SingleBoard.resx">
       <DependentUpon>Make_SingleBoard.cs</DependentUpon>
     </EmbeddedResource>