diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index 540a7ee..22f0d6c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -260,14 +260,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public SwitchLight Hopper_2_LowLevel { get; set; } public SwitchLight Hopper_3_LowLevel { get; set; } public SwitchLight Hopper_4_LowLevel { get; set; } - public SwitchLight WScale_1_HighLevel { get; set; } - public SwitchLight WScale_2_HighLevel { get; set; } - public SwitchLight WScale_3_HighLevel { get; set; } - public SwitchLight WScale_4_HighLevel { get; set; } - public SwitchLight WScale_1_LowLevel { get; set; } - public SwitchLight WScale_2_LowLevel { get; set; } - public SwitchLight WScale_3_LowLevel { get; set; } - public SwitchLight WScale_4_LowLevel { get; set; } public SwitchLight DMWETER1 { get; set; } public SwitchLight DMWETER11 { get; set; } public SwitchLight DMWETER2 { get; set; } @@ -331,6 +323,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public MCLabel DM2BSF01 { get; set; } public MCLabel DM2CSF01 { get; set; } public MCLabel DM2DSF01 { get; set; } + public MCLabel ValueWeight1 { get; set; } + public MCLabel ValueWeight2 { get; set; } + public MCLabel ValueWeight3 { get; set; } + public MCLabel ValueWeight4 { get; set; } public RSCREWBIG DM1ASF01 { get; set; } public RSCREWBIG DM1BSF01 { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs index f749749..df65f10 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs @@ -54,14 +54,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool Hopper_2_LowLevel_Set { get; set; } public bool Hopper_3_LowLevel_Set { get; set; } public bool Hopper_4_LowLevel_Set { get; set; } - public bool WScale_1_HighLevel_Set { get; set; } - public bool WScale_2_HighLevel_Set { get; set; } - public bool WScale_3_HighLevel_Set { get; set; } - public bool WScale_4_HighLevel_Set { get; set; } - public bool WScale_1_LowLevel_Set { get; set; } - public bool WScale_2_LowLevel_Set { get; set; } - public bool WScale_3_LowLevel_Set { get; set; } - public bool WScale_4_LowLevel_Set { get; set; } public bool DMWETER1_Set { get; set; } public bool DMWETER2_Set { get; set; } public bool DMWETER3_Set { get; set; } @@ -79,6 +71,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool DMWETER7_Alarm { get; set; } public bool DMWETER8_Alarm { get; set; } + public int ValueWeight1 { get; set; } + public int ValueWeight2 { get; set; } + public int ValueWeight3 { get; set; } + public int ValueWeight4 { get; set; } + public float topPressure_V1_Set { get; set; } public float topPressure_V2_Set { get; set; } public float topPressure_V3_Set { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 4807981..e34456f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -1020,14 +1020,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.Hopper_2_LowLevel_Set = DB2107.Weight.Hopper_2.Lowlevel; PlcReadTemp.Hopper_3_LowLevel_Set = DB2107.Weight.Hopper_3.Lowlevel; PlcReadTemp.Hopper_4_LowLevel_Set = DB2107.Weight.Hopper_4.Lowlevel; - PlcReadTemp.WScale_1_HighLevel_Set = DB2107.Weight.WScale_1.HighLevel; - PlcReadTemp.WScale_2_HighLevel_Set = DB2107.Weight.WScale_2.HighLevel; - PlcReadTemp.WScale_3_HighLevel_Set = DB2107.Weight.WScale_3.HighLevel; - PlcReadTemp.WScale_4_HighLevel_Set = DB2107.Weight.WScale_4.HighLevel; - PlcReadTemp.WScale_1_LowLevel_Set = DB2107.Weight.WScale_1.Lowlevel; - PlcReadTemp.WScale_2_LowLevel_Set = DB2107.Weight.WScale_2.Lowlevel; - PlcReadTemp.WScale_3_LowLevel_Set = DB2107.Weight.WScale_3.Lowlevel; - PlcReadTemp.WScale_4_LowLevel_Set = DB2107.Weight.WScale_4.Lowlevel; PlcReadTemp.topPressure_V1_Set = DB2107.Pressure.TopPressure_V1.ActualValue; PlcReadTemp.topPressure_V2_Set = DB2107.Pressure.TopPressure_V2.ActualValue; @@ -1129,6 +1121,13 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.PM1KDF01_Set = DB2107.Valve.PM1KDF01; PlcReadTemp.PM1LDF01_Set = DB2107.Valve.PM1LDF01; + PlcReadTemp.ValueWeight1 = DB2119.Spiral_A.Value_Weight; + PlcReadTemp.ValueWeight2 = DB2119.Spiral_B.Value_Weight; + PlcReadTemp.ValueWeight3 = DB2119.Spiral_C.Value_Weight; + + SetMCLabel(DeviceDetailReportForm.ValueWeight1, PlcReadTemp.ValueWeight1); + SetMCLabel(DeviceDetailReportForm.ValueWeight2, PlcReadTemp.ValueWeight2); + SetMCLabel(DeviceDetailReportForm.ValueWeight3, PlcReadTemp.ValueWeight3); SetStateButton(DeviceDetailReportForm.WatchDog, PlcReadTemp.WatchDog_Set); SetSystemStateShow(DeviceDetailReportForm.EMStop, PlcReadTemp.EMStop_Set); @@ -1176,14 +1175,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetSwitchLight(DeviceDetailReportForm.Hopper_2_LowLevel, PlcReadTemp.Hopper_2_LowLevel_Set, false); SetSwitchLight(DeviceDetailReportForm.Hopper_3_LowLevel, PlcReadTemp.Hopper_3_LowLevel_Set, false); SetSwitchLight(DeviceDetailReportForm.Hopper_4_LowLevel, PlcReadTemp.Hopper_4_LowLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_1_HighLevel, PlcReadTemp.WScale_1_HighLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_2_HighLevel, PlcReadTemp.WScale_2_HighLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_3_HighLevel, PlcReadTemp.WScale_3_HighLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_4_HighLevel, PlcReadTemp.WScale_4_HighLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_1_LowLevel, PlcReadTemp.WScale_1_LowLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_2_LowLevel, PlcReadTemp.WScale_2_LowLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_3_LowLevel, PlcReadTemp.WScale_3_LowLevel_Set, false); - SetSwitchLight(DeviceDetailReportForm.WScale_4_LowLevel, PlcReadTemp.WScale_4_LowLevel_Set, false); SetMCLabel(DeviceDetailReportForm.topPressure_V1, (float)Math.Round(PlcReadTemp.topPressure_V2_Set, 2)); @@ -1848,14 +1839,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DeviceDetailReportForm.Hopper_2_LowLevel = GetSwitchLight("Hopper_2_LowLevel"); DeviceDetailReportForm.Hopper_3_LowLevel = GetSwitchLight("Hopper_3_LowLevel"); DeviceDetailReportForm.Hopper_4_LowLevel = GetSwitchLight("Hopper_4_LowLevel"); - DeviceDetailReportForm.WScale_1_HighLevel = GetSwitchLight("WScale_1_HighLevel"); - DeviceDetailReportForm.WScale_2_HighLevel = GetSwitchLight("WScale_2_HighLevel"); - DeviceDetailReportForm.WScale_3_HighLevel = GetSwitchLight("WScale_3_HighLevel"); - DeviceDetailReportForm.WScale_4_HighLevel = GetSwitchLight("WScale_4_HighLevel"); - DeviceDetailReportForm.WScale_1_LowLevel = GetSwitchLight("WScale_1_LowLevel"); - DeviceDetailReportForm.WScale_2_LowLevel = GetSwitchLight("WScale_2_LowLevel"); - DeviceDetailReportForm.WScale_3_LowLevel = GetSwitchLight("WScale_3_LowLevel"); - DeviceDetailReportForm.WScale_4_LowLevel = GetSwitchLight("WScale_4_LowLevel"); DeviceDetailReportForm.DMWETER1 = GetSwitchLight("DMWETER1"); DeviceDetailReportForm.DMWETER11 = GetSwitchLight("DMWETER11"); DeviceDetailReportForm.DMWETER2 = GetSwitchLight("DMWETER2"); @@ -1919,6 +1902,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DeviceDetailReportForm.DM2BSF01 = GetMCLabel("DM2BSF01"); DeviceDetailReportForm.DM2CSF01 = GetMCLabel("DM2CSF01"); DeviceDetailReportForm.DM2DSF01 = GetMCLabel("DM2DSF01"); + DeviceDetailReportForm.ValueWeight1 = GetMCLabel("ValueWeight1"); + DeviceDetailReportForm.ValueWeight2 = GetMCLabel("ValueWeight2"); + DeviceDetailReportForm.ValueWeight3 = GetMCLabel("ValueWeight3"); + DeviceDetailReportForm.ValueWeight4 = GetMCLabel("ValueWeight4"); DeviceDetailReportForm.DM1ASF01 = GetRSCREWBIG("DM1ASF01"); DeviceDetailReportForm.DM1BSF01 = GetRSCREWBIG("DM1BSF01"); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 528a2e4..95e9afe 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,90 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 宋体, 12pt + ButtonHighlight + 1755, 440 + ValueWeight4 + 16, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 宋体, 12pt + ButtonHighlight + 1443, 440 + ValueWeight3 + 16, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 宋体, 12pt + ButtonHighlight + 1201, 440 + ValueWeight2 + 16, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + 宋体, 12pt + ButtonHighlight + 894, 440 + ValueWeight1 + 16, 16 + 1850, 506 HslLanternAlarm8 @@ -56,10 +140,10 @@ True True 8 - Transparent + ControlDark 宋体, 14pt - White - 1810, 443 + 0, 0, 192 + 1797, 515 MCLabel142 19, 19 @@ -78,10 +162,10 @@ True True 7 - Transparent + ControlDark 宋体, 14pt - White - 1717, 443 + 0, 0, 192 + 1721, 514 MCLabel143 19, 19 @@ -100,10 +184,10 @@ True True 6 - Transparent + ControlDark 宋体, 14pt - White - 1498, 443 + 0, 0, 192 + 1485, 514 MCLabel144 19, 19 @@ -122,10 +206,10 @@ True True 5 - Transparent + ControlDark 宋体, 14pt - White - 1405, 443 + 0, 0, 192 + 1408, 514 MCLabel145 19, 19 @@ -144,10 +228,10 @@ True True 4 - Transparent + ControlDark 宋体, 14pt - White - 1253, 444 + 0, 0, 192 + 1245, 515 MCLabel146 19, 19 @@ -166,10 +250,10 @@ True True 3 - Transparent + ControlDark 宋体, 14pt - White - 1158, 445 + 0, 0, 192 + 1167, 514 MCLabel147 19, 19 @@ -188,10 +272,10 @@ True True 2 - Transparent + ControlDark 宋体, 14pt - White - 947, 444 + 0, 0, 192 + 938, 515 MCLabel148 19, 19 @@ -250,10 +334,10 @@ True True 1 - Transparent + ControlDark 宋体, 14pt - White - 856, 445 + 0, 0, 192 + 861, 514 MCLabel157 19, 19 @@ -5768,42 +5852,6 @@ DM1GEM 11, 12 - - - 1591, 270 - WScale_2_LowLevel - 12, 12 - - - - 1591, 238 - WScale_2_HighLevel - 12, 12 - - - - 1040, 239 - WScale_1_HighLevel - 12, 12 - - - - 1075, 239 - WScale_3_HighLevel - 12, 12 - - - - 1075, 272 - WScale_3_LowLevel - 12, 12 - - - - 1040, 272 - WScale_1_LowLevel - 12, 12 - 1547, 243 @@ -5894,24 +5942,12 @@ Hopper_2_LowLevel 12, 12 - - - 1628, 237 - WScale_4_HighLevel - 12, 12 - 1765, 409 Hopper_4_LowLevel 12, 12 - - - 1628, 270 - WScale_4_LowLevel - 12, 12 - 1452, 249 @@ -6163,10 +6199,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 898, 373 + 890, 371 Hopper_1_ActWeight - 11, 12 + 16, 16 @@ -6183,10 +6220,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1205, 373 + 1197, 371 Hopper_2_ActWeight - 11, 12 + 16, 16 @@ -6203,10 +6241,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1445, 373 + 1437, 371 Hopper_3_ActWeight - 11, 12 + 16, 16 @@ -6223,10 +6262,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1759, 373 + 1751, 371 Hopper_4_ActWeight - 11, 12 + 16, 16 @@ -7043,10 +7083,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1584, 254 + 1582, 253 WScale_2_ActWeight - 11, 12 + 16, 16 @@ -7063,10 +7104,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1621, 254 + 1619, 253 WScale_4_ActWeight - 11, 12 + 16, 16 @@ -7103,10 +7145,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1034, 256 + 1031, 255 WScale_1_ActWeight - 11, 12 + 16, 16 @@ -7123,10 +7166,11 @@ True True 0 + 宋体, 12pt ButtonHighlight - 1070, 256 + 1066, 255 WScale_3_ActWeight - 11, 12 + 16, 16