diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 0532098..3cec664 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -34,6 +34,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver DB1Helper DB1 = new DB1Helper(); DB90Helper DB90 = new DB90Helper(); + DB91Helper DB91 = new DB91Helper(); byte[] b1; byte[] b90; //db1/90的byte数组 @@ -117,12 +118,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver DB1 = new DB1Helper(); DB90 = new DB90Helper(); + DB91 = new DB91Helper(); DB1GetData(); DB90GetData(); + DB91GetData(); DB1SetData(); DB90SetData(); + DB91SetData(); AlarmControl(); } @@ -169,8 +173,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.SPV3DBT01_Set = DB1.SPV3DBT01.ACT_VALUE; PlcTemp.SPV3DBT02_Set = DB1.SPV3DBT02.ACT_VALUE; PlcTemp.PR1DBT01_Set = DB1.PR1DBT01.ACT_VALUE; + PlcTemp.PR1DBT02_Set = DB1.PR1DBT02.ACT_VALUE; + PlcTemp.PR1DBT03_Set = DB1.PR1DBT03.ACT_VALUE; + PlcTemp.PR1DBT04_Set = DB1.PR1DBT04.ACT_VALUE; PlcTemp.PR2DBT01_Set = DB1.PR2DBT01.ACT_VALUE; + PlcTemp.PR2DBT02_Set = DB1.PR2DBT02.ACT_VALUE; + PlcTemp.PR2DBT03_Set = DB1.PR2DBT03.ACT_VALUE; + PlcTemp.PR2DBT04_Set = DB1.PR2DBT04.ACT_VALUE; PlcTemp.PR3DBT01_Set = DB1.PR3DBT01.ACT_VALUE; + PlcTemp.PR3DBT02_Set = DB1.PR3DBT02.ACT_VALUE; + PlcTemp.PR3DBT03_Set = DB1.PR3DBT03.ACT_VALUE; + PlcTemp.PR3DBT04_Set = DB1.PR3DBT04.ACT_VALUE; PlcTemp.Bottle1_Set = DB1.LS1ASI01.ACT_VALUE; PlcTemp.Bottle2_Set = DB1.LS1BSI01.ACT_VALUE; @@ -397,6 +410,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.DV1PCP20_AlarmR = DB90.DV1PCP20.AlarmRightPosition; } + private void DB91GetData() + { + PlcTemp.DM1DSM01_Set = DB91.DM1DSM01.Running; + PlcTemp.DM2DSM01_Set = DB91.DM2DSM01.Running; + PlcTemp.DM3DSM01_Set = DB91.DM3DSM01.Running; + PlcTemp.DM1DSM01_Alarm = DB91.DM1DSM01.Alarm; + PlcTemp.DM2DSM01_Alarm = DB91.DM2DSM01.Alarm; + PlcTemp.DM3DSM01_Alarm = DB91.DM3DSM01.Alarm; + } + private void DB1SetData() { ControlsHelper.SetMCLabel(LabelE.PR1ASI01, (float)Math.Round(PlcTemp.PR1ASI01_Set, 2)); @@ -436,8 +459,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsHelper.SetMCLabel(LabelE.SPV3DBT01, (float)Math.Round(PlcTemp.SPV3DBT01_Set, 2)); ControlsHelper.SetMCLabel(LabelE.SPV3DBT02, (float)Math.Round(PlcTemp.SPV3DBT02_Set, 2)); ControlsHelper.SetMCLabel(LabelE.PR1DBT01, (float)Math.Round(PlcTemp.PR1DBT01_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR1DBT02, (float)Math.Round(PlcTemp.PR1DBT02_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR1DBT03, (float)Math.Round(PlcTemp.PR1DBT03_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR1DBT04, (float)Math.Round(PlcTemp.PR1DBT04_Set, 2)); ControlsHelper.SetMCLabel(LabelE.PR2DBT01, (float)Math.Round(PlcTemp.PR2DBT01_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR2DBT02, (float)Math.Round(PlcTemp.PR2DBT02_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR2DBT03, (float)Math.Round(PlcTemp.PR2DBT03_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR2DBT04, (float)Math.Round(PlcTemp.PR2DBT04_Set, 2)); ControlsHelper.SetMCLabel(LabelE.PR3DBT01, (float)Math.Round(PlcTemp.PR3DBT01_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR3DBT02, (float)Math.Round(PlcTemp.PR3DBT02_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR3DBT03, (float)Math.Round(PlcTemp.PR3DBT03_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR3DBT04, (float)Math.Round(PlcTemp.PR3DBT04_Set, 2)); ControlsHelper.SetHslBottle(bottleE.Bottle1, PlcTemp.Bottle1_Set); ControlsHelper.SetHslBottle(bottleE.Bottle2, PlcTemp.Bottle2_Set); @@ -539,6 +571,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver } + private void DB91SetData() + { + ControlsHelper.SetSwitchLight(SwitchlightE.DM1DSM01, PlcTemp.DM1DSM01_Set, PlcTemp.DM1DSM01_Alarm); + ControlsHelper.SetSwitchLight(SwitchlightE.DM2DSM01, PlcTemp.DM2DSM01_Set, PlcTemp.DM2DSM01_Alarm); + ControlsHelper.SetSwitchLight(SwitchlightE.DM3DSM01, PlcTemp.DM3DSM01_Set, PlcTemp.DM3DSM01_Alarm); + } + #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 4d70816..585b7ae 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -47,8 +47,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public MCLabel SPV3DBT01 { get; set; } public MCLabel SPV3DBT02 { get; set; } public MCLabel PR1DBT01 { get; set; } + public MCLabel PR1DBT02 { get; set; } + public MCLabel PR1DBT03 { get; set; } + public MCLabel PR1DBT04 { get; set; } public MCLabel PR2DBT01 { get; set; } + public MCLabel PR2DBT02 { get; set; } + public MCLabel PR2DBT03 { get; set; } + public MCLabel PR2DBT04 { get; set; } public MCLabel PR3DBT01 { get; set; } + public MCLabel PR3DBT02 { get; set; } + public MCLabel PR3DBT03 { get; set; } + public MCLabel PR3DBT04 { get; set; } } @@ -137,11 +146,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public ThreeWayValve DV1PCP20 { get; set; } } - internal class JzfEntity - { - - } - internal class SwitchLightEntity { public SwitchLight HSiloA { get; set; } @@ -180,6 +184,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public SwitchLight Atank4 { get; set; } public SwitchLight Atank5 { get; set; } public SwitchLight Atank6 { get; set; } + + public SwitchLight DM1DSM01 { get; set; } + public SwitchLight DM2DSM01 { get; set; } + public SwitchLight DM3DSM01 { get; set; } + } internal class HslBottleEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs index a7a8100..2f4f7a6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs @@ -62,8 +62,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public float SPV3DBT01_Set { get; set; } public float SPV3DBT02_Set { get; set; } public float PR1DBT01_Set { get; set; } + public float PR1DBT02_Set { get; set; } + public float PR1DBT03_Set { get; set; } + public float PR1DBT04_Set { get; set; } public float PR2DBT01_Set { get; set; } + public float PR2DBT02_Set { get; set; } + public float PR2DBT03_Set { get; set; } + public float PR2DBT04_Set { get; set; } public float PR3DBT01_Set { get; set; } + public float PR3DBT02_Set { get; set; } + public float PR3DBT03_Set { get; set; } + public float PR3DBT04_Set { get; set; } public bool BU1DBT01_Set { get; set; } public bool BU1DBT02_Set { get; set; } @@ -317,5 +326,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public float Bottle13_Set { get; set; } public float Bottle14_Set { get; set; } public float Bottle15_Set { get; set; } + + public bool DM1DSM01_Set { get; set; } + public bool DM2DSM01_Set { get; set; } + public bool DM3DSM01_Set { get; set; } + public bool DM1DSM01_Alarm { get; set; } + public bool DM2DSM01_Alarm { get; set; } + public bool DM3DSM01_Alarm { get; set; } + } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index e34803c..eae6fb7 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,204 @@ + + + 324, 656 + DM3DSM01 + 13, 13 + + + + 324, 375 + DM2DSM01 + 13, 13 + + + + 324, 91 + DM1DSM01 + 13, 13 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 399, 722 + PR3DBT03 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 397, 834 + PR3DBT04 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 297, 722 + PR3DBT02 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 399, 156 + PR1DBT03 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 397, 268 + PR1DBT04 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 297, 156 + PR1DBT02 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 399, 441 + PR2DBT03 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 397, 553 + PR2DBT04 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 297, 441 + PR2DBT02 + 11, 12 + TurnOff @@ -43,30 +241,6 @@ Jzf1 13, 11 - - - - zsTurnOff - 319, 653 - Fan14 - 19, 20 - - - - - zsTurnOff - 319, 372 - Fan15 - 19, 20 - - - - - zsTurnOff - 319, 88 - Fan16 - 19, 20 -