SMT采集界面表格赋值BUG修改

UAS-MES/DbFind.cs

@@ -244,12 +244,13 @@ namespace UAS_MES
                 }
                 else
                 {
-                    if ((SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct != null && ct.Tag != null && ct.Tag.ToString() == dt.Columns[i].Caption)) && ct.Name.ToString().ToUpper() == SetValueField[j].ToUpper())
-                        ct.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                     if (ct.Name == MainField)
                     {
                         MainControl = ct;
                     }
+                    if ((SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct != null && ct.Tag != null && ct.Tag.ToString() == dt.Columns[i].Caption)) && ct.Name.ToString().ToUpper() == SetValueField[j].ToUpper())
+                        ct.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
+                 
                 }
             }
         }

UAS-MES/FunctionCode/Make/Make_SmtTestCollection.cs

@@ -867,6 +867,7 @@ namespace UAS_MES.Make
 
         private void Prodcode_DbChange(object sender, EventArgs e)
         {
+            MakeBadView.EndEdit();
             if (bd_soncode.Text != "")
             {
                 for (int i = 0; i < MakeBadView.Rows.Count + 1; i++)

UAS_MES_NEW/DbFind.cs

@@ -244,12 +244,12 @@ namespace UAS_MES_NEW
                 }
                 else
                 {
-                    if ((SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct != null && ct.Tag != null && ct.Tag.ToString() == dt.Columns[i].Caption)) && ct.Name.ToString().ToUpper() == SetValueField[j].ToUpper())
-                        ct.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                     if (ct.Name == MainField)
                     {
                         MainControl = ct;
                     }
+                    if ((SetValueField[j] == dt.Columns[i].Caption || SetValueField[j] == dt.Columns[i].ColumnName || SetValueField[j].Contains(dt.Columns[i].Caption) || (ct != null && ct.Tag != null && ct.Tag.ToString() == dt.Columns[i].Caption)) && ct.Name.ToString().ToUpper() == SetValueField[j].ToUpper())
+                        ct.Text = DbFindGridView.Rows[e.RowIndex].Cells[dt.Columns[i].ColumnName].Value.ToString();
                 }
             }
         }

UAS_MES_NEW/FunctionCode/Make/Make_SmtTestCollection.cs

@@ -867,6 +867,7 @@ namespace UAS_MES_NEW.Make
 
         private void Prodcode_DbChange(object sender, EventArgs e)
         {
+            MakeBadView.EndEdit();
             if (bd_soncode.Text != "")
             {
                 for (int i = 0; i < MakeBadView.Rows.Count + 1; i++)