diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 3cec664..b368c03 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -52,7 +52,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver HslBottleEntity bottleE = new HslBottleEntity(); SwitchLightEntity SwitchlightE = new SwitchLightEntity(); - //JzfEntity JzfE = new JzfEntity(); + JzfEntity JzfE = new JzfEntity(); ThreeWayValveEntity ThreeWayValveE = new ThreeWayValveEntity(); LjSwitchEntity LjSwitchE = new LjSwitchEntity(); MCLabelEntity LabelE = new MCLabelEntity(); @@ -97,7 +97,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver { ControlsHelper.ControlImport(bottleE, Controls); ControlsHelper.ControlImport(SwitchlightE, Controls); - //ControlsHelper.ControlImport(JzfE, Controls); + ControlsHelper.ControlImport(JzfE, Controls); ControlsHelper.ControlImport(ThreeWayValveE, Controls); ControlsHelper.ControlImport(LjSwitchE, Controls); ControlsHelper.ControlImport(LabelE, Controls); @@ -123,10 +123,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver DB1GetData(); DB90GetData(); DB91GetData(); + DBOtherGetData(); DB1SetData(); DB90SetData(); DB91SetData(); + DBOtherSetData(); AlarmControl(); } @@ -420,6 +422,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm; } + private void DBOtherGetData() + { + + } + private void DB1SetData() { ControlsHelper.SetMCLabel(LabelE.PR1ASI01, (float)Math.Round(PlcTemp.PR1ASI01_Set, 2)); @@ -578,6 +585,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm); } + private void DBOtherSetData() + { + + } + #endregion #region 报警管理 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index 585b7ae..ca98120 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -1,5 +1,6 @@ using Mesnac.Controls.ChemicalWeighing; using Mesnac.Controls.Default; +using Mesnac.Controls.Feeding; using System; using System.Collections.Generic; using System.Linq; @@ -191,6 +192,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity } + internal class JzfEntity + { + public Jzf Excitation1 { get; set; } + public Jzf Excitation2 { get; set; } + public Jzf Excitation3 { get; set; } + public Jzf SideBlowing1 { get; set; } + public Jzf SideBlowing2 { get; set; } + public Jzf SideBlowing3 { get; set; } + } + internal class HslBottleEntity { public HslBottle Bottle1 { get; set; } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index eae6fb7..9608f56 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,27 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 激振器 + ButtonHighlight + 285, 109 + + + 41, 12 + 324, 656 @@ -199,46 +220,46 @@ PR2DBT02 11, 12 - + TurnOff 337, 686 - Jzf5 + SideBlowing3 13, 11 - + TurnOff 330, 676 - Jzf6 + Excitation3 13, 11 - + TurnOff 337, 405 - Jzf3 + SideBlowing2 13, 11 - + TurnOff 330, 395 - Jzf4 + Excitation2 13, 11 - + TurnOff 337, 121 - Jzf2 + SideBlowing1 13, 11 - + TurnOff 330, 111 - Jzf1 + Excitation1 13, 11 @@ -289,22 +310,22 @@ AS1DBT07 14, 12 - + 352, 656 - SwitchLight2147483644 + HighLevel3 13, 13 - + 352, 375 - SwitchLight2147483645 + HighLevel2 13, 13 - + 352, 91 - SwitchLight2147483646 + HighLevel1 13, 13 @@ -641,7 +662,7 @@ - 557, 96 + 557, 94 DV1PCP04 22, 12