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

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

@@ -63,8 +63,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 }
 
                 GelWetDownload(TextE, ComboE, RadioE);
-
-                MessageBox.Show("数据下传成功！");
             }
 
             #endregion
@@ -93,8 +91,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 }
 
                 DryDownload(TextE, ComboE, RadioE);
-
-                MessageBox.Show("数据下传成功！");
             }
 
             #endregion

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

@@ -66,6 +66,12 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 }
             }
 
+            if(GelSpeed > 50)
+            {
+                MessageBox.Show("速度不能大于五十！");
+                return;
+            }
+
             List<RecipePlcView> recipes = new List<RecipePlcView>();
 
             RecipePlcView recipe1 = new RecipePlcView()
@@ -257,6 +263,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             //    MessageBox.Show("湿混糊化产线下传数据不完整，请重新下传数据！");
             //}
 
+            MessageBox.Show("数据下传成功！");
         }
 
         private static bool GWComparePLC(List<RecipePlcView> recipes, List<Step> steps, List<MixStep> mixSteps, MCRadioButtonEntity RadioE)
@@ -361,6 +368,12 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             float drySpeed2 = Convert.ToSingle(TextE.DrySpeed2.MCValue.ToString());
             float drySpeed3 = Convert.ToSingle(TextE.DrySpeed3.MCValue.ToString());
 
+            if (drySpeed1 > 50 || drySpeed2 > 50 || drySpeed3 > 50)
+            {
+                MessageBox.Show("速度值不能大于五十！");
+                return;
+            }
+
             Step dryStep1 = new Step()
             {
                 MixCode = 1,
@@ -415,6 +428,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             //{
             //    MessageBox.Show("干混产线下传数据不完整，请重新下传数据！");
             //}
+
+            MessageBox.Show("数据下传成功！");
+
         }
 
         private static bool DYComparePLC(List<RecipePlcView> recipes, List<Step> steps, MCRadioButtonEntity RadioE)