From 40199b6cde246c3729c36508989a03f8f7574c30 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Thu, 26 Oct 2023 16:48:00 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=A7=84=E8=8C=83=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/GelerWeterControl.cs          |  2 ++
 .../AutoControl/InitAction.cs                 | 33 ++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
index aa23e9e..3b38dec 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
@@ -232,6 +232,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                         MessageBox.Show("请选择一条产线！");
                         return;
                 }
+
+                MessageBox.Show("数据下传成功！");
             }
 
             #endregion
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
index f49e784..b70ad40 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
@@ -59,21 +59,24 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 ControlsEntity.ChooseMaterial2.SelectedIndex = -1;
             }
 
-            ControlsEntity.MaterialWeight1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Set;
-            ControlsEntity.MaterialWeight2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Set;
-            ControlsEntity.MaterialTolerance1.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[0].Tolerance;
-            ControlsEntity.MaterialTolerance2.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipePlcViews[1].Tolerance;
-            ControlsEntity.GelSpeedSet.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[0].MixSpeed;
-            ControlsEntity.GelPosTimeA.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTemp;
-            ControlsEntity.GelNagTimeB.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixSpeed;
-            ControlsEntity.GelPosTimeC.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[2].MixTime;
-            ControlsEntity.GelWaterTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[4].MixTime;
-            ControlsEntity.GelWaitTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[6].MixTime;
-            ControlsEntity.GelCloseHeatTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTime;
-            ControlsEntity.GelOutDelayTime.MCValue = LjPlanningPlcHelp.GetGelatG1.RecipeSteps[7].MixTemp;
-            ControlsEntity.WetDryWeight.MCValue = LjPlanningPlcHelp.GetWeterM1[1].SetValue;
-            ControlsEntity.WetMixTime.MCValue = LjPlanningPlcHelp.GetWeterM1[2].MixTime;
-            ControlsEntity.WetOutDelayTime.MCValue = LjPlanningPlcHelp.GetWeterM1[4].MixTime;
+            var getGelatG1 = LjPlanningPlcHelp.GetGelatG1;
+            var getWeterM1 = LjPlanningPlcHelp.GetWeterM1;
+
+            ControlsEntity.MaterialWeight1.MCValue = getGelatG1.RecipePlcViews[0].Set;
+            ControlsEntity.MaterialWeight2.MCValue = getGelatG1.RecipePlcViews[1].Set;
+            ControlsEntity.MaterialTolerance1.MCValue = getGelatG1.RecipePlcViews[0].Tolerance;
+            ControlsEntity.MaterialTolerance2.MCValue = getGelatG1.RecipePlcViews[1].Tolerance;
+            ControlsEntity.GelSpeedSet.MCValue = getGelatG1.RecipeSteps[0].MixSpeed;
+            ControlsEntity.GelPosTimeA.MCValue = getGelatG1.RecipeSteps[2].MixTemp;
+            ControlsEntity.GelNagTimeB.MCValue = getGelatG1.RecipeSteps[2].MixSpeed;
+            ControlsEntity.GelPosTimeC.MCValue = getGelatG1.RecipeSteps[2].MixTime;
+            ControlsEntity.GelWaterTime.MCValue = getGelatG1.RecipeSteps[4].MixTime;
+            ControlsEntity.GelWaitTime.MCValue = getGelatG1.RecipeSteps[6].MixTime;
+            ControlsEntity.GelCloseHeatTime.MCValue = getGelatG1.RecipeSteps[7].MixTime;
+            ControlsEntity.GelOutDelayTime.MCValue = getGelatG1.RecipeSteps[7].MixTemp;
+            ControlsEntity.WetDryWeight.MCValue = getWeterM1[1].SetValue;
+            ControlsEntity.WetMixTime.MCValue = getWeterM1[2].MixTime;
+            ControlsEntity.WetOutDelayTime.MCValue = getWeterM1[4].MixTime;
         }
 
         /// <summary>