From 6a80c9d015db1f3f984a810b7d2ad26a0946c3d5 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Fri, 8 Dec 2023 13:47:04 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=87=AA=E5=8A=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E9=80=9F=E5=BA=A6=E5=8F=82=E6=95=B0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/AutoControl.cs                   |  4 ----
 .../AutoControl/PlcAutoWriteHelper.cs            | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
index a783b7a..73d8bfc 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs
+++ b/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
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs
index 0de0813..8d39322 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs
+++ b/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)