Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

ViewModel/MainWindowViewModel.cs

@@ -17,15 +17,14 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Windows.Threading;
 
-
 namespace formula_manage.ViewModel
 {
 ///<Summary>
 /// RRODUCTiewModel
 ///</Summary>
+///
 public class MainWindowViewModel : ViewModelBase
     {
-
         DataTable DissolvedataTable = new DataTable();   //建立Dissolve缓存
         DataTable STUFFdataTable = new DataTable();   //建立STUFF缓存
         DataTable MACHINEdataTable = new DataTable();   //建立Machine缓存
@@ -73,15 +72,18 @@ public class MainWindowViewModel : ViewModelBase
                 Stuff_data.Fill(STUFFdataTable);    //stuff查询结果存入缓存  
                 Mac_data.Fill(MACHINEdataTable);    //machine查询结果存入缓存  
                 Dissolve_data.Fill(DissolvedataTable);    //machine查询结果存入缓存  
-
+               
                 conn_SC.Close();  //关闭连接
+               
+
+               
             }
             catch (Exception)
             {
                 System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
                 return;
             }
-         
+            
          //   IEnumerable STUFFdata = STUFFdataTable.DefaultView;
             // Machine.ItemsSource = MACHINEdataTable.DefaultView; // MACHINEdataTable数据集传递到ComboBox：machine
             //  Workflow.ItemsSource = DissolvedataTable.DefaultView; // DissolvedataTable数据集传递到ComboBox：Workflow
@@ -93,10 +95,14 @@ public class MainWindowViewModel : ViewModelBase
         {
             sql_();
 
+
+            
+            
+
             //  public ObservableCollection (System.Collections.Generic.List<T> list);
             //   BarCollection = (ObservableCollection<BarModel>)STUFFdataTable.AsDataView();
             //    var qwe = STUFFdataTable.DefaultView;
-          //  var product =  STUFFdataTable.DefaultView;
+            //  var product =  STUFFdataTable.DefaultView;
 
 
             //    BarCollection = (ObservableCollection<Product>)STUFFdata;
@@ -129,11 +135,11 @@ public class MainWindowViewModel : ViewModelBase
 
                 }    */
 
-            _product = new ObservableCollection<Product>
-            {
-                new Product{ ProductCode= "132",ProductName= "123", ProductType= 12,Concentration= 12}
-            };
-            
+            //  _product = new ObservableCollection<Product>((IEnumerable<Product>));
+            //  {
+            // new Product{ ProductCode= STUFFdataTable.Rows,ProductName= "123", ProductType= 12,Concentration= 12}
+            //   };
+
 
         }