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

MainWindow.xaml.cs

@@ -69,12 +69,12 @@ namespace formula_manage
             this.Closing += Window_Closing;   //添加窗口关闭事件
 
             USER.Text = App.USER_Purview;
-
             RRODUCTdataTable.Columns.Add("ID", typeof(int));
-            RRODUCTdataTable.Columns.Add("DYELOT", typeof(int));
+            RRODUCTdataTable.Columns.Add("DYELOT", typeof(string));
-            RRODUCTdataTable.Columns.Add("STEP", typeof(string));
+            RRODUCTdataTable.Columns.Add("ReDye", typeof(int));
+            RRODUCTdataTable.Columns.Add("STEP", typeof(int));
             RRODUCTdataTable.Columns.Add("PRODUCT_CODE", typeof(string));
-            RRODUCTdataTable.Columns.Add("CONC", typeof(string));
+            RRODUCTdataTable.Columns.Add("CONC", typeof(float));
             RRODUCTdataTable.Columns.Add("SHIFT", typeof(string));
             RRODUCTdataTable.Columns.Add("PRODUCT_NAME", typeof(string));
             RRODUCTdataTable.Columns.Add("TARGET_WT", typeof(float));
@@ -409,10 +409,35 @@ namespace formula_manage
                 } else return;
             }
 
+
+
+
+            /*
+
+
             //      SqlCommand insertcommand = new SqlCommand("INSERT INTO [Dispensing].[dbo].[DYELOTS_RECIPE]([CompanyName],[CompanyCode],[Address],[Owner],[Memo])" +"VALUES(@CompanyName, @CompanyCode,@Address,@Owner,@Memo)", conn_SC);
 
+            SqlConnection destinationConnection = new SqlConnection(Connstr_SC); //创建一个数据库连接；
+            destinationConnection.Open();
+            //SqlBulkCopyColumnMapping()
+            SqlBulkCopy bulkCopy = new SqlBulkCopy(destinationConnection);// 实例化 sqlbulkcopy;
+            bulkCopy.DestinationTableName = "dbo.DYELOTS_RECIPE";// 目标表名称/
+            bulkCopy.ColumnMappings.Add("DYELOT", "Dyelot");
+            bulkCopy.ColumnMappings.Add("ReDye", "ReDye");
+            bulkCopy.ColumnMappings.Add("STEP", "StepNumber");
+            bulkCopy.ColumnMappings.Add("PRODUCT_CODE", "ProductCode");
+            bulkCopy.ColumnMappings.Add("PRODUCT_NAME", "ProductName");
+            bulkCopy.ColumnMappings.Add("CONC", "CONC");
+            bulkCopy.ColumnMappings.Add("SHIFT", "SHIFT");
+            bulkCopy.ColumnMappings.Add("TARGET_WT", "Grams");
+            bulkCopy.ColumnMappings.Add("UNIT", "UNIT");
+            bulkCopy.ColumnMappings.Add("Process", "Process");
+            bulkCopy.ColumnMappings.Add("REMARK", "REMARK");
+            bulkCopy.WriteToServer(RRODUCTdataTable);
+            //bulkCopy.WriteToServerAsync(DYELOTS_RECIPE);//将传入的数据写到数据库；
 
 
+            */
 
             Procedures_N.Text = "1";
             Procedures_P.Text = "1";