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

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -141,7 +141,7 @@ namespace UAS_MES.Make
                                 }
                                 //工单信息
                                 sql.Clear();
-                                sql.Append("select ma_salecode,ma_prodcode,ma_craftname,ma_inqty,ma_craftcode,ma_qty,nvl(ma_inqty,0) ma_inqty,");
+                                sql.Append("select ma_salecode,nvl(ma_checksacode,0)ma_checksacode,ma_prodcode,ma_craftname,ma_inqty,ma_craftcode,ma_qty,nvl(ma_inqty,0) ma_inqty,");
                                 sql.Append("nvl(ma_scrapqty,0)ma_scrapqty,ma_id,nvl(ma_unlimitin,0) ma_unlimitin,ma_wccode,NVL(re_autodecom,0)");
                                 sql.Append("re_autodecom,re_code from make left join rework on ma_screcode=re_code where ");
                                 sql.Append("ma_code='" + ma_code.Text + "'and ma_kind='返工' and  ma_statuscode='STARTED'");
@@ -149,6 +149,7 @@ namespace UAS_MES.Make
                                 string ma_prodcode = MaInf.Rows[0]["ma_prodcode"].ToString();
                                 string ma_salecode = MaInf.Rows[0]["ma_salecode"].ToString();
                                 string re_autodecom = MaInf.Rows[0]["re_autodecom"].ToString();
+                                string ma_checksacode = MaInf.Rows[0]["ma_checksacode"].ToString();
                                 string re_code = MaInf.Rows[0]["re_code"].ToString();
                                 int ma_unlimitin = int.Parse(MaInf.Rows[0]["ma_unlimitin"].ToString());
                                 int ma_inqty = int.Parse(MaInf.Rows[0]["ma_inqty"].ToString());
@@ -159,10 +160,13 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>序列号所属产品" + ms_prodcode + "与返工工单产品不一致\n", Color.Red, sn_code);
                                     return;
                                 }
-                                if (ms_salecode != "" && ma_salecode != "" && ms_salecode != ma_salecode)
+                                if (ma_checksacode != "0")
                                 {
-                                    OperateResult.AppendText(">>序列号所属合同" + ms_salecode + "与返工工单合同不一致\n", Color.Red, sn_code);
-                                    return;
+                                    if (ms_salecode != "" && ma_salecode != "" && ms_salecode != ma_salecode)
+                                    {
+                                        OperateResult.AppendText(">>序列号所属合同" + ms_salecode + "与返工工单合同不一致\n", Color.Red, sn_code);
+                                        return;
+                                    }
                                 }
                                 if (ma_unlimitin == 0 && ma_inqty - ma_scrapqty + 1 > ma_qty)
                                 {
@@ -229,6 +233,7 @@ namespace UAS_MES.Make
                                     salecode = SnInf.Rows[0]["ms_salecode"].ToString();
                                     SQLS.Add("update make set ma_salecode='" + salecode + "' where ma_id='" + ma_id.Text + "'");
                                 }
+                                //插入返工工单
                                 sql.Clear();
                                 sql.Append("insert into MakeSerial(ms_id,ms_code,ms_sncode,ms_prodcode,ms_indate,ms_wccode");
                                 sql.Append(",ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode,ms_linecode");
@@ -240,7 +245,9 @@ namespace UAS_MES.Make
                                 sql.Append("'" + firstsn + "','" + salecode + "','" + mac + "','" + bt + "','" + othcode1 + "','" + othcode2 + "','" + othcode3 + "',");
                                 sql.Append("'" + netcode + "','" + imei1 + "','" + imei2 + "','" + imei3 + "','" + imeid + "','" + othid1 + "','" + othid2 + "','" + othid3 + "')");
                                 SQLS.Add(sql.GetString());
+                                //更新工单数量+1
                                 SQLS.Add("update make set ma_inqty=nvl(ma_inqty,0)+1 where ma_id='" + ma_id.Text + "'");
+                                //更新该序列号的所属工单为返工工单
                                 SQLS.Add("update makeserial set ms_nextmacode='" + ma_code.Text + "' where ms_id='" + Msid + "'");
                                 if (ms_outboxcode != "")
                                 {
@@ -254,11 +261,29 @@ namespace UAS_MES.Make
                                 SQLS.Add(sql.GetString());
                                 if (re_autodecom != "0")
                                 {
+                                    sql.Clear();
+                                    sql.Append("select cm_makecode from craftmaterial left join makeserial where cm_makecode=");
+                                    sql.Append("cm_makecode and ms_sncode=cm_barcode and ms_prodcode=cm_soncode where ms_id='" + Msid + "'");
+                                    DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                    string cm_makecode = "";
+                                    string cm_soncode = "";
+                                    string cm_barcode = "";
+                                    if (dt.Rows.Count > 0)
+                                    {
+                                        cm_makecode = dt.Rows[0]["cm_makecode"].ToString();
+                                        cm_soncode = dt.Rows[0]["cm_soncode"].ToString();
+                                        cm_barcode = dt.Rows[0]["cm_barcode"].ToString();
+                                    }
                                     sql.Clear();
                                     sql.Append("update craftmaterial set cm_status=-1,cm_dropcode='" + re_code + "',cm_dropman='" + User.UserCode + "',cm_dropdate=sysdate where ");
                                     sql.Append("cm_firstsn='" + firstsn + "' and  nvl(cm_status,0)=0 and exists (select 1 from makesndecompose ");
                                     sql.Append("where msd_recode='" + re_code + "' and msd_fsoncode=cm_fsoncode and msd_stepcode=cm_stepcode)");
                                     SQLS.Add(sql.GetString());
+                                    //TSN失效
+                                    sql.Clear();
+                                    sql.Append("update makeserial set ms_nextmacode='' where ms_nextmacode='" + cm_makecode + "'");
+                                    sql.Append(" and ms_sncode='" + cm_barcode + "' and ms_prodcode='" + cm_barcode + "' ");
+                                    SQLS.Add(sql.GetString());
                                 }
                                 dh.ExecuteSQLTran(SQLS.ToArray());
                                 //if (ReWorkAsRelateTSN.Checked)

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -179,7 +179,7 @@ namespace UAS_MES.Make
                             {
                                 //如果勾选了自动生成箱号，在封箱或者首次
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -249,7 +249,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                                 }
                                 ////箱号不存在的情况
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -258,7 +258,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 if (AutoGenBoxCode.Checked && (pa_status.Text == "1" || pa_status.Text == ""))
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                             }
                         }
                         if (pa_outboxcode.Text == "")
@@ -328,7 +328,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                                 }
                                 ////箱号不存在的情况
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -237,7 +237,7 @@ namespace UAS_MES.Make
                             if (dh.getFieldDataByCondition("makeserial", "ms_outboxcode", "ms_id='" + oMsID + "'").ToString() != "")
                                 LoadGridData();
                             else
-                                pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                         }
                         sql.Clear();
                         sql.Append("select pr_code,ms_prodcode,ms_makecode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,");
@@ -274,7 +274,7 @@ namespace UAS_MES.Make
                                     pa_outboxcode.Text = "";
                                     pa_status.Text = "0";
                                     BaseUtil.CleanDGVData(PackageDetail);
-                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pr_code.Text, User.UserCode);
+                                    pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PACKAGE", "", pr_code.Text, User.UserCode);
                                 }
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "特殊", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
                                 {

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

@@ -102,9 +102,9 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1149, 36);
+            this.panel2.Size = new System.Drawing.Size(1293, 43);
             this.panel2.TabIndex = 30;
             // 
             // label1
@@ -112,10 +112,10 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(13, 5);
+            this.label1.Location = new System.Drawing.Point(15, 6);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单信息";
             // 
@@ -123,10 +123,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(383, 262);
+            this.bc_remark_label.Location = new System.Drawing.Point(431, 314);
             this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
-            this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
+            this.bc_remark_label.Size = new System.Drawing.Size(110, 31);
             this.bc_remark_label.TabIndex = 25;
             this.bc_remark_label.Text = "不良备注";
             // 
@@ -134,10 +134,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(285, 659);
+            this.ms_sncode_label.Location = new System.Drawing.Point(321, 791);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.ms_sncode_label.Size = new System.Drawing.Size(86, 31);
             this.ms_sncode_label.TabIndex = 18;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -145,10 +145,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(4, 262);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(4, 314);
             this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
-            this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
+            this.bc_groupcode_label.Size = new System.Drawing.Size(110, 31);
             this.bc_groupcode_label.TabIndex = 24;
             this.bc_groupcode_label.Text = "不良组别";
             // 
@@ -157,10 +157,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(4, 225);
+            this.label2.Location = new System.Drawing.Point(4, 270);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(110, 31);
             this.label2.TabIndex = 0;
             this.label2.Text = "采集信息";
             // 
@@ -168,10 +168,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(4, 312);
+            this.label3.Location = new System.Drawing.Point(4, 374);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(92, 27);
+            this.label3.Size = new System.Drawing.Size(110, 31);
             this.label3.TabIndex = 34;
             this.label3.Text = "不良代码";
             // 
@@ -180,10 +180,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(8, 655);
-            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
+            this.GoodProduct.Location = new System.Drawing.Point(9, 786);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.GoodProduct.Name = "GoodProduct";
-            this.GoodProduct.Size = new System.Drawing.Size(83, 35);
+            this.GoodProduct.Size = new System.Drawing.Size(100, 42);
             this.GoodProduct.TabIndex = 35;
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
@@ -195,10 +195,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(117, 655);
-            this.Reject.Margin = new System.Windows.Forms.Padding(4);
+            this.Reject.Location = new System.Drawing.Point(132, 786);
+            this.Reject.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Reject.Name = "Reject";
-            this.Reject.Size = new System.Drawing.Size(107, 35);
+            this.Reject.Size = new System.Drawing.Size(129, 42);
             this.Reject.TabIndex = 36;
             this.Reject.TabStop = true;
             this.Reject.Text = "不良品";
@@ -214,13 +214,15 @@
             this.columnHeader2,
             this.columnHeader9});
             this.WaitRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WaitRejectList.Location = new System.Drawing.Point(5, 389);
-            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
+            this.WaitRejectList.FullRowSelect = true;
+            this.WaitRejectList.Location = new System.Drawing.Point(6, 467);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.WaitRejectList.Name = "WaitRejectList";
-            this.WaitRejectList.Size = new System.Drawing.Size(353, 256);
+            this.WaitRejectList.Size = new System.Drawing.Size(397, 306);
             this.WaitRejectList.TabIndex = 37;
             this.WaitRejectList.UseCompatibleStateImageBehavior = false;
             this.WaitRejectList.View = System.Windows.Forms.View.Details;
+            this.WaitRejectList.DoubleClick += new System.EventHandler(this.WaitRejectList_DoubleClick);
             // 
             // columnHeader5
             // 
@@ -254,10 +256,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(4, 358);
+            this.label4.Location = new System.Drawing.Point(4, 430);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(92, 27);
+            this.label4.Size = new System.Drawing.Size(110, 31);
             this.label4.TabIndex = 39;
             this.label4.Text = "待选不良";
             // 
@@ -266,10 +268,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(488, 358);
+            this.label5.Location = new System.Drawing.Point(549, 430);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(92, 27);
+            this.label5.Size = new System.Drawing.Size(110, 31);
             this.label5.TabIndex = 40;
             this.label5.Text = "已选不良";
             // 
@@ -277,10 +279,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(855, 225);
+            this.label6.Location = new System.Drawing.Point(962, 270);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(92, 27);
+            this.label6.Size = new System.Drawing.Size(110, 31);
             this.label6.TabIndex = 46;
             this.label6.Text = "操作结果";
             // 
@@ -294,10 +296,10 @@
             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(491, 389);
-            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(552, 467);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
-            this.ChoosedRejectList.Size = new System.Drawing.Size(353, 256);
+            this.ChoosedRejectList.Size = new System.Drawing.Size(397, 306);
             this.ChoosedRejectList.TabIndex = 50;
             this.ChoosedRejectList.UseCompatibleStateImageBehavior = false;
             this.ChoosedRejectList.View = System.Windows.Forms.View.Details;
@@ -333,10 +335,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(960, 230);
+            this.AutoBadCode.Location = new System.Drawing.Point(1080, 276);
             this.AutoBadCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoBadCode.Name = "AutoBadCode";
-            this.AutoBadCode.Size = new System.Drawing.Size(151, 24);
+            this.AutoBadCode.Size = new System.Drawing.Size(180, 28);
             this.AutoBadCode.TabIndex = 69;
             this.AutoBadCode.Text = "自动产生不良代码";
             this.AutoBadCode.UseVisualStyleBackColor = true;
@@ -346,10 +348,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(383, 60);
+            this.ma_qty_label.Location = new System.Drawing.Point(431, 72);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_qty_label.Size = new System.Drawing.Size(110, 31);
             this.ma_qty_label.TabIndex = 11;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -357,10 +359,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(4, 122);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(4, 146);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 7;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -368,10 +370,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(4, 59);
+            this.ms_makecode_label.Location = new System.Drawing.Point(4, 71);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_makecode_label.TabIndex = 2;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -379,10 +381,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(209, 15);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(235, 18);
             this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(110, 31);
             this.mcd_inqty_label.TabIndex = 14;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -390,10 +392,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(21, 15);
+            this.mc_restqty_label.Location = new System.Drawing.Point(24, 18);
             this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mc_restqty_label.Name = "mc_restqty_label";
-            this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mc_restqty_label.Size = new System.Drawing.Size(110, 31);
             this.mc_restqty_label.TabIndex = 17;
             this.mc_restqty_label.Text = "待采集数";
             // 
@@ -412,10 +414,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(716, 58);
+            this.panel1.Location = new System.Drawing.Point(806, 70);
             this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(419, 158);
+            this.panel1.Size = new System.Drawing.Size(471, 189);
             this.panel1.TabIndex = 71;
             // 
             // ob_sendqty
@@ -424,11 +426,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(145, 114);
+            this.ob_sendqty.Location = new System.Drawing.Point(163, 137);
             this.ob_sendqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_sendqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ob_sendqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.ob_sendqty.Name = "ob_sendqty";
-            this.ob_sendqty.Size = new System.Drawing.Size(0, 27);
+            this.ob_sendqty.Size = new System.Drawing.Size(0, 31);
             this.ob_sendqty.TabIndex = 78;
             this.ob_sendqty.Tag = "ob_batchqty";
             // 
@@ -437,10 +439,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(21, 114);
+            this.label7.Location = new System.Drawing.Point(24, 137);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(92, 27);
+            this.label7.Size = new System.Drawing.Size(110, 31);
             this.label7.TabIndex = 77;
             this.label7.Text = "已送检数";
             // 
@@ -449,10 +451,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(380, 112);
+            this.ob_checkno.Location = new System.Drawing.Point(428, 134);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 27);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 31);
             this.ob_checkno.TabIndex = 76;
             this.ob_checkno.Tag = "ob_checkno";
             this.ob_checkno.Visible = false;
@@ -466,13 +468,13 @@
             this.SendCheck.Enabled = false;
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(305, 112);
+            this.SendCheck.Location = new System.Drawing.Point(343, 134);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(87, 32);
+            this.SendCheck.Size = new System.Drawing.Size(98, 38);
             this.SendCheck.TabIndex = 72;
             this.SendCheck.Text = "送检";
             this.SendCheck.UseVisualStyleBackColor = false;
@@ -484,11 +486,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(145, 64);
+            this.ob_batchqty.Location = new System.Drawing.Point(163, 77);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_batchqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ob_batchqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 31);
             this.ob_batchqty.TabIndex = 75;
             this.ob_batchqty.Tag = "ob_batchqty";
             // 
@@ -497,10 +499,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(21, 64);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(24, 77);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(110, 31);
             this.ob_batchqty_label.TabIndex = 74;
             this.ob_batchqty_label.Text = "抽检批数";
             // 
@@ -510,11 +512,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(331, 64);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(372, 77);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 31);
             this.ob_nowcheckqty.TabIndex = 73;
             this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
             // 
@@ -523,10 +525,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(209, 64);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(235, 77);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(110, 31);
             this.ob_nowcheckqty_label.TabIndex = 72;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
@@ -535,11 +537,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(145, 15);
+            this.mcd_remainqty.Location = new System.Drawing.Point(163, 18);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 31);
             this.mcd_remainqty.TabIndex = 57;
             this.mcd_remainqty.Tag = "mcd_remainqty";
             // 
@@ -548,11 +550,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(331, 15);
+            this.mcd_inqty.Location = new System.Drawing.Point(372, 18);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_inqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 31);
             this.mcd_inqty.TabIndex = 54;
             this.mcd_inqty.Tag = "mcd_inqty";
             // 
@@ -560,10 +562,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(383, 122);
+            this.pr_detail_label.Location = new System.Drawing.Point(431, 146);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
             this.pr_detail_label.TabIndex = 6;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -574,13 +576,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(683, 658);
+            this.Save.Location = new System.Drawing.Point(768, 790);
             this.Save.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(87, 32);
+            this.Save.Size = new System.Drawing.Size(98, 38);
             this.Save.TabIndex = 70;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -592,11 +594,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(125, 312);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(4);
+            this.bc_code.Location = new System.Drawing.Point(141, 374);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
-            this.bc_code.Size = new System.Drawing.Size(233, 28);
+            this.bc_code.Size = new System.Drawing.Size(262, 32);
             this.bc_code.Str = null;
             this.bc_code.Str1 = null;
             this.bc_code.Str2 = null;
@@ -610,14 +612,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(124, 59);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Location = new System.Drawing.Point(140, 71);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(157, 26);
+            this.ma_code.Size = new System.Drawing.Size(177, 31);
             this.ma_code.TabIndex = 67;
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
@@ -629,10 +631,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(299, 61);
+            this.LockMakeCode.Location = new System.Drawing.Point(336, 73);
             this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
             this.LockMakeCode.TabIndex = 66;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -642,11 +644,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(507, 122);
+            this.pr_detail.Location = new System.Drawing.Point(570, 146);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 56;
             // 
             // ma_qty
@@ -654,11 +656,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(505, 60);
+            this.ma_qty.Location = new System.Drawing.Point(568, 72);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 27);
+            this.ma_qty.Size = new System.Drawing.Size(0, 31);
             this.ma_qty.TabIndex = 55;
             // 
             // ma_prodcode
@@ -666,21 +668,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(125, 122);
+            this.ma_prodcode.Location = new System.Drawing.Point(141, 146);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             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(859, 262);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(966, 314);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(275, 383);
+            this.OperateResult.Size = new System.Drawing.Size(309, 459);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -691,13 +693,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(957, 658);
-            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
+            this.CleanInfo.Location = new System.Drawing.Point(1077, 790);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(81, 30);
+            this.CleanInfo.Size = new System.Drawing.Size(91, 36);
             this.CleanInfo.TabIndex = 47;
             this.CleanInfo.Text = "清除内容";
             this.CleanInfo.UseVisualStyleBackColor = true;
@@ -706,10 +708,10 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(389, 470);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
+            this.ChooseedReject.Location = new System.Drawing.Point(438, 564);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ChooseedReject.Name = "ChooseedReject";
-            this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
+            this.ChooseedReject.Size = new System.Drawing.Size(75, 35);
             this.ChooseedReject.TabIndex = 45;
             this.ChooseedReject.UseVisualStyleBackColor = true;
             this.ChooseedReject.Click += new System.EventHandler(this.ChooseedReject_Click);
@@ -717,10 +719,10 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(389, 549);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
+            this.WaitReject.Location = new System.Drawing.Point(438, 659);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.WaitReject.Name = "WaitReject";
-            this.WaitReject.Size = new System.Drawing.Size(67, 29);
+            this.WaitReject.Size = new System.Drawing.Size(75, 35);
             this.WaitReject.TabIndex = 44;
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
@@ -730,12 +732,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(493, 264);
-            this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
+            this.bc_remark.Location = new System.Drawing.Point(555, 317);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
-            this.bc_remark.Size = new System.Drawing.Size(351, 76);
+            this.bc_remark.Size = new System.Drawing.Size(394, 90);
             this.bc_remark.Str = null;
             this.bc_remark.Str1 = null;
             this.bc_remark.Str2 = null;
@@ -745,10 +747,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(125, 264);
-            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
+            this.bc_groupcode.Location = new System.Drawing.Point(141, 317);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.bc_groupcode.Name = "bc_groupcode";
-            this.bc_groupcode.Size = new System.Drawing.Size(233, 26);
+            this.bc_groupcode.Size = new System.Drawing.Size(262, 30);
             this.bc_groupcode.TabIndex = 21;
             this.bc_groupcode.SelectedIndexChanged += new System.EventHandler(this.bc_groupcode_SelectedIndexChanged);
             // 
@@ -758,11 +760,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(400, 659);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_sncode.Location = new System.Drawing.Point(450, 791);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(240, 28);
+            this.ms_sncode.Size = new System.Drawing.Size(270, 32);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -775,21 +777,21 @@
             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(125, 182);
+            this.ma_softversion.Location = new System.Drawing.Point(141, 218);
             this.ma_softversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_softversion.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_softversion.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 27);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 73;
             // 
             // ma_softversion_label
             // 
             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(4, 182);
+            this.ma_softversion_label.Location = new System.Drawing.Point(4, 218);
             this.ma_softversion_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_softversion_label.Name = "ma_softversion_label";
-            this.ma_softversion_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_softversion_label.Size = new System.Drawing.Size(110, 31);
             this.ma_softversion_label.TabIndex = 72;
             this.ma_softversion_label.Text = "软件版本";
             // 
@@ -799,10 +801,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(388, 185);
+            this.NoteForChange.Location = new System.Drawing.Point(436, 222);
             this.NoteForChange.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.NoteForChange.Name = "NoteForChange";
-            this.NoteForChange.Size = new System.Drawing.Size(121, 24);
+            this.NoteForChange.Size = new System.Drawing.Size(144, 28);
             this.NoteForChange.TabIndex = 75;
             this.NoteForChange.Text = "切换工单提示";
             this.NoteForChange.UseVisualStyleBackColor = true;
@@ -811,19 +813,20 @@
             // 
             this.Filter.BackColor = System.Drawing.Color.Transparent;
             this.Filter.Font = new System.Drawing.Font("宋体", 10.8F);
-            this.Filter.Location = new System.Drawing.Point(124, 357);
+            this.Filter.Location = new System.Drawing.Point(140, 428);
+            this.Filter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Filter.Name = "Filter";
             this.Filter.PlaceHolder = "不良名称搜索";
-            this.Filter.Size = new System.Drawing.Size(234, 28);
+            this.Filter.Size = new System.Drawing.Size(263, 34);
             this.Filter.TabIndex = 76;
             this.Filter.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnTextChange(this.Filter_UserControlTextChanged);
             // 
             // Make_TestCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(1149, 700);
+            this.ClientSize = new System.Drawing.Size(1293, 840);
             this.Controls.Add(this.Filter);
             this.Controls.Add(this.NoteForChange);
             this.Controls.Add(this.ma_softversion);
@@ -863,7 +866,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -252,6 +252,7 @@ namespace UAS_MES.Make
         private void bc_groupcode_SelectedIndexChanged(object sender, EventArgs e)
         {
             LoadBadCodeListView();
+            Filter.Text = "";
         }
 
         /// <summary>
@@ -522,6 +523,8 @@ namespace UAS_MES.Make
                 {
                     LastSncode = ms_sncode.Text;
                     OperateResult.AppendText(">>" + ms_sncode.Text + "成功采集为不良\n", Color.Green);
+                    //采集完不良，聚焦序列号
+                    ms_sncode.Focus();
                     //记录操作日志
                     ms_sncode.Text = "";
                     //清除不良信息
@@ -731,5 +734,17 @@ namespace UAS_MES.Make
 
             }
         }
+
+        private void WaitRejectList_DoubleClick(object sender, EventArgs e)
+        {
+            for (int i = WaitRejectList.Items.Count - 1; i >= 0; i--)
+            {
+                if (WaitRejectList.Items[i].Checked)
+                {
+                    //双击右移
+                    ChooseedReject.PerformClick();
+                }
+            }
+        }
     }
 }

UAS-MES/Login.Designer.cs

@@ -52,8 +52,9 @@
             this.UserName.Location = new System.Drawing.Point(94, 62);
             this.UserName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.UserName.Name = "UserName";
-            this.UserName.Size = new System.Drawing.Size(200, 23);
+            this.UserName.Size = new System.Drawing.Size(200, 27);
             this.UserName.TabIndex = 0;
+            this.UserName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.UserName_KeyDown);
             // 
             // PassWord
             // 
@@ -61,7 +62,7 @@
             this.PassWord.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.PassWord.Name = "PassWord";
             this.PassWord.PasswordChar = '*';
-            this.PassWord.Size = new System.Drawing.Size(200, 23);
+            this.PassWord.Size = new System.Drawing.Size(200, 27);
             this.PassWord.TabIndex = 1;
             this.PassWord.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PassWord_KeyDown);
             // 
@@ -70,7 +71,7 @@
             this.ForGetPwd.AutoSize = true;
             this.ForGetPwd.Location = new System.Drawing.Point(295, 66);
             this.ForGetPwd.Name = "ForGetPwd";
-            this.ForGetPwd.Size = new System.Drawing.Size(68, 17);
+            this.ForGetPwd.Size = new System.Drawing.Size(84, 20);
             this.ForGetPwd.TabIndex = 5;
             this.ForGetPwd.TabStop = true;
             this.ForGetPwd.Text = "忘记密码？";
@@ -81,7 +82,7 @@
             this.label1.AutoSize = true;
             this.label1.Location = new System.Drawing.Point(42, 66);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(44, 17);
+            this.label1.Size = new System.Drawing.Size(54, 20);
             this.label1.TabIndex = 4;
             this.label1.Text = "用户名";
             // 
@@ -90,7 +91,7 @@
             this.label2.AutoSize = true;
             this.label2.Location = new System.Drawing.Point(42, 111);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(44, 17);
+            this.label2.Size = new System.Drawing.Size(51, 20);
             this.label2.TabIndex = 5;
             this.label2.Text = "密   码";
             // 
@@ -118,7 +119,7 @@
             this.label4.AutoSize = true;
             this.label4.Location = new System.Drawing.Point(42, 160);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(44, 17);
+            this.label4.Size = new System.Drawing.Size(51, 20);
             this.label4.TabIndex = 14;
             this.label4.Text = "资   源";
             // 
@@ -127,7 +128,7 @@
             this.Source.Location = new System.Drawing.Point(94, 157);
             this.Source.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Source.Name = "Source";
-            this.Source.Size = new System.Drawing.Size(200, 23);
+            this.Source.Size = new System.Drawing.Size(200, 27);
             this.Source.TabIndex = 2;
             this.Source.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Source_KeyDown);
             // 
@@ -137,7 +138,7 @@
             this.DB.FormattingEnabled = true;
             this.DB.Location = new System.Drawing.Point(94, 204);
             this.DB.Name = "DB";
-            this.DB.Size = new System.Drawing.Size(200, 25);
+            this.DB.Size = new System.Drawing.Size(200, 28);
             this.DB.TabIndex = 3;
             // 
             // label3
@@ -145,7 +146,7 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(42, 209);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(44, 17);
+            this.label3.Size = new System.Drawing.Size(54, 20);
             this.label3.TabIndex = 11;
             this.label3.Text = "数据库";
             // 
@@ -185,7 +186,7 @@
             // 
             // Login
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.BackgroundImage = global::UAS_MES.Properties.Resources.LoginBG;

UAS-MES/Login.cs

@@ -188,7 +188,7 @@ namespace UAS_MES
         private void PassWord_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
-                LoginButton.PerformClick();
+                Source.Focus();
         }
 
         /// <summary>
@@ -226,5 +226,11 @@ namespace UAS_MES
 
             }
         }
+
+        private void UserName_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                PassWord.Focus();
+        }
     }
 }