diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index df96173..bce9baa 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -216,6 +216,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public MCLabel LineKind2 { get; set; } public MCLabel LineKind3 { get; set; } public MCLabel LineKind4 { get; set; } + public MCLabel LineKind5 { get; set; } + public MCLabel LineKind6 { get; set; } + public MCLabel LineKind7 { get; set; } + public MCLabel LineKind8 { get; set; } } public class SwitchLightEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index a1f3a5f..67281e1 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -164,6 +164,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetMCLabel(LabelE.LineKind2, new HttpResponse().GetLGInfo()[2]); SetMCLabel(LabelE.LineKind3, new HttpResponse().GetLGInfo()[3]); SetMCLabel(LabelE.LineKind4, new HttpResponse().GetLGInfo()[4]); + SetMCLabel(LabelE.LineKind5, new HttpResponse().GetLGInfo()[5]); + SetMCLabel(LabelE.LineKind6, new HttpResponse().GetLGInfo()[6]); + SetMCLabel(LabelE.LineKind7, new HttpResponse().GetLGInfo()[7]); + SetMCLabel(LabelE.LineKind8, new HttpResponse().GetLGInfo()[8]); timer = new Timer(); timer.Interval = 1000; @@ -288,6 +292,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetMCLabel(LabelE.LineKind2, new HttpResponse().GetLGInfo()[2]); SetMCLabel(LabelE.LineKind3, new HttpResponse().GetLGInfo()[3]); SetMCLabel(LabelE.LineKind4, new HttpResponse().GetLGInfo()[4]); + SetMCLabel(LabelE.LineKind5, new HttpResponse().GetLGInfo()[5]); + SetMCLabel(LabelE.LineKind6, new HttpResponse().GetLGInfo()[6]); + SetMCLabel(LabelE.LineKind7, new HttpResponse().GetLGInfo()[7]); + SetMCLabel(LabelE.LineKind8, new HttpResponse().GetLGInfo()[8]); } var reachSingle = RgvPlcUtil.GetRGVAllError(); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index a19fc64..4c5d284 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 + NAN + 宋体, 12pt + ButtonHighlight + 1791, 657 + LineKind8 + 32, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + NAN + 宋体, 12pt + ButtonHighlight + 1715, 657 + LineKind7 + 32, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + NAN + 宋体, 12pt + ButtonHighlight + 1479, 657 + LineKind6 + 32, 16 + + + + + Red + DarkGray + + + False + + + + None + True + True + NAN + 宋体, 12pt + ButtonHighlight + 1399, 657 + LineKind5 + 32, 16 + @@ -18,7 +102,7 @@ NAN 宋体, 12pt ButtonHighlight - 1755, 657 + 1236, 657 LineKind4 32, 16 @@ -39,7 +123,7 @@ NAN 宋体, 12pt ButtonHighlight - 1442, 657 + 1160, 657 LineKind3 32, 16 @@ -60,7 +144,7 @@ NAN 宋体, 12pt ButtonHighlight - 1201, 657 + 932, 657 LineKind2 32, 16 @@ -81,7 +165,7 @@ NAN 宋体, 12pt ButtonHighlight - 894, 657 + 852, 657 LineKind1 32, 16