Merge branch 'dep_yangw' of http://175.27.215.92:3000/yangw/ProductionSystem into dep_yangw

ProductionSystem/Forms/HomeFormInfo.cs

@@ -2501,8 +2501,8 @@ namespace ProductionSystem.Forms
                             //Program.GastankPressData[i] = Convert.ToSingle(random.NextDouble() * 60 + 600);
                             //Program.XVibrateData[i] = Convert.ToSingle(random.NextDouble() * 60 + 800);
                             //Program.YVibrateData[i] = Convert.ToSingle(random.NextDouble() * 60 + 1000);
-                            var product = result2Service.QueryLatestStep(Program.ProductType, GetCode());
-                            var electricity = product.Electricity;
+                            var sbElecttricity = result2Service.QueryLatestStep(Program.ProductType, GetCode(),GetStep());
+                            var electricity = sbElecttricity.Electricity;
                             Program.CurrentData[i] = float.Parse(electricity);
                             Program.Times[i] = DateTime.Now.AddSeconds(i - 1000);
 

ProductionSystem_Service/TResult2Service.cs

@@ -37,9 +37,10 @@ namespace ProductionSystem_Service
         /// <param name="productType"></param>
         /// <param name="productBarcode"></param>
         /// <returns></returns>
-        public T_Result2 QueryLatestStep(string productType,string productBarcode)
+        public T_Result2 QueryLatestStep(string productType,string productBarcode,string step)
         {
-            return db.Queryable<T_Result2>().Where(m => m.ProductType == productType && m.ProductBarcode.Contains(productBarcode) && m.Electricity != "0" && m.Electricity != "0,000").First();
+            return db.Queryable<T_Result2>().Where(m => m.ProductType == productType && m.ProductBarcode.Contains(productBarcode)
+            && m.Step == step && m.Electricity != "0" && m.Electricity != "0,000").First();
         }
 
         /// <summary>