From 728f612e6fed414d4591d6f92f2ae2cc0df7be76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Tue, 26 Dec 2023 10:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/AutoControl.cs | 5 + .../Entity/GelerWeterControlsEntity.cs | 2 + .../AutoControl/InitAction.cs | 55 ++++++++++- .../AutoControl/PlcAutoWriteHelper.cs | 93 +++++++++++++++++++ DataBlockHelper/DBHelpers/DB2105Helper.cs | 21 +++++ .../DBHelpers/DB2105WriteHelper.cs | 46 +++++++++ .../Data/MCProject/nodeForm/AutoControlC.xml | 25 +++++ 7 files changed, 246 insertions(+), 1 deletion(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs index ae295e6..9782f5f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs @@ -469,6 +469,11 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl RepairOnOff(LabelE, RadioE); } + if(ButtonE.GRepairMode == runtime.Sender) + { + GRepairOnOff(ButtonE, RadioE); + } + #endregion #region 粘贴数据 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs index 9bdcb27..5570715 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs @@ -79,6 +79,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity public Button GelManualHotWater { get; set; } public Button WetManualGel { get; set; } public Button RepairMode { get; set; } + + public Button GRepairMode { get; set; } public Button DryDownload { get; set; } public Button WaterDownload { get; set; } public Button PasteDry { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs index bbc39f1..f5b651c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs @@ -38,7 +38,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl DB2105Helper dB2105Helper = new DB2105Helper(); DB2104Helper dB2104Helper = new DB2104Helper(); - + Color color; public Timer timer; public void Run(RuntimeParameter runtime) @@ -62,6 +62,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl ControlsHelper.ControlImport(RadioE, McControls); ControlsHelper.ControlImport