diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 807b4c8..0532098 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -162,21 +162,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver PlcTemp.HR1MSI01_Set = DB1.HR1MSI01.ACT_VALUE; PlcTemp.HR1NSI01_Set = DB1.HR1NSI01.ACT_VALUE; PlcTemp.HR1OSI01_Set = DB1.HR1OSI01.ACT_VALUE; - //PlcTemp.HR1ASI02_Set = DB1.HR1ASI02.ACT_VALUE; - //PlcTemp.HR1BSI02_Set = DB1.HR1BSI02.ACT_VALUE; - //PlcTemp.HR1CSI02_Set = DB1.HR1CSI02.ACT_VALUE; - //PlcTemp.HR1DSI02_Set = DB1.HR1DSI02.ACT_VALUE; - //PlcTemp.HR1ESI02_Set = DB1.HR1ESI02.ACT_VALUE; - //PlcTemp.HR1FSI02_Set = DB1.HR1FSI02.ACT_VALUE; - //PlcTemp.HR1GSI02_Set = DB1.HR1GSI02.ACT_VALUE; - //PlcTemp.HR1HSI02_Set = DB1.HR1HSI02.ACT_VALUE; - //PlcTemp.HR1ISI02_Set = DB1.HR1ISI02.ACT_VALUE; - //PlcTemp.HR1JSI02_Set = DB1.HR1JSI02.ACT_VALUE; - //PlcTemp.HR1KSI02_Set = DB1.HR1KSI02.ACT_VALUE; - //PlcTemp.HR1LSI02_Set = DB1.HR1LSI02.ACT_VALUE; - //PlcTemp.HR1MSI02_Set = DB1.HR1MSI02.ACT_VALUE; - //PlcTemp.HR1NSI02_Set = DB1.HR1NSI02.ACT_VALUE; - //PlcTemp.HR1OSI02_Set = DB1.HR1OSI02.ACT_VALUE; PlcTemp.SPV1DBT01_Set = DB1.SPV1DBT01.ACT_VALUE; PlcTemp.SPV1DBT02_Set = DB1.SPV1DBT02.ACT_VALUE; PlcTemp.SPV2DBT01_Set = DB1.SPV2DBT01.ACT_VALUE; @@ -414,60 +399,45 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver private void DB1SetData() { - ControlsHelper.SetMCLabel(LabelE.PR1ASI01, PlcTemp.PR1ASI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1BSI01, PlcTemp.PR1BSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1CSI01, PlcTemp.PR1CSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1DSI01, PlcTemp.PR1DSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1ESI01, PlcTemp.PR1ESI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1FSI01, PlcTemp.PR1FSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1GSI01, PlcTemp.PR1GSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1HSI01, PlcTemp.PR1HSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1ISI01, PlcTemp.PR1ISI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1JSI01, PlcTemp.PR1JSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1KSI01, PlcTemp.PR1KSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1LSI01, PlcTemp.PR1LSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1MSI01, PlcTemp.PR1MSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1NSI01, PlcTemp.PR1NSI01_Set); - ControlsHelper.SetMCLabel(LabelE.PR1OSI01, PlcTemp.PR1OSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ASI01, PlcTemp.HR1ASI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1BSI01, PlcTemp.HR1BSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1CSI01, PlcTemp.HR1CSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1DSI01, PlcTemp.HR1DSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ESI01, PlcTemp.HR1ESI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1FSI01, PlcTemp.HR1FSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1GSI01, PlcTemp.HR1GSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1HSI01, PlcTemp.HR1HSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ISI01, PlcTemp.HR1ISI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1JSI01, PlcTemp.HR1JSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1KSI01, PlcTemp.HR1KSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1LSI01, PlcTemp.HR1LSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1MSI01, PlcTemp.HR1MSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1NSI01, PlcTemp.HR1NSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1OSI01, PlcTemp.HR1OSI01_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ASI02, PlcTemp.HR1ASI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1BSI02, PlcTemp.HR1BSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1CSI02, PlcTemp.HR1CSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1DSI02, PlcTemp.HR1DSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ESI02, PlcTemp.HR1ESI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1FSI02, PlcTemp.HR1FSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1GSI02, PlcTemp.HR1GSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1HSI02, PlcTemp.HR1HSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1ISI02, PlcTemp.HR1ISI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1JSI02, PlcTemp.HR1JSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1KSI02, PlcTemp.HR1KSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1LSI02, PlcTemp.HR1LSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1MSI02, PlcTemp.HR1MSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1NSI02, PlcTemp.HR1NSI02_Set); - ControlsHelper.SetMCLabel(LabelE.HR1OSI02, PlcTemp.HR1OSI02_Set); - ControlsHelper.SetMCLabel(LabelE.SPV1DBT01, PlcTemp.SPV1DBT01_Set); - ControlsHelper.SetMCLabel(LabelE.SPV1DBT02, PlcTemp.SPV1DBT02_Set); - ControlsHelper.SetMCLabel(LabelE.SPV2DBT01, PlcTemp.SPV2DBT01_Set); - ControlsHelper.SetMCLabel(LabelE.SPV2DBT02, PlcTemp.SPV2DBT02_Set); - ControlsHelper.SetMCLabel(LabelE.SPV3DBT01, PlcTemp.SPV3DBT01_Set); - ControlsHelper.SetMCLabel(LabelE.SPV3DBT02, PlcTemp.SPV3DBT02_Set); - ControlsHelper.SetMCLabel(LabelE.PR1DBT01, PlcTemp.PR1DBT01_Set); - ControlsHelper.SetMCLabel(LabelE.PR2DBT01, PlcTemp.PR2DBT01_Set); - ControlsHelper.SetMCLabel(LabelE.PR3DBT01, PlcTemp.PR3DBT01_Set); + 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.PR2DBT01, (float)Math.Round(PlcTemp.PR2DBT01_Set, 2)); + ControlsHelper.SetMCLabel(LabelE.PR3DBT01, (float)Math.Round(PlcTemp.PR3DBT01_Set, 2)); ControlsHelper.SetHslBottle(bottleE.Bottle1, PlcTemp.Bottle1_Set); ControlsHelper.SetHslBottle(bottleE.Bottle2, PlcTemp.Bottle2_Set); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index 8ba6cc2..4d70816 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -40,21 +40,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public MCLabel HR1MSI01 { get; set; } public MCLabel HR1NSI01 { get; set; } public MCLabel HR1OSI01 { get; set; } - public MCLabel HR1ASI02 { get; set; } - public MCLabel HR1BSI02 { get; set; } - public MCLabel HR1CSI02 { get; set; } - public MCLabel HR1DSI02 { get; set; } - public MCLabel HR1ESI02 { get; set; } - public MCLabel HR1FSI02 { get; set; } - public MCLabel HR1GSI02 { get; set; } - public MCLabel HR1HSI02 { get; set; } - public MCLabel HR1ISI02 { get; set; } - public MCLabel HR1JSI02 { get; set; } - public MCLabel HR1KSI02 { get; set; } - public MCLabel HR1LSI02 { get; set; } - public MCLabel HR1MSI02 { get; set; } - public MCLabel HR1NSI02 { get; set; } - public MCLabel HR1OSI02 { get; set; } public MCLabel SPV1DBT01 { get; set; } public MCLabel SPV1DBT02 { get; set; } public MCLabel SPV2DBT01 { get; set; } diff --git a/DataBlockHelper/DBHelpers/DB92WriterHelp.cs b/DataBlockHelper/DBHelpers/DB92WriterHelp.cs index 30c7469..7a61b42 100644 --- a/DataBlockHelper/DBHelpers/DB92WriterHelp.cs +++ b/DataBlockHelper/DBHelpers/DB92WriterHelp.cs @@ -13,7 +13,7 @@ namespace DataBlockHelper.DBHelpers public static void Add(Pipe pipe) { - + var siemensS7Net = PlcConnect.Instance; siemensS7Net.Write($"{DbName}.2.0", pipe.MainPipieA); siemensS7Net.Write($"{DbName}.6.0", pipe.AuxPipieA); @@ -28,4 +28,5 @@ namespace DataBlockHelper.DBHelpers siemensS7Net.Write($"{DbName}.26.0", pipe.UpperPressure); siemensS7Net.Write($"{DbName}.30.0", pipe.LowerPressure); } + } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 5c92a92..ccf48e6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -671,7 +671,7 @@ True 0 White - 1551, 286 + 1556, 286 HR1OSI01 11, 12 @@ -691,7 +691,7 @@ True 0 White - 1551, 239 + 1556, 239 PR1OSI01 11, 12 @@ -1136,7 +1136,7 @@ True 0 White - 1464, 216 + 1469, 216 HR1NSI01 11, 12 @@ -1156,7 +1156,7 @@ True 0 White - 1464, 169 + 1469, 169 PR1NSI01 11, 12 @@ -1251,7 +1251,7 @@ True 0 White - 1405, 216 + 1410, 216 HR1MSI01 11, 12 @@ -1271,7 +1271,7 @@ True 0 White - 1405, 169 + 1410, 169 PR1MSI01 11, 12 @@ -1311,7 +1311,7 @@ True 0 White - 1346, 216 + 1351, 216 HR1LSI01 11, 12 @@ -1331,7 +1331,7 @@ True 0 White - 1346, 169 + 1351, 169 PR1LSI01 11, 12 @@ -1371,7 +1371,7 @@ True 0 White - 1295, 216 + 1292, 216 HR1KSI01 11, 12 @@ -1391,7 +1391,7 @@ True 0 White - 1287, 172 + 1292, 172 PR1KSI01 11, 12 @@ -3532,7 +3532,7 @@ True 0 White - 1194, 215 + 1199, 215 HR1JSI01 11, 12 @@ -3552,7 +3552,7 @@ True 0 White - 1194, 169 + 1199, 169 PR1JSI01 11, 12 @@ -3632,7 +3632,7 @@ True 0 White - 925, 216 + 930, 216 HR1FSI01 11, 12 @@ -3688,7 +3688,7 @@ True 0 White - 653, 216 + 658, 216 HR1BSI01 11, 12 @@ -3708,7 +3708,7 @@ True 0 White - 594, 215 + 599, 215 HR1ASI01 11, 12 @@ -3791,7 +3791,7 @@ True 0 White - 1135, 215 + 1140, 215 HR1ISI01 11, 12 @@ -3811,7 +3811,7 @@ True 0 White - 1135, 169 + 1140, 169 PR1ISI01 11, 12 @@ -3851,7 +3851,7 @@ True 0 White - 1076, 215 + 1081, 215 HR1HSI01 11, 12 @@ -3871,7 +3871,7 @@ True 0 White - 1076, 169 + 1081, 169 PR1HSI01 11, 12 @@ -3911,7 +3911,7 @@ True 0 White - 1016, 215 + 1021, 215 HR1GSI01 11, 12 @@ -3931,7 +3931,7 @@ True 0 White - 1017, 169 + 1022, 169 PR1GSI01 11, 12 @@ -3971,7 +3971,7 @@ True 0 White - 925, 167 + 930, 167 PR1FSI01 11, 12 @@ -4011,7 +4011,7 @@ True 0 White - 866, 216 + 871, 216 HR1ESI01 11, 12 @@ -4031,7 +4031,7 @@ True 0 White - 866, 167 + 871, 167 PR1ESI01 11, 12 @@ -4071,7 +4071,7 @@ True 0 White - 771, 216 + 776, 216 HR1DSI01 11, 12 @@ -4091,7 +4091,7 @@ True 0 White - 771, 168 + 776, 168 PR1DSI01 11, 12 @@ -4131,7 +4131,7 @@ True 0 White - 712, 216 + 717, 216 HR1CSI01 11, 12 @@ -4151,7 +4151,7 @@ True 0 White - 712, 168 + 717, 168 PR1CSI01 11, 12 @@ -4191,7 +4191,7 @@ True 0 White - 653, 168 + 658, 168 PR1BSI01 11, 12 @@ -4231,7 +4231,7 @@ True 0 White - 594, 168 + 599, 168 PR1ASI01 11, 12