diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index b5352a3..f8ef9d6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -67,6 +67,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver /// HslMoveText AlarmMoveText; + /// + /// 曲线图 + /// + MultiCurve PressureCurve; + #endregion #endregion @@ -80,6 +85,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver Controls = GetAllControls(); AlarmMoveText = Controls.FirstOrDefault(x => x != null && x.Name == "AlarmMoveText") as HslMoveText; + PressureCurve = Controls.FirstOrDefault(x => x.Name == "PressureCurve") as MultiCurve; SetAllControls(); @@ -195,6 +201,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.PR3DBT03_Set = DB1.PR3DBT03.ACT_VALUE; PlcTemp.PR3DBT04_Set = DB1.PR3DBT04.ACT_VALUE; + PlcTemp.PR1PCP01_Set = DB1.PR1PCP01.ACT_VALUE; + PlcTemp.PR1PCP02_Set = DB1.PR1PCP02.ACT_VALUE; + PlcTemp.PR1PCP03_Set = DB1.PR1PCP03.ACT_VALUE; + } private void DB90GetData() @@ -467,60 +477,90 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.Bottle13_Set = DB120.SiloM; PlcTemp.Bottle14_Set = DB120.SiloN; PlcTemp.Bottle15_Set = DB120.SiloO; + + PlcTemp.Cabinet1 = MReadHelp.ReadCabinet()[0]; + PlcTemp.Cabinet2 = MReadHelp.ReadCabinet()[1]; + PlcTemp.Cabinet3 = MReadHelp.ReadCabinet()[2]; + PlcTemp.Cabinet4 = MReadHelp.ReadCabinet()[3]; + PlcTemp.Cabinet5 = MReadHelp.ReadCabinet()[4]; + PlcTemp.Cabinet6 = MReadHelp.ReadCabinet()[5]; + PlcTemp.Cabinet7 = MReadHelp.ReadCabinet()[6]; + PlcTemp.Cabinet8 = MReadHelp.ReadCabinet()[7]; + PlcTemp.Cabinet9 = MReadHelp.ReadCabinet()[8]; + PlcTemp.Cabinet10 = MReadHelp.ReadCabinet()[9]; + PlcTemp.Cabinet11 = MReadHelp.ReadCabinet()[10]; + PlcTemp.Cabinet12 = MReadHelp.ReadCabinet()[11]; + PlcTemp.Cabinet13 = MReadHelp.ReadCabinet()[12]; + PlcTemp.Cabinet14 = MReadHelp.ReadCabinet()[13]; + PlcTemp.Cabinet15 = MReadHelp.ReadCabinet()[14]; } private void DB1SetData() { - ControlsHelper.SetMCLabel(LabelE.PR1ASI01, (float)Math.Round(PlcTemp.PR1ASI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1BSI01, (float)Math.Round(PlcTemp.PR1BSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1CSI01, (float)Math.Round(PlcTemp.PR1CSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1DSI01, (float)Math.Round(PlcTemp.PR1DSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1ESI01, (float)Math.Round(PlcTemp.PR1ESI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1FSI01, (float)Math.Round(PlcTemp.PR1FSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1GSI01, (float)Math.Round(PlcTemp.PR1GSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1HSI01, (float)Math.Round(PlcTemp.PR1HSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1ISI01, (float)Math.Round(PlcTemp.PR1ISI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1JSI01, (float)Math.Round(PlcTemp.PR1JSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1KSI01, (float)Math.Round(PlcTemp.PR1KSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1LSI01, (float)Math.Round(PlcTemp.PR1LSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1MSI01, (float)Math.Round(PlcTemp.PR1MSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1NSI01, (float)Math.Round(PlcTemp.PR1NSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.PR1OSI01, (float)Math.Round(PlcTemp.PR1OSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1ASI01, (float)Math.Round(PlcTemp.HR1ASI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1BSI01, (float)Math.Round(PlcTemp.HR1BSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1CSI01, (float)Math.Round(PlcTemp.HR1CSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1DSI01, (float)Math.Round(PlcTemp.HR1DSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1ESI01, (float)Math.Round(PlcTemp.HR1ESI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1FSI01, (float)Math.Round(PlcTemp.HR1FSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1GSI01, (float)Math.Round(PlcTemp.HR1GSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1HSI01, (float)Math.Round(PlcTemp.HR1HSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1ISI01, (float)Math.Round(PlcTemp.HR1ISI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1JSI01, (float)Math.Round(PlcTemp.HR1JSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1KSI01, (float)Math.Round(PlcTemp.HR1KSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1LSI01, (float)Math.Round(PlcTemp.HR1LSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1MSI01, (float)Math.Round(PlcTemp.HR1MSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1NSI01, (float)Math.Round(PlcTemp.HR1NSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.HR1OSI01, (float)Math.Round(PlcTemp.HR1OSI01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.SPV1DBT01, (float)Math.Round(PlcTemp.SPV1DBT01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.SPV1DBT02, (float)Math.Round(PlcTemp.SPV1DBT02_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.SPV2DBT01, (float)Math.Round(PlcTemp.SPV2DBT01_Set, 2)); - ControlsHelper.SetMCLabel(LabelE.SPV2DBT02, (float)Math.Round(PlcTemp.SPV2DBT02_Set, 2)); - 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.SetMCLabel(LabelE.PR1ASI01, (float)Math.Round(PlcTemp.PR1ASI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1BSI01, (float)Math.Round(PlcTemp.PR1BSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1CSI01, (float)Math.Round(PlcTemp.PR1CSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1DSI01, (float)Math.Round(PlcTemp.PR1DSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1ESI01, (float)Math.Round(PlcTemp.PR1ESI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1FSI01, (float)Math.Round(PlcTemp.PR1FSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1GSI01, (float)Math.Round(PlcTemp.PR1GSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1HSI01, (float)Math.Round(PlcTemp.PR1HSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1ISI01, (float)Math.Round(PlcTemp.PR1ISI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1JSI01, (float)Math.Round(PlcTemp.PR1JSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1KSI01, (float)Math.Round(PlcTemp.PR1KSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1LSI01, (float)Math.Round(PlcTemp.PR1LSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1MSI01, (float)Math.Round(PlcTemp.PR1MSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1NSI01, (float)Math.Round(PlcTemp.PR1NSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1OSI01, (float)Math.Round(PlcTemp.PR1OSI01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.HR1ASI01, (float)Math.Round(PlcTemp.HR1ASI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1BSI01, (float)Math.Round(PlcTemp.HR1BSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1CSI01, (float)Math.Round(PlcTemp.HR1CSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1DSI01, (float)Math.Round(PlcTemp.HR1DSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1ESI01, (float)Math.Round(PlcTemp.HR1ESI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1FSI01, (float)Math.Round(PlcTemp.HR1FSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1GSI01, (float)Math.Round(PlcTemp.HR1GSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1HSI01, (float)Math.Round(PlcTemp.HR1HSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1ISI01, (float)Math.Round(PlcTemp.HR1ISI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1JSI01, (float)Math.Round(PlcTemp.HR1JSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1KSI01, (float)Math.Round(PlcTemp.HR1KSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1LSI01, (float)Math.Round(PlcTemp.HR1LSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1MSI01, (float)Math.Round(PlcTemp.HR1MSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1NSI01, (float)Math.Round(PlcTemp.HR1NSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.HR1OSI01, (float)Math.Round(PlcTemp.HR1OSI01_Set, 2)+ " ℃"); + ControlsHelper.SetMCLabel(LabelE.SPV1DBT01, (float)Math.Round(PlcTemp.SPV1DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.SPV1DBT02, (float)Math.Round(PlcTemp.SPV1DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.SPV2DBT01, (float)Math.Round(PlcTemp.SPV2DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.SPV2DBT02, (float)Math.Round(PlcTemp.SPV2DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.SPV3DBT01, (float)Math.Round(PlcTemp.SPV3DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.SPV3DBT02, (float)Math.Round(PlcTemp.SPV3DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1DBT01, (float)Math.Round(PlcTemp.PR1DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1DBT02, (float)Math.Round(PlcTemp.PR1DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1DBT03, (float)Math.Round(PlcTemp.PR1DBT03_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1DBT04, (float)Math.Round(PlcTemp.PR1DBT04_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR2DBT01, (float)Math.Round(PlcTemp.PR2DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR2DBT02, (float)Math.Round(PlcTemp.PR2DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR2DBT03, (float)Math.Round(PlcTemp.PR2DBT03_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR2DBT04, (float)Math.Round(PlcTemp.PR2DBT04_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR3DBT01, (float)Math.Round(PlcTemp.PR3DBT01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR3DBT02, (float)Math.Round(PlcTemp.PR3DBT02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR3DBT03, (float)Math.Round(PlcTemp.PR3DBT03_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR3DBT04, (float)Math.Round(PlcTemp.PR3DBT04_Set, 2)+ " MPa"); + + ControlsHelper.SetMCLabel(LabelE.PR1PCP01, (float)Math.Round(PlcTemp.PR1PCP01_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1PCP02, (float)Math.Round(PlcTemp.PR1PCP02_Set, 2)+ " MPa"); + ControlsHelper.SetMCLabel(LabelE.PR1PCP03, (float)Math.Round(PlcTemp.PR1PCP03_Set, 2)+ " MPa"); + + PressureCurve.PointValue1 = Math.Round(PlcTemp.PR1DBT02_Set, 4); + PressureCurve.PointValue2 = Math.Round(PlcTemp.PR1DBT03_Set, 4); + PressureCurve.PointValue3 = Math.Round(PlcTemp.PR1DBT04_Set, 4); + PressureCurve.PointValue4 = Math.Round(PlcTemp.PR2DBT02_Set, 4); + PressureCurve.PointValue5 = Math.Round(PlcTemp.PR2DBT03_Set, 4); + PressureCurve.PointValue6 = Math.Round(PlcTemp.PR2DBT04_Set, 4); + PressureCurve.PointValue7 = Math.Round(PlcTemp.PR3DBT02_Set, 4); + PressureCurve.PointValue8 = Math.Round(PlcTemp.PR3DBT03_Set, 4); + PressureCurve.PointValue9 = Math.Round(PlcTemp.PR3DBT04_Set, 4); ControlsHelper.SetHslBottle(bottleE.Bottle1, PlcTemp.Bottle1_Set); ControlsHelper.SetHslBottle(bottleE.Bottle2, PlcTemp.Bottle2_Set); @@ -656,6 +696,22 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver ControlsImprot.SetSwitchLight(SwitchlightE.HighLevel1, PlcTemp.HighLevel1); ControlsImprot.SetSwitchLight(SwitchlightE.HighLevel2, PlcTemp.HighLevel2); ControlsImprot.SetSwitchLight(SwitchlightE.HighLevel3, PlcTemp.HighLevel3); + + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); + ControlsImprot.SetControlCabinet(CabinetE.Cabinet1, PlcTemp.Cabinet1); } #endregion diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index 348d92f..360ac0a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -60,6 +60,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public MCLabel PR3DBT03 { get; set; } public MCLabel PR3DBT04 { get; set; } + public MCLabel PR1PCP01 { get; set; } + public MCLabel PR1PCP02 { get; set; } + public MCLabel PR1PCP03 { get; set; } + } internal class LjSwitchEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs index 14affda..e5d6997 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/PlcTempEntity.cs @@ -75,6 +75,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public float PR3DBT03_Set { get; set; } public float PR3DBT04_Set { get; set; } + public float PR1PCP01_Set { get; set; } + public float PR1PCP02_Set { get; set; } + public float PR1PCP03_Set { get; set; } + public bool BU1DBT01_Set { get; set; } public bool BU1DBT02_Set { get; set; } public bool BU1DBT03_Set { get; set; } @@ -359,5 +363,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public bool DM1DSIG01_Alarm { get; set; } public bool DM1ESIG01_Alarm { get; set; } public bool DM1GDP01_Alarm { get; set; } + + public bool Cabinet1 { get; set; } + public bool Cabinet2 { get; set; } + public bool Cabinet3 { get; set; } + public bool Cabinet4 { get; set; } + public bool Cabinet5 { get; set; } + public bool Cabinet6 { get; set; } + public bool Cabinet7 { get; set; } + public bool Cabinet8 { get; set; } + public bool Cabinet9 { get; set; } + public bool Cabinet10 { get; set; } + public bool Cabinet11 { get; set; } + public bool Cabinet12 { get; set; } + public bool Cabinet13 { get; set; } + public bool Cabinet14 { get; set; } + public bool Cabinet15 { get; set; } + + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs index 3becc2c..ab584a4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliverPressureSetting/PlcDownload.cs @@ -137,7 +137,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliverPressureSetting private static bool JudgeValue(float value) { - if (value < 0 || value > 50) + if (value < 0 || value > 200) { return false; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index 728ec8e..d35cee0 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -39,12 +39,16 @@ namespace Mesnac.Action.ChemicalWeighing.Test // LoggingService _log; HslMoveText hslMove; - - + MultiCurve MultiCurve1; + double a = 0; public void theout(object source, EventArgs e) { - LoggingService.InfoFormatted("定时器开始运行"); - ReportReadDb.ReadReport(); + a += 1; + //LoggingService.InfoFormatted("定时器开始运行"); + //ReportReadDb.ReadReport(); + MultiCurve1.PointValue1 = Math.Sqrt(Math.Abs(Math.Sin(a))) + Math.Sqrt(Math.Abs(Math.Cos(a))); + MultiCurve1.PointValue2 = Math.Sqrt(Math.Abs(Math.Sin(a))) - Math.Sqrt(Math.Abs(Math.Cos(a))); + } public void Run(RuntimeParameter runtime) @@ -54,6 +58,10 @@ namespace Mesnac.Action.ChemicalWeighing.Test mCButton = allDb.FirstOrDefault(x => x.Name == "MCButton1") as MCButton; hslMove = allDb.FirstOrDefault(x => x.Name == "HslMoveText1") as HslMoveText; + MultiCurve1 = allDb.FirstOrDefault(x => x.Name == "MultiCurve1") as MultiCurve; + + //MultiCurve1.AxesAuto = true; + this.hslMove.Anchor = (AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right); this.hslMove.BackColor = Color.FromArgb(128, 128, 255); diff --git a/DataBlockHelper/DBHelpers/MReadHelp.cs b/DataBlockHelper/DBHelpers/MReadHelp.cs index f74a6f9..a578073 100644 --- a/DataBlockHelper/DBHelpers/MReadHelp.cs +++ b/DataBlockHelper/DBHelpers/MReadHelp.cs @@ -14,17 +14,39 @@ namespace DataBlockHelper.DBHelpers public static List Read() { var p= PlcConnect.Instance; - string m = "M1003.4"; - List result = new List(); - result.Add(p.ReadBool("M1003.4").Content); - result.Add(p.ReadBool("M1004.4").Content); - - result.Add(p.ReadBool("M1006.4").Content); - result.Add(p.ReadBool("M1007.4").Content); - + List result = new List + { + p.ReadBool("M1003.4").Content, + p.ReadBool("M1004.4").Content, + p.ReadBool("M1006.4").Content, + p.ReadBool("M1007.4").Content, + p.ReadBool("M1009.4").Content, + p.ReadBool("M1010.4").Content, + }; + return result; + } - result.Add(p.ReadBool("M1009.4").Content); - result.Add(p.ReadBool("M1010.4").Content); + public static List ReadCabinet() + { + var p = PlcConnect.Instance; + List result = new List + { + p.ReadBool("M2017.0").Content, + p.ReadBool("M2017.1").Content, + p.ReadBool("M2017.2").Content, + p.ReadBool("M2017.3").Content, + p.ReadBool("M2017.4").Content, + p.ReadBool("M2017.5").Content, + p.ReadBool("M2017.6").Content, + p.ReadBool("M2017.7").Content, + p.ReadBool("M2018.0").Content, + p.ReadBool("M2018.1").Content, + p.ReadBool("M2030.0").Content, + p.ReadBool("M2030.1").Content, + p.ReadBool("M2030.2").Content, + p.ReadBool("M2030.3").Content, + p.ReadBool("M2018.2").Content, + }; return result; } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml index 77ade3a..70bea3e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/Form1.xml @@ -1,10 +1,109 @@ + + + + + Red + DarkGray + + + False + + + + None + True + True + MPa + ButtonHighlight + 198, 70 + MCLabel1 + 23, 12 + + + 大仓压力曲线 + True + True + Right + False + 50 + False + 20 + 60 + 1 + Pan + False + 10 + Pressure1 + Pressure2 + Pressure3 + Pressure4 + + + + + + + + + + + + + + + + + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + + + + + + + + + + + + + + Red + Green + Yellow + Blue + Black + 123, 104, 238 + 205, 92, 92 + 219, 112, 147 + 95, 158, 160 + 221, 160, 221 + 144, 238, 144 + 255, 0, 255 + 0 + MPa + 0 + 189, 59 + MultiCurve1 + 1108, 491 + - 652, 182 + 12, 12 HslMoveText1 - 477, 41 + 1501, 41 @@ -25,7 +124,7 @@ Red DarkGray MCButton1 - 272, 199 + 12, 59 MCButton1 161, 178 66 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 5bae286..50e4a13 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,6 +1,159 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 624, 852 + PR1PCP03 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 585, 571 + PR1PCP02 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + White + 543, 286 + PR1PCP01 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MPa + ButtonHighlight + 713, 498 + MCLabel1 + 23, 12 + + + 大仓压力曲线 + True + True + Right + False + 50 + False + 20 + 60 + 1 + Pan + False + 10 + A_1号压送罐 + A_2号压送罐 + A_出料口 + B_1号压送罐 + B_2号压送罐 + B_出料口 + C_1号压送罐 + C_2号压送罐 + C_出料口 + + + + + + + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + Left + + + + + + + + + + + + + + Red + Fuchsia + Black + Blue + 128, 255, 255 + Gray + 255, 128, 0 + Yellow + Lime + 221, 160, 221 + 144, 238, 144 + 255, 0, 255 + 0 + 0 + 0 + 704, 491 + PressureCurve + 1183, 374 + @@ -756,7 +909,7 @@ True 0 White - 310, 722 + 281, 722 PR3DBT02 11, 12 @@ -816,7 +969,7 @@ True 0 White - 310, 156 + 281, 156 PR1DBT02 11, 12 @@ -876,7 +1029,7 @@ True 0 White - 310, 441 + 281, 441 PR2DBT02 11, 12 @@ -1117,7 +1270,7 @@ True 0 White - 213, 807 + 205, 807 PR3DBT01 11, 12 @@ -1137,7 +1290,7 @@ True 0 White - 213, 526 + 205, 526 PR2DBT01 11, 12 @@ -1157,7 +1310,7 @@ True 0 White - 213, 244 + 205, 244 PR1DBT01 11, 12 @@ -1631,7 +1784,7 @@ True 0 White - 1675, 286 + 1670, 286 HR1OSI01 11, 12 @@ -1651,7 +1804,7 @@ True 0 White - 1675, 239 + 1670, 239 PR1OSI01 11, 12 @@ -2096,7 +2249,7 @@ True 0 White - 1588, 216 + 1579, 216 HR1NSI01 11, 12 @@ -2116,7 +2269,7 @@ True 0 White - 1588, 169 + 1579, 169 PR1NSI01 11, 12 @@ -2211,7 +2364,7 @@ True 0 White - 1529, 216 + 1520, 216 HR1MSI01 11, 12 @@ -2231,7 +2384,7 @@ True 0 White - 1529, 169 + 1520, 169 PR1MSI01 11, 12 @@ -2271,7 +2424,7 @@ True 0 White - 1470, 216 + 1461, 216 HR1LSI01 11, 12 @@ -2291,7 +2444,7 @@ True 0 White - 1470, 169 + 1461, 169 PR1LSI01 11, 12 @@ -2331,7 +2484,7 @@ True 0 White - 1411, 216 + 1402, 216 HR1KSI01 11, 12 @@ -2351,7 +2504,7 @@ True 0 White - 1411, 172 + 1402, 172 PR1KSI01 11, 12 @@ -4463,7 +4616,7 @@ True 0 White - 1318, 215 + 1309, 215 HR1JSI01 11, 12 @@ -4483,7 +4636,7 @@ True 0 White - 1318, 169 + 1309, 169 PR1JSI01 11, 12 @@ -4563,7 +4716,7 @@ True 0 White - 1049, 216 + 1040, 216 HR1FSI01 11, 12 @@ -4619,7 +4772,7 @@ True 0 White - 777, 216 + 768, 216 HR1BSI01 11, 12 @@ -4639,7 +4792,7 @@ True 0 White - 718, 215 + 709, 215 HR1ASI01 11, 12 @@ -4722,7 +4875,7 @@ True 0 White - 1259, 215 + 1250, 215 HR1ISI01 11, 12 @@ -4742,7 +4895,7 @@ True 0 White - 1259, 169 + 1250, 169 PR1ISI01 11, 12 @@ -4782,7 +4935,7 @@ True 0 White - 1200, 215 + 1191, 215 HR1HSI01 11, 12 @@ -4802,7 +4955,7 @@ True 0 White - 1200, 169 + 1191, 169 PR1HSI01 11, 12 @@ -4842,7 +4995,7 @@ True 0 White - 1140, 215 + 1131, 215 HR1GSI01 11, 12 @@ -4862,7 +5015,7 @@ True 0 White - 1141, 169 + 1132, 169 PR1GSI01 11, 12 @@ -4902,7 +5055,7 @@ True 0 White - 1049, 167 + 1040, 167 PR1FSI01 11, 12 @@ -4942,7 +5095,7 @@ True 0 White - 990, 216 + 981, 216 HR1ESI01 11, 12 @@ -4962,7 +5115,7 @@ True 0 White - 990, 167 + 981, 167 PR1ESI01 11, 12 @@ -5002,7 +5155,7 @@ True 0 White - 895, 216 + 886, 216 HR1DSI01 11, 12 @@ -5022,7 +5175,7 @@ True 0 White - 895, 168 + 886, 168 PR1DSI01 11, 12 @@ -5062,7 +5215,7 @@ True 0 White - 836, 216 + 827, 216 HR1CSI01 11, 12 @@ -5082,7 +5235,7 @@ True 0 White - 836, 168 + 827, 168 PR1CSI01 11, 12 @@ -5122,7 +5275,7 @@ True 0 White - 777, 168 + 768, 168 PR1BSI01 11, 12 @@ -5162,7 +5315,7 @@ True 0 White - 718, 168 + 709, 168 PR1ASI01 11, 12