From 9d43038d2e5f451ce57c5fa31887f93f3e1c75b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Mon, 26 Feb 2024 09:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/AutoControl.cs | 2 +- .../AutoControl/ControlsHelper.cs | 94 ++++++++++++++++++- .../MCProject/nodeForm/ManualWaterControl.xml | 2 +- 3 files changed, 94 insertions(+), 4 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs index f0e66c5..1681c00 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs @@ -506,7 +506,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl if (ButtonE.PasteWet == runtime.Sender) { int index = ComboE.PasteChooseWet.SelectedIndex + 1; - ControlsHelper.GWInit(index, ComboE, TextE); + ControlsHelper.GWInit2(index, ComboE, TextE); } if (ButtonE.PasteDry == runtime.Sender) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs index dd28cf2..e779b94 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs @@ -149,6 +149,73 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } } + + + public static void GWInit2(int select, MCComboBoxEntity ComboE, MCTextBoxEntity TextE) + { + + var selected = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == select && x.Type == 2).ToList(); + + if (selected.Count != 0) + { + ComboE.ChooseMaterial1.SelectedValue = selected[0].MaterrialId; + ComboE.ChooseMaterial2.SelectedValue = selected[1].MaterrialId; + } + else + { + ComboE.ChooseMaterial1.SelectedIndex = 0; + ComboE.ChooseMaterial2.SelectedIndex = 0; + } + + var getGelatG1 = LjPlanningPlcHelp.GetGelatG1; + var getWeterM1 = LjPlanningPlcHelp.GetWeterM1; + var getGelatG2 = LjPlanningPlcHelp.GetGelatG2; + var getWeterM2 = LjPlanningPlcHelp.GetWeterM2; + var getGelatG3 = LjPlanningPlcHelp.GetGelatG3; + var getWeterM3 = LjPlanningPlcHelp.GetWeterM3; + var getGelatG4 = LjPlanningPlcHelp.GetGelatG4; + var getWeterM4 = LjPlanningPlcHelp.GetWeterM4; + var getGelatG5 = LjPlanningPlcHelp.GetGelatG5; + var getWeterM5 = LjPlanningPlcHelp.GetWeterM5; + var getGelatG6 = LjPlanningPlcHelp.GetGelatG6; + var getWeterM6 = LjPlanningPlcHelp.GetWeterM6; + var getGelatG7 = LjPlanningPlcHelp.GetGelatG7; + var getWeterM7 = LjPlanningPlcHelp.GetWeterM7; + var getGelatG8 = LjPlanningPlcHelp.GetGelatG8; + var getWeterM8 = LjPlanningPlcHelp.GetWeterM8; + + switch (select) + { + case 1: + GWDataShow2(getGelatG1, getWeterM1, TextE); + break; + case 2: + GWDataShow2(getGelatG2, getWeterM2, TextE); + break; + case 3: + GWDataShow2(getGelatG3, getWeterM3, TextE); + break; + case 4: + GWDataShow2(getGelatG4, getWeterM4, TextE); + break; + case 5: + GWDataShow2(getGelatG5, getWeterM5, TextE); + break; + case 6: + GWDataShow2(getGelatG6, getWeterM6, TextE); + break; + case 7: + GWDataShow2(getGelatG7, getWeterM7, TextE); + break; + case 8: + GWDataShow2(getGelatG8, getWeterM8, TextE); + break; + default: + return; + } + } + + public static void DInit(int select, MCComboBoxEntity ComboE, MCTextBoxEntity TextE) { var drtSelected = FreeSqlUnit.Instance.Select(). @@ -283,12 +350,35 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl TextE.GelCloseHeatTime.MCValue = Gel.RecipeSteps[7].MixTime; TextE.GelOutDelayTime.MCValue = Gel.RecipeSteps[7].MixTemp; - //20240221 不更新 - // TextE.WetDryWeight.MCValue = Wet[1].SetValue; + + TextE.WetDryWeight.MCValue = Wet[1].SetValue; TextE.WetMixTime.MCValue = Wet[2].MixTime; TextE.WetOutDelayTime.MCValue = Wet[4].MixTime; } + + public static void GWDataShow2(DryerView Gel, List Wet, MCTextBoxEntity TextE) + { + TextE.MaterialWeight1.MCValue = Gel.RecipePlcViews[0].Set; + TextE.MaterialWeight2.MCValue = Gel.RecipePlcViews[1].Set; + TextE.MaterialTolerance1.MCValue = Gel.RecipePlcViews[0].Tolerance; + TextE.MaterialTolerance2.MCValue = Gel.RecipePlcViews[1].Tolerance; + TextE.GelSpeedSet.MCValue = Gel.RecipeSteps[0].MixSpeed; + TextE.GelPosTimeA.MCValue = Gel.RecipeSteps[2].MixTemp; + TextE.GelNagTimeB.MCValue = Gel.RecipeSteps[2].MixSpeed; + TextE.GelPosTimeC.MCValue = Gel.RecipeSteps[2].MixTime; + TextE.GelWaterTime.MCValue = Gel.RecipeSteps[4].MixTime; + TextE.GelWaitTime.MCValue = Gel.RecipeSteps[6].MixTime; + TextE.GelCloseHeatTime.MCValue = Gel.RecipeSteps[7].MixTime; + TextE.GelOutDelayTime.MCValue = Gel.RecipeSteps[7].MixTemp; + + + //TextE.WetDryWeight.MCValue = Wet[1].SetValue; + TextE.WetMixTime.MCValue = Wet[2].MixTime; + TextE.WetOutDelayTime.MCValue = Wet[4].MixTime; + } + + /// /// 将C#数据实体转化为JSON数据 /// diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index 6ce05c1..95c9870 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -3622,7 +3622,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL False - False + True False Control 1366, 861