Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs

@@ -16,6 +16,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Mesnac.Controls.Default;
 using Button = System.Windows.Forms.Button;
+using System.Data;
 
 namespace Mesnac.Action.ChemicalWeighing.AutoControl
 {
@@ -31,7 +32,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             McControls = GetAllControls();
 
             ControlImport();
-           
+
             
 
             BottomSelect(runtime);
@@ -130,6 +131,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
             if (ControlsEntity.Download == runtime.Sender)
             {
+                float GelSpeed;
+                if (float.TryParse(Convert.ToString(ControlsEntity.GelSpeedSet.MCValue), out GelSpeed)
+                    )
+                {
+
+                }
+
                 List<RecipePlcView> recipes = new List<RecipePlcView>();
 
                 RecipePlcView recipe1 = new RecipePlcView()
@@ -148,7 +156,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
                 Step step1 = new Step()
                 {
-
+                    MixSpeed = 
                 };
                 Step step2 = new Step()
                 {