From b90b11c6bdbf9d85f86b590ad8f4c977f9743b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Sun, 9 Jun 2024 17:58:57 +0800 Subject: [PATCH] AS4BLT02 --- .../MainDetailControl/Entity/DeviceDetailEntity.cs | 3 +++ .../MainDetailControl/Entity/PlcReadTempEntity.cs | 3 +++ .../MainDetailControl/MainDetailControlAction.cs | 9 +++++++++ Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml | 4 ++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index 367df59..0282550 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -380,6 +380,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public Jzf AS4BLT05 { get; set; } public Jzf AS4BLT01 { get; set; } + + public Jzf AS4BLT02 { get; set; } + public Jzf AS4BLT03 { get; set; } public Jzf AS5BLT01 { get; set; } public Jzf AS5BLT02 { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs index 39f6ed6..e4d8de3 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs @@ -190,6 +190,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool AS3BLT05_Set { get; set; } public bool AS4BLT01_Set { get; set; } + + public bool AS4BLT02_Set { get; set; } + public bool AS4BLT03_Set { get; set; } public bool AS4BLT04_Set { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 3fd6bdd..4da1da7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -1654,11 +1654,17 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.AS2BLT04_Set = DB2107.Valve.AS2BLT04; PlcReadTemp.AS2BLT05_Set = DB2107.Valve.AS2BLT05; PlcReadTemp.AS3BLT01_Set = DB2107.Valve.AS3BLT01; + PlcReadTemp.AS3BLT02_Set = DB2107.Valve.AS3BLT02; + PlcReadTemp.AS3BLT03_Set = DB2107.Valve.AS3BLT03; PlcReadTemp.AS3BLT04_Set = DB2107.Valve.AS3BLT04; PlcReadTemp.AS3BLT05_Set = DB2107.Valve.AS3BLT05; + PlcReadTemp.AS4BLT01_Set = DB2107.Valve.AS4BLT01; + + PlcReadTemp.AS4BLT02_Set = DB2107.Valve.AS4BLT02; + PlcReadTemp.AS4BLT03_Set = DB2107.Valve.AS4BLT03; PlcReadTemp.AS4BLT04_Set = DB2107.Valve.AS4BLT04; @@ -1942,6 +1948,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetJzf(JzfE.AS4BLT01, PlcReadTemp.AS4BLT01_Set); + + ControlsHelper.SetJzf(JzfE.AS4BLT02, PlcReadTemp.AS4BLT02_Set); + ControlsHelper.SetJzf(JzfE.AS4BLT03, PlcReadTemp.AS4BLT03_Set); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 6236513..4e49260 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -685,11 +685,11 @@ Jzf73 13, 11 - + TurnOff 425, 266 - Jzf74 + AS4BLT02 13, 11