diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index d613ac8..9d7a296 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -63,6 +63,108 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public MCLabel ValueWeight3 { get; set; } public MCLabel ValueWeight4 { get; set; } + public MCLabel DryMode4 { get; set; } + public MCLabel DryMode3 { get; set; } + public MCLabel DryMode2 { get; set; } + public MCLabel DryMode1 { get; set; } + public MCLabel DryStatus4 { get; set; } + public MCLabel DryStatus3 { get; set; } + public MCLabel DryStatus2 { get; set; } + public MCLabel DryStatus1 { get; set; } + public MCLabel DryStepCode4 { get; set; } + public MCLabel DryStepCode3 { get; set; } + public MCLabel DryStepCode2 { get; set; } + public MCLabel DryStepCode1 { get; set; } + public MCLabel DryTotalTime4 { get; set; } + public MCLabel DryTotalTime3 { get; set; } + public MCLabel DryTotalTime2 { get; set; } + public MCLabel DryTotalTime1 { get; set; } + public MCLabel DryStepTime4 { get; set; } + public MCLabel DryStepTime3 { get; set; } + public MCLabel DryStepTime2 { get; set; } + public MCLabel DryStepTime1 { get; set; } + + public MCLabel WetMode4 { get; set; } + public MCLabel WetMode3 { get; set; } + public MCLabel WetMode2 { get; set; } + public MCLabel WetMode1 { get; set; } + public MCLabel WetMode5 { get; set; } + public MCLabel WetMode6 { get; set; } + public MCLabel WetMode7 { get; set; } + public MCLabel WetMode8 { get; set; } + public MCLabel WetStatus4 { get; set; } + public MCLabel WetStatus3 { get; set; } + public MCLabel WetStatus2 { get; set; } + public MCLabel WetStatus1 { get; set; } + public MCLabel WetStatus5 { get; set; } + public MCLabel WetStatus6 { get; set; } + public MCLabel WetStatus7 { get; set; } + public MCLabel WetStatus8 { get; set; } + public MCLabel WetStepCode4 { get; set; } + public MCLabel WetStepCode3 { get; set; } + public MCLabel WetStepCode2 { get; set; } + public MCLabel WetStepCode1 { get; set; } + public MCLabel WetStepCode5 { get; set; } + public MCLabel WetStepCode6 { get; set; } + public MCLabel WetStepCode7 { get; set; } + public MCLabel WetStepCode8 { get; set; } + public MCLabel WetTotalTime4 { get; set; } + public MCLabel WetTotalTime3 { get; set; } + public MCLabel WetTotalTime2 { get; set; } + public MCLabel WetTotalTime1 { get; set; } + public MCLabel WetTotalTime5 { get; set; } + public MCLabel WetTotalTime6 { get; set; } + public MCLabel WetTotalTime7 { get; set; } + public MCLabel WetTotalTime8 { get; set; } + public MCLabel WetStepTime4 { get; set; } + public MCLabel WetStepTime3 { get; set; } + public MCLabel WetStepTime2 { get; set; } + public MCLabel WetStepTime1 { get; set; } + public MCLabel WetStepTime5 { get; set; } + public MCLabel WetStepTime6 { get; set; } + public MCLabel WetStepTime7 { get; set; } + public MCLabel WetStepTime8 { get; set; } + + public MCLabel GelMode4 { get; set; } + public MCLabel GelMode3 { get; set; } + public MCLabel GelMode2 { get; set; } + public MCLabel GelMode1 { get; set; } + public MCLabel GelMode5 { get; set; } + public MCLabel GelMode6 { get; set; } + public MCLabel GelMode7 { get; set; } + public MCLabel GelMode8 { get; set; } + public MCLabel GelStatus4 { get; set; } + public MCLabel GelStatus3 { get; set; } + public MCLabel GelStatus2 { get; set; } + public MCLabel GelStatus1 { get; set; } + public MCLabel GelStatus5 { get; set; } + public MCLabel GelStatus6 { get; set; } + public MCLabel GelStatus7 { get; set; } + public MCLabel GelStatus8 { get; set; } + public MCLabel GelStepCode4 { get; set; } + public MCLabel GelStepCode3 { get; set; } + public MCLabel GelStepCode2 { get; set; } + public MCLabel GelStepCode1 { get; set; } + public MCLabel GelStepCode5 { get; set; } + public MCLabel GelStepCode6 { get; set; } + public MCLabel GelStepCode7 { get; set; } + public MCLabel GelStepCode8 { get; set; } + public MCLabel GelTotalTime4 { get; set; } + public MCLabel GelTotalTime3 { get; set; } + public MCLabel GelTotalTime2 { get; set; } + public MCLabel GelTotalTime1 { get; set; } + public MCLabel GelTotalTime5 { get; set; } + public MCLabel GelTotalTime6 { get; set; } + public MCLabel GelTotalTime7 { get; set; } + public MCLabel GelTotalTime8 { get; set; } + public MCLabel GelStepTime4 { get; set; } + public MCLabel GelStepTime3 { get; set; } + public MCLabel GelStepTime2 { get; set; } + public MCLabel GelStepTime1 { get; set; } + public MCLabel GelStepTime5 { get; set; } + public MCLabel GelStepTime6 { get; set; } + public MCLabel GelStepTime7 { get; set; } + public MCLabel GelStepTime8 { 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 28e1c6c..c75c01e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -1530,6 +1530,35 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetControlCabinet(ControlCabinetE.PM1JDF01, PlcReadTemp.PM1JDF01_Set); SetControlCabinet(ControlCabinetE.PM1KDF01, PlcReadTemp.PM1KDF01_Set); SetControlCabinet(ControlCabinetE.PM1LDF01, PlcReadTemp.PM1LDF01_Set); + + SetMCLabel(LabelE.DryMode4, DB2107.Dryer[3].Mode ? "自动" : "手动"); + SetMCLabel(LabelE.DryStatus4, DB2107.Dryer[3].Status ? "开启" : "关闭"); + SetMCLabel(LabelE.DryStepCode4, DB2107.Dryer[3].StepCode); + SetMCLabel(LabelE.DryTotalTime4, DB2107.Dryer[3].TotalTime); + SetMCLabel(LabelE.DryStepTime4, DB2107.Dryer[3].StepTime); + + SetMCLabel(LabelE.GelMode7, DB2107.Gelater[6].Mode ? "自动" : "手动"); + SetMCLabel(LabelE.GelStatus7, DB2107.Gelater[6].Status ? "开启" : "关闭"); + SetMCLabel(LabelE.GelStepCode7, DB2107.Gelater[6].StepCode); + SetMCLabel(LabelE.GelTotalTime7, DB2107.Gelater[6].TotalTime); + SetMCLabel(LabelE.GelStepTime7, DB2107.Gelater[6].StepTime); + SetMCLabel(LabelE.GelMode8, DB2107.Gelater[7].Mode ? "自动" : "手动"); + SetMCLabel(LabelE.GelStatus8, DB2107.Gelater[7].Status ? "开启" : "关闭"); + SetMCLabel(LabelE.GelStepCode8, DB2107.Gelater[7].StepCode); + SetMCLabel(LabelE.GelTotalTime8, DB2107.Gelater[7].TotalTime); + SetMCLabel(LabelE.GelStepTime8, DB2107.Gelater[7].StepTime); + + SetMCLabel(LabelE.WetMode7, DB2107.Weter[6].Mode ? "自动" : "手动"); + SetMCLabel(LabelE.WetStatus7, DB2107.Weter[6].Status ? "开启" : "关闭"); + SetMCLabel(LabelE.WetStepCode7, DB2107.Weter[6].StepCode); + SetMCLabel(LabelE.WetTotalTime7, DB2107.Weter[6].TotalTime); + SetMCLabel(LabelE.WetStepTime7, DB2107.Weter[6].StepTime); + SetMCLabel(LabelE.WetMode8, DB2107.Weter[7].Mode ? "自动" : "手动"); + SetMCLabel(LabelE.WetStatus8, DB2107.Weter[7].Status ? "开启" : "关闭"); + SetMCLabel(LabelE.WetStepCode8, DB2107.Weter[7].StepCode); + SetMCLabel(LabelE.WetTotalTime8, DB2107.Weter[7].TotalTime); + SetMCLabel(LabelE.WetStepTime8, DB2107.Weter[7].StepTime); + } #endregion @@ -1673,7 +1702,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl /// /// /// - public void SetMCLabel(MCLabel obj, float set) + public void SetMCLabel(MCLabel obj, object set) { obj.Text = Convert.ToString(set); } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index f47e9a3..bfbdcd0 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,741 @@ + + + + + Red + DarkGray + + + False + + + + None + True + True + 糊化8 + ButtonHighlight + 1621, 783 + MCLabel109 + 35, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1859, 783 + GelStepTime8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1810, 783 + GelTotalTime8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1761, 783 + GelStepCode8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1711, 783 + GelStatus8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1662, 783 + GelMode8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 糊化7 + ButtonHighlight + 1621, 742 + MCLabel103 + 35, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1859, 742 + GelStepTime7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1810, 742 + GelTotalTime7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1761, 742 + GelStepCode7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1711, 742 + GelStatus7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1662, 742 + GelMode7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 湿混8 + ButtonHighlight + 1621, 881 + MCLabel115 + 35, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1859, 881 + WetStepTime8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1810, 881 + WetTotalTime8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1761, 881 + WetStepCode8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1711, 881 + WetStatus8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1662, 881 + WetMode8 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 湿混7 + ButtonHighlight + 1621, 840 + MCLabel121 + 35, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1859, 840 + WetStepTime7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1810, 840 + WetTotalTime7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1761, 840 + WetStepCode7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1711, 840 + WetStatus7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1662, 840 + WetMode7 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 干混4 + ButtonHighlight + 1621, 688 + MCLabel122 + 35, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1859, 688 + DryStepTime4 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1810, 688 + DryTotalTime4 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1761, 688 + DryStepCode4 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1711, 688 + DryStatus4 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 0 + ButtonHighlight + 1662, 688 + DryMode4 + 11, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 步时 + ButtonHighlight + 1859, 647 + MCLabel128 + 29, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 总时 + ButtonHighlight + 1810, 647 + MCLabel130 + 29, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 步序 + ButtonHighlight + 1761, 647 + MCLabel129 + 29, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 状态 + ButtonHighlight + 1711, 647 + MCLabel131 + 29, 12 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 模式 + ButtonHighlight + 1662, 647 + Mode4 + 29, 12 + 1774, 592 RGVWaitDisPlay8