Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -409,10 +409,22 @@ namespace formula_manage
                 } else return;
             }
 
+            int t = RRODUCTdataTable.Rows.Count;  //获取数据行包含空白行
+    
+            for (int i=0; i < t; i++)
+            {
+                DataRow row = RRODUCTdataTable.Rows[i];  //ID列
+                row.BeginEdit();
+                row["DYELOT"] = Number.Text;
+                row["ReDye"] = int.Parse(ReDye.Text);
+
+                row.EndEdit();
                 
 
+            }
+            RRODUCTdataTable.Rows[t].Delete();
+            RRODUCTdataTable.AcceptChanges();
 
-            /*
 
 
             //      SqlCommand insertcommand = new SqlCommand("INSERT INTO [Dispensing].[dbo].[DYELOTS_RECIPE]([CompanyName],[CompanyCode],[Address],[Owner],[Memo])" +"VALUES(@CompanyName, @CompanyCode,@Address,@Owner,@Memo)", conn_SC);
@@ -433,11 +445,10 @@ namespace formula_manage
               bulkCopy.ColumnMappings.Add("UNIT", "UNIT");
               bulkCopy.ColumnMappings.Add("Process", "Process");
               bulkCopy.ColumnMappings.Add("REMARK", "REMARK");
-            bulkCopy.WriteToServer(RRODUCTdataTable);
-            //bulkCopy.WriteToServerAsync(DYELOTS_RECIPE);//将传入的数据写到数据库；
+              bulkCopy.WriteToServer(RRODUCTdataTable); //将传入的数据写到数据库；
+
 
               
-            */
 
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";