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

ViewModel/RRODUCTViewModel.cs

@@ -11,32 +11,24 @@ using System.Windows.Threading;
 namespace formula_manage.ViewModel
 {
     ///<Summary>
-    /// StuffViewModel
+    /// RRODUCTiewModel
     ///</Summary>
-    public class StuffViewModel : ViewModelBase
+    public class RRODUCTiewModel : ViewModelBase
     {
-        private List<Product> products = new List<Product>();
+       // private List<RRODUCT> products = new List<RRODUCT>();
 
         /// <summary>
-        /// 所有原料
+        /// 
         /// </summary>
-        public List<Product> Product
+      /*  public List<RRODUCT> RRODUCT
         {
-            get
+            
-            {
+        }*/
-                return products;
-            }
-            set
-            {
-                products = value;
-                RaisePropertyChanged();
-            }
-        }
 
         /// <summary>
         /// StuffViewModeldl
         /// </summary>
-        public StuffViewModel()
+        public RRODUCTiewModel()
         {
             //products = new ProductProvider().Select();
             DispatcherTimer timer = new DispatcherTimer//初始化循环，每0.5秒调用一次Tick_Event

formula_manage.csproj

@@ -178,7 +178,7 @@
     <Compile Include="SQLModels\STUFF_Product.cs" />
     <Compile Include="UserClass\IniFile.cs" />
     <Compile Include="UserClass\PressKey.cs" />
-    <Compile Include="ViewModel\StuffViewModel.cs" />
+    <Compile Include="ViewModel\RRODUCTViewModel.cs" />
     <Compile Include="View\Formula.xaml.cs">
       <DependentUpon>Formula.xaml</DependentUpon>
     </Compile>