拆解处理微调

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -71,10 +71,10 @@ namespace UAS_MES.Make
                         BaseUtil.SetFormValue(this.Controls, dt);
                         if (dt.Rows[0][6].ToString() == "")
                         {
-                            LoadData(ms_makecode.Text);
+                            LoadData(ms_makecode.Text,sender,e);
                         }
                         else {
-                            LoadData(dt.Rows[0][6].ToString());
+                            LoadData(dt.Rows[0][6].ToString(),sender,e);
                         }
                     }
                     else
@@ -98,7 +98,7 @@ namespace UAS_MES.Make
         }
 
 
-        private void LoadData(string sncode)
+        private void LoadData(string sncode,object sender,KeyEventArgs e)
         {
             sncode_1 = sncode;
             sql.Clear();
@@ -112,6 +112,7 @@ namespace UAS_MES.Make
             else {
                 OperateResult.AppendText(">>序列号"+ ms_sncode.Text + "无上料数据\n", Color.Red);              
             }
+            LoadBadcode(sender,e);
         }
 
 
@@ -163,7 +164,6 @@ namespace UAS_MES.Make
                 }
                 else
                 {
-                    rowindex = e.RowIndex;
                     Make_NewBadCode badcode = new Make_NewBadCode(ms_sncode.Text, ms_makecode.Text);
                     BaseUtil.SetFormCenter(badcode);
                     badcode.FormClosed += LoadBadcode;
@@ -190,7 +190,10 @@ namespace UAS_MES.Make
                     bgcode[i] = dt.Rows[i]["mb_bgcode"].ToString();
                     bccode[i] = dt.Rows[i]["mb_badcode"].ToString();
                 }            
-                LabelDataGridView.Rows[rowindex].Cells["mb_badcode"].Value = sql.GetString();
+                for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
+                {
+                    LabelDataGridView.Rows[i].Cells["mb_badcode"].Value = sql.GetString();
+                }
             }
         }
 
@@ -261,7 +264,7 @@ namespace UAS_MES.Make
             {
                 count++;
                 deccount.Text = count + "";
-                LoadData(sncode_1);
+                LoadData(sncode_1,sender, new KeyEventArgs(Keys.Enter));
             }
             else {
                 OperateResult.AppendText("没有选择拆解项\n", Color.Red);