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

ViewModel/MainWindowViewModel.cs

@@ -95,7 +95,6 @@ namespace formula_manage.ViewModel
                 Dissolve_data.Fill(DissolvedataTable);    //Dissolve_data查询结果存入缓存  
 
                 conn_SC.Close();  //关闭连接
-
             }
             catch (Exception)
             {
@@ -113,6 +112,8 @@ namespace formula_manage.ViewModel
             mac_Machine = ToObservableCollection<Machine>(MACHINEdataTable);
             flow_Workflow = ToObservableCollection<Workflow>(DissolvedataTable);
 
+            STUFFdatatemp = STUFFdataTable;
+
         }
 
         public ObservableCollection<Product> stuff_Product { get; set; }  //stuff_Product动态表实力化