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

ViewModel/MainWindowViewModel.cs

@@ -43,8 +43,8 @@ namespace formula_manage.ViewModel
         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 RRODUCTdataTable = new DataTable();   //建立RRODUCT
+      //  DataTable RecipedataTable = new DataTable();   //建立Recipe
 
         public static DataTable STUFFdatatemp = new DataTable();   //建立STUFF缓存
         public static DataTable MACHINEdatatemp = new DataTable();   //建立Machine缓存
@@ -182,7 +182,8 @@ namespace formula_manage.ViewModel
             }
             catch (Exception)
             {
-                System.Windows.MessageBox.Show("请求原料信息失败，检查连接");
+                System.Windows.MessageBox.Show("请求信息失败");
+                UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
                 return;
             }
         }