From 311936e286ab50f7695d05271705b9fd31d979ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Tue, 11 Jun 2024 15:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=95=B0=E6=8D=AE=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControl/Entity/DeviceDetailEntity.cs | 3 +++ .../MainDetailControl/MainDetailControlAction.cs | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index 0282550..441b7e7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -392,6 +392,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public Jzf AS2PCP01 { get; set; } public Jzf AS2PCP02 { get; set; } public Jzf AS2PCP03 { get; set; } + + public Jzf AS2PCP04 { get; set; } + public Jzf AS1OIS01 { get; set; } public Jzf AS1OIS02 { get; set; } public Jzf AS1OIS03 { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 4fb47ac..0197920 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -599,17 +599,17 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl simple.LanternBackground = Color.Gray; if (main.enable) { - simple.LanternBackground = Color.Green; + simple.LanternBackground = Color.Lime; } if (main.pause) { - simple.LanternBackground = Color.Yellow; + simple.LanternBackground = Color.Gold; } if (main.ready) { - simple.LanternBackground = Color.Blue; + simple.LanternBackground = Color.DodgerBlue; } } @@ -2061,6 +2061,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetJzf(JzfE.AS2PCP01, PlcReadTemp.AS2PCP01_Set); ControlsHelper.SetJzf(JzfE.AS2PCP02, PlcReadTemp.AS2PCP02_Set); ControlsHelper.SetJzf(JzfE.AS2PCP03, PlcReadTemp.AS2PCP03_Set); + + ControlsHelper.SetJzf(JzfE.AS2PCP04, PlcConnect.Instance.ReadBool("DB2107.2053.0").Content); + ControlsHelper.SetJzf(JzfE.AS1OIS01, PlcReadTemp.AS1OIS01_Set); ControlsHelper.SetJzf(JzfE.AS1OIS02, PlcReadTemp.AS1OIS02_Set); ControlsHelper.SetJzf(JzfE.AS1OIS03, PlcReadTemp.AS1OIS03_Set);