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

ViewModel/MainWindowViewModel.cs

@@ -38,13 +38,14 @@ namespace formula_manage.ViewModel
     ///
     public class MainWindowViewModel : ViewModelBase
     {
-        DataTable DissolvedataTable = new DataTable();   //建立Dissolve缓存
-        DataTable STUFFdataTable = new DataTable();   //建立STUFF缓存
-        DataTable MACHINEdataTable = new DataTable();   //建立Machine缓存
-        DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT缓存
-        DataTable RecipedataTable = new DataTable();   //建立Recipe缓存
+        DataTable DissolvedataTable = new DataTable();   //建立Dissolve
+        DataTable STUFFdataTable = new DataTable();   //建立STUFF
+        DataTable MACHINEdataTable = new DataTable();   //建立Machine
+        DataTable RRODUCTdataTable = new DataTable();   //建立RRODUCT
+        DataTable RecipedataTable = new DataTable();   //建立Recipe
 
         public static DataTable STUFFdatatemp = new DataTable();   //建立STUFF缓存
+        public static DataTable MACHINEdatatemp = new DataTable();   //建立Machine缓存
 
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
         public string sys_Time;  //显示系统时间
@@ -113,6 +114,7 @@ namespace formula_manage.ViewModel
             flow_Workflow = ToObservableCollection<Workflow>(DissolvedataTable);
 
             STUFFdatatemp = STUFFdataTable;
+            MACHINEdatatemp = MACHINEdataTable;
 
         }