diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs index a8e229a..ccb1bba 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs @@ -152,8 +152,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu HslSwitch HslSwitch13; HslSwitch HslSwitch14; HslSwitch HslSwitch15; - + HslSwitch HslSwitch16; public void Run(RuntimeParameter runtime) @@ -399,6 +399,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu HslSwitch15 = controls.FirstOrDefault(x => x.Name == "HslSwitch15") as HslSwitch; HslSwitch15.Text = "大仓O"; + HslSwitch16 = controls.FirstOrDefault(x => x.Name == "HslSwitch16") as HslSwitch; + HslSwitch16.Text = "回收仓侧吹启停"; HslSwitch1.OnSwitchChanged += HslSwitch1_OnSwitchChanged; @@ -416,7 +418,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu HslSwitch13.OnSwitchChanged += HslSwitch1_OnSwitchChanged; HslSwitch14.OnSwitchChanged += HslSwitch1_OnSwitchChanged; HslSwitch15.OnSwitchChanged += HslSwitch1_OnSwitchChanged; - + HslSwitch16.OnSwitchChanged += HslSwitch1_OnSwitchChanged; @@ -490,7 +492,10 @@ namespace Mesnac.Action.ChemicalWeighing.Qu add = "DB2119.16.6"; } - + if (hsl.Name == "HslSwitch16") + { + add = "DB2119.16.7"; + } var val = PlcConnect.Instance.ReadBool(add).Content; PlcConnect.Instance.Write(add, !val); @@ -1164,8 +1169,12 @@ namespace Mesnac.Action.ChemicalWeighing.Qu this.HslSwitch13.SwitchStatus = at.GetBit(4); this.HslSwitch14.SwitchStatus = at.GetBit(5); this.HslSwitch15.SwitchStatus = at.GetBit(6); - + + + var sss = plc.ReadBool("DB2119.16.7").Content; + + this.HslSwitch16.SwitchStatus = sss; } } diff --git a/DataBlockHelper/DBHelpers/DB2119Helper.cs b/DataBlockHelper/DBHelpers/DB2119Helper.cs index e09e552..5256e1b 100644 --- a/DataBlockHelper/DBHelpers/DB2119Helper.cs +++ b/DataBlockHelper/DBHelpers/DB2119Helper.cs @@ -12,7 +12,7 @@ namespace DataBlockHelper.DBHelpers { public DB2119Helper() { - bytes = PlcConnect.Instance.Read("DB2119.0.0", 12).Content; + bytes = PlcConnect.Instance.Read("DB2119.0.0", 14).Content; var a=bytes.First(); VesselA = a.GetBit(0); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml index a78518b..ee2a3f2 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml @@ -1,5 +1,18 @@ + + + 43, 20 + HslSwitch16 + 119, 121 + + False + 回收仓侧吹启停 + 34, 922 + GroupBox10 + 1253, 162 + 21 + 1175, 39 @@ -78,9 +91,9 @@ False 缓存仓上位机 - 30, 806 + 30, 757 GroupBox9 - 1257, 146 + 1257, 139 20 @@ -2364,7 +2377,7 @@ False False Control - 1402, 1141 + 1402, 1200 WindowsDefaultLocation 缓存队列取消 Normal