diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs index 34313e3..dfaf896 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/AutoControl.cs @@ -192,7 +192,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - LjLogControl.ManualLogControl("手动下粉料", ControlsHelper.SingleSelect(RadioE), 3); + int i = ControlsHelper.SingleSelect(RadioE); + LjLogControl.ManualLogControl("手动下粉料向" + i, i, 3); MessageBox.Show("信号下达成功！"); } @@ -214,7 +215,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - LjLogControl.ManualLogControl("手动下冷水", ControlsHelper.SingleSelect(RadioE), 1); + int i = ControlsHelper.SingleSelect(RadioE); + LjLogControl.ManualLogControl("手动下冷水向" + i, i, 1); MessageBox.Show("信号下达成功！"); } @@ -237,7 +239,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } else { - LjLogControl.ManualLogControl("手动下热水", ControlsHelper.SingleSelect(RadioE), 1); + int i = ControlsHelper.SingleSelect(RadioE); + LjLogControl.ManualLogControl("手动下热水向" + i, i, 1); MessageBox.Show("信号下达成功！"); } @@ -280,7 +283,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl if (b) { - LjLogControl.ManualLogControl("手动下黑粉料", 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), ControlsHelper.SingleSelect(RadioE), 2); + int i = ControlsHelper.SingleSelect(RadioE); + LjLogControl.ManualLogControl("手动下黑粉料向" + i, 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), i, 2); MessageBox.Show("数据下传成功！"); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index bce9baa..292bf0b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -282,6 +282,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public SwitchLight DMWETER77 { get; set; } public SwitchLight DMWETER8 { get; set; } public SwitchLight DMWETER88 { get; set; } + public SwitchLight AlarmIndicate { get; set; } + } public class RSCREWBIGEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 9af1c6f..466eb8f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -44,7 +44,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private Timer timer; - private string AlarmString = "报警信息 "; + private string AlarmString = ""; int LineKindFlag = 0; @@ -614,6 +614,15 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } string str = sb.ToString(); + if (string.IsNullOrWhiteSpace(str)) + { + ControlsHelper.SetSwitchLight(LightE.AlarmIndicate, true, false); + } + else + { + ControlsHelper.SetSwitchLight(LightE.AlarmIndicate, false, true); + } + LightE.AlarmIndicate.BackColor = Color.Transparent; str = str.Replace("\r\n", string.Empty); if (str != AlarmString) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index 819185d..625ef16 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -1,33 +1,20 @@ using DataBlockHelper; -using DevExpress.DataAccess.Native.Json; -using DevExpress.Utils.About; -using ICSharpCode.Core; using Mesnac.Action.Base; -using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.FreeDb; using Mesnac.Action.ChemicalWeighing.InterfaceDocking; using Mesnac.Action.ChemicalWeighing.InterfaceDocking.DockingEntity; -using Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo; -using Mesnac.Basic; using Mesnac.Controls.Base; using Mesnac.Controls.Default; using Mesnac.Core.Service; using System; using System.Collections.Generic; using System.Data; -using System.IO; using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using Mesnac.Action.ChemicalWeighing.LjMaterial; using Mesnac.Action.ChemicalWeighing.MinAn; -using System.Xml.Serialization; using System.Threading; using DataBlockHelper.DBHelpers; using System.Diagnostics; -using DevExpress.XtraRichEdit.Commands.Internal; using Mesnac.Action.ChemicalWeighing.Report; using Mesnac.Action.ChemicalWeighing.Report.Entity; diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml index 51ee0d7..278d85d 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjLogForm.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHQAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAFdmFsdWUGCwAAAAPlgLwBBgAAAAQAAAAGDAAAAAdsb2d0aW1lBg0AAAAM5pel5b+X5pel5pyfAQcAAAAEAAAABg4AAAAIZGV2aWNlbm8GDwAAAAzorr7lpIfnvJblj7cL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAIZGV2aWNlbm8GCwAAAAzorr7lpIfnvJblj7cBBgAAAAQAAAAGDAAAAAV2YWx1ZQYNAAAAA+WAvAEHAAAABAAAAAYOAAAAB2xvZ3RpbWUGDwAAAAzml6Xlv5fml6XmnJ8L AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 1bded3e..9114e7f 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,33 @@ + + + + Red + DarkGray + + + False + + + + None + True + True + 报警指示 + 宋体, 9pt + ButtonHighlight + 1798, 879 + MCLabel238 + 53, 12 + + + + 1862, 872 + AlarmIndicate + 27, 28 + @@ -928,7 +955,7 @@ 46, 872 AlarmMoveText - 1830, 28 + 1735, 28 1776, 805 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index 5392248..195663e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -195,7 +195,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHQAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAFdmFsdWUGCwAAAAPlgLwBBgAAAAQAAAAGDAAAAAdsb2d0aW1lBg0AAAAM5pel5b+X5pel5pyfAQcAAAAEAAAABg4AAAAIZGV2aWNlbm8GDwAAAAzorr7lpIfnvJblj7cL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAdsb2d0ZXh0BgkAAAAM5pel5b+X5YaF5a65AQUAAAAEAAAABgoAAAAIZGV2aWNlbm8GCwAAAAzorr7lpIfnvJblj7cBBgAAAAQAAAAGDAAAAAV2YWx1ZQYNAAAAA+WAvAEHAAAABAAAAAYOAAAAB2xvZ3RpbWUGDwAAAAzml6Xlv5fml6XmnJ8L AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL