From 24048918ff9a100ce1a3a48dc7918b66c330f1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Mon, 10 Jun 2024 17:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/HslControlsEntity.cs | 26 +- .../MainDetailControlAction.cs | 68 +++- .../Qu/InitAction.cs | 226 ++++++++++++- .../DBHelpers/DB2110WriteHelper.cs | 39 ++- DataBlockHelper/DBHelpers/Db2110Help.cs | 2 +- Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml | 300 ++++++++++++++---- .../Data/MCProject/nodeForm/MainDetail.xml | 117 ++++--- Main/MCEdit/MCEdit.csproj | 1 + Main/MCRun/Data/SysConfig/MenuConfig.dat | Bin 15966 -> 16363 bytes 9 files changed, 648 insertions(+), 131 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs index 652eab0..5b2de6d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs @@ -59,22 +59,36 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity /// /// 冷水A /// - public HslLanternSimple CoolWaterA { get; set; } + public HslLanternSimple CoolWaterAenable { get; set; } + + + public HslLanternSimple CoolWaterApause { get; set; } + + public HslLanternSimple CoolWaterAready { get; set; } + /// - /// 冷水B + /// 热水A /// - public HslLanternSimple CoolWaterB { get; set; } + public HslLanternSimple HotWaterAenable { get; set; } + public HslLanternSimple HotWaterApause { get; set; } + public HslLanternSimple HotWaterAready { get; set; } + /// - /// 热水A + /// 冷水B /// - public HslLanternSimple HotWaterA { get; set; } + public HslLanternSimple CoolWaterBenable { get; set; } + public HslLanternSimple CoolWaterBpause { get; set; } + public HslLanternSimple CoolWaterBready { get; set; } + /// /// 热水B /// - public HslLanternSimple HotWaterB { get; set; } + public HslLanternSimple HotWaterBenable { get; set; } + public HslLanternSimple HotWaterBpause { get; set; } + public HslLanternSimple HotWaterBready { get; set; } //daybin1 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 3482c28..c3897ca 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -362,10 +362,27 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl SetHslLanternSimple9(HslLanternSimpleE.HslLanternSimple9, dB2108.Main); - SetHslLanternSimple9(HslLanternSimpleE.CoolWaterA, dB2108.CoolWaterA); - SetHslLanternSimple9(HslLanternSimpleE.CoolWaterB, dB2108.CoolWaterB); - SetHslLanternSimple9(HslLanternSimpleE.HotWaterA, dB2108.HotWaterA); - SetHslLanternSimple9(HslLanternSimpleE.HotWaterB, dB2108.HotWaterB); + var a = dB2108.CoolWaterA; + SetHslLanternSimple9Enable(HslLanternSimpleE.CoolWaterAenable, a.enable); + SetHslLanternSimple9Pause(HslLanternSimpleE.CoolWaterApause, a.pause); + SetHslLanternSimple9Read(HslLanternSimpleE.CoolWaterAready, a.ready); + + a = dB2108.HotWaterA; + + SetHslLanternSimple9Enable(HslLanternSimpleE.HotWaterAenable, a.enable); + SetHslLanternSimple9Pause(HslLanternSimpleE.HotWaterApause, a.pause); + SetHslLanternSimple9Read(HslLanternSimpleE.HotWaterAready, a.ready); + + a = dB2108.CoolWaterB; + + SetHslLanternSimple9Enable(HslLanternSimpleE.CoolWaterBenable, a.enable); + SetHslLanternSimple9Pause(HslLanternSimpleE.CoolWaterBpause, a.pause); + SetHslLanternSimple9Read(HslLanternSimpleE.CoolWaterBready, a.ready); + + a = dB2108.HotWaterB; + SetHslLanternSimple9Enable(HslLanternSimpleE.HotWaterBenable, a.enable); + SetHslLanternSimple9Pause(HslLanternSimpleE.HotWaterBpause, a.pause); + SetHslLanternSimple9Read(HslLanternSimpleE.HotWaterBready, a.ready); SetHslLanternSimple9(HslLanternSimpleE.DayBin1, dB2108.Daybin1); SetHslLanternSimple9(HslLanternSimpleE.DayBin2, dB2108.Daybin2); @@ -566,6 +583,45 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } } + public void SetHslLanternSimple9Enable(HslLanternSimple simple,bool b) + { + if (b) + { + simple.LanternBackground = Color.Green; + } + else + { + simple.LanternBackground = Color.Gray; + } + } + + public void SetHslLanternSimple9Pause(HslLanternSimple simple, bool b) + { + if (b) + { + simple.LanternBackground = Color.Yellow; + } + else + { + simple.LanternBackground = Color.Gray; + } + } + + public void SetHslLanternSimple9Read(HslLanternSimple simple, bool b) + { + if (b) + { + simple.LanternBackground = Color.Blue; + } + else + { + simple.LanternBackground = Color.Gray; + } + } + + + + private void RGVRecordShow() { for (int i = 0; i < 8; i++) @@ -1636,6 +1692,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.purgeV5_PV_Set = DB2107.PID.Purge_V5.PV; + + PlcReadTemp.WScale_1_ActWeight_Set = DB2107.Weight.WScale_1.ActWeight; PlcReadTemp.WScale_2_ActWeight_Set = DB2107.Weight.WScale_2.ActWeight; PlcReadTemp.WScale_3_ActWeight_Set = DB2107.Weight.WScale_3.ActWeight; @@ -1910,6 +1968,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetMCLabel(LabelE.purgeV4_PV, (float)Math.Round(PlcReadTemp.purgeV4_PV_Set, 2)); ControlsHelper.SetMCLabel(LabelE.purgeV5_PV, (float)Math.Round(PlcReadTemp.purgeV5_PV_Set, 2)); + + ControlsHelper.SetMCLabel(LabelE.WScale_1_ActWeight, (float)Math.Round(PlcReadTemp.WScale_1_ActWeight_Set, 2)); ControlsHelper.SetMCLabel(LabelE.WScale_2_ActWeight, (float)Math.Round(PlcReadTemp.WScale_2_ActWeight_Set, 2)); ControlsHelper.SetMCLabel(LabelE.WScale_3_ActWeight, (float)Math.Round(PlcReadTemp.WScale_3_ActWeight_Set, 2)); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs index 1b1ee80..95a615c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using DataBlockHelper.DBHelpers; +using Mesnac.Controls.ChemicalWeighing; +using DataBlockHelper; namespace Mesnac.Action.ChemicalWeighing.Qu { @@ -44,12 +46,70 @@ namespace Mesnac.Action.ChemicalWeighing.Qu MCButton MCButton2147483646; + HslLanternSimple HslEnable; + HslLanternSimple HslPuase; + + MCButton BtnEnable; + MCButton BtnPuase; + + HslLanternSimple CoolWaterA; + HslLanternSimple CoolWaterB; + + HslLanternSimple HotWaterA; + HslLanternSimple HotWaterB; + + + MCButton BtnCoolWaterA; + MCButton BtnCoolWaterB; + MCButton BtnHotWaterA; + MCButton BtnHotWaterB; public void Run(RuntimeParameter runtime) { base.RunIni(runtime); //必须调用 var controls = GetAllControls(); + + BtnCoolWaterA = controls.FirstOrDefault(x => x.Name == "BtnCoolWaterA") as MCButton; + + BtnCoolWaterA.Click += BtnCoolWaterA_Click; + + BtnCoolWaterB = controls.FirstOrDefault(x => x.Name == "BtnCoolWaterB") as MCButton; + + BtnCoolWaterB.Click += BtnCoolWaterB_Click; + + BtnHotWaterA = controls.FirstOrDefault(x => x.Name == "BtnCoolHotWaterA") as MCButton; + + BtnHotWaterA.Click += BtnHotWaterA_Click; + + BtnHotWaterB = controls.FirstOrDefault(x => x.Name == "BtnCoolHotWaterB") as MCButton; + + BtnHotWaterB.Click += BtnHotWaterB_Click; + + CoolWaterA = controls.FirstOrDefault(x => x.Name == "CoolWaterA") as HslLanternSimple; + + CoolWaterB = controls.FirstOrDefault(x => x.Name == "CoolWaterB") as HslLanternSimple; + + HotWaterA = controls.FirstOrDefault(x => x.Name == "HotWaterA") as HslLanternSimple; + + HotWaterB = controls.FirstOrDefault(x => x.Name == "HotWaterB") as HslLanternSimple; + + + HslEnable = controls.FirstOrDefault(x => x.Name == "HslEnable") as HslLanternSimple; + + HslPuase = controls.FirstOrDefault(x => x.Name == "HslPuase") as HslLanternSimple; + + + BtnEnable = controls.FirstOrDefault(x => x.Name == "BtnEnable") as MCButton; + BtnEnable.Click += BtnEnable_Click; + + + + BtnPuase = controls.FirstOrDefault(x => x.Name == "BtnPuase") as MCButton; + + BtnPuase.Click += BtnPuase_Click; + + MCLabelA = controls.FirstOrDefault(x => x.Name == "MCLabelA") as MCLabel; MCLabelA.MCValue = ""; @@ -105,6 +165,80 @@ namespace Mesnac.Action.ChemicalWeighing.Qu } + private void BtnHotWaterB_Click(object sender, EventArgs e) + { + if (BtnHotWaterB.MCValue.ToString().Contains("开")) + { + PlcConnect.Instance.Write("DB2108.8.0", true); + } + else + { + PlcConnect.Instance.Write("DB2108.8.0", false); + } + } + + private void BtnHotWaterA_Click(object sender, EventArgs e) + { + if (BtnHotWaterA.MCValue.ToString().Contains("开")) + { + PlcConnect.Instance.Write("DB2108.6.0", true); + } + else + { + PlcConnect.Instance.Write("DB2108.6.0", false); + } + } + + private void BtnCoolWaterB_Click(object sender, EventArgs e) + { + if (BtnCoolWaterB.MCValue.ToString().Contains("开")) + { + PlcConnect.Instance.Write("DB2108.4.0", true); + } + else + { + PlcConnect.Instance.Write("DB2108.4.0", false); + } + } + + private void BtnCoolWaterA_Click(object sender, EventArgs e) + { + if (BtnCoolWaterA.MCValue.ToString().Contains("开")) + { + PlcConnect.Instance.Write("DB2108.2.0", true); + } + else + { + PlcConnect.Instance.Write("DB2108.2.0", false); + } + } + + private void BtnPuase_Click(object sender, EventArgs e) + { + //BtnPuase + + if (BtnPuase.MCValue.ToString() == "启动") + { + PlcConnect.Instance.Write("DB2108.0.1", true); + } + else + { + PlcConnect.Instance.Write("DB2108.0.1", false); + } + } + + private void BtnEnable_Click(object sender, EventArgs e) + { + if (BtnEnable.MCValue.ToString()== "启动使能") + { + PlcConnect.Instance.Write("DB2108.0.0",true); + } + else + { + PlcConnect.Instance.Write("DB2108.0.0", false); + } + } + private void MCButton2147483646_Click(object sender, EventArgs e) { DB2108HelperNew dB2108 = new DB2108HelperNew(); @@ -134,6 +268,10 @@ namespace Mesnac.Action.ChemicalWeighing.Qu plsHopper_On.MCValue = time.PlsHopperOn; plsHopper_Off.MCValue = time.PlsHopperOff; } + + + + } private void BtnA_Click(object sender, EventArgs e) @@ -227,6 +365,13 @@ namespace Mesnac.Action.ChemicalWeighing.Qu private void StateRefresh(object sender, EventArgs e) { + if (GetAllControls().Count == 0) + { + timer.Stop(); + timer.Dispose(); + timer = null; + } + Db2110Help db2110 = new Db2110Help(); string a = db2110.GetA(); if (a.Length == 0) @@ -250,8 +395,87 @@ namespace Mesnac.Action.ChemicalWeighing.Qu } + DB2108HelperNew dB2108 = new DB2108HelperNew(); + var main = dB2108.Main; + if (main.pause) + { + BtnPuase.MCValue = "停止"; + HslPuase.LanternBackground = System.Drawing.Color.Green; + } + else + { + BtnPuase.MCValue = "启动"; + HslPuase.LanternBackground = System.Drawing.Color.Gray; + } + + + if (main.enable) + { + HslEnable.LanternBackground = System.Drawing.Color.Green; + BtnEnable.MCValue = "禁止使能"; + } + else + { + BtnEnable.MCValue = "启动使能"; + HslEnable.LanternBackground = System.Drawing.Color.Gray; + } + + + + + var ab= dB2108.CoolWaterA; + if (ab.enable) + { + BtnCoolWaterA.MCValue = "冷水秤A使能关闭"; + CoolWaterA.LanternBackground= System.Drawing.Color.Green; + } + else + { + BtnCoolWaterA.MCValue = "冷水秤A使能开始"; + CoolWaterA.LanternBackground = System.Drawing.Color.Gray; + } + + ab= dB2108.CoolWaterB; + + if (ab.enable) + { + BtnCoolWaterB.MCValue = "冷水秤B使能关闭"; + CoolWaterB.LanternBackground = System.Drawing.Color.Green; + } + else + { + BtnCoolWaterB.MCValue = "冷水秤B使能开始"; + CoolWaterB.LanternBackground = System.Drawing.Color.Gray; + } + + + ab = dB2108.HotWaterA; + if (ab.enable) + { + BtnHotWaterA.MCValue = "热水秤A使能关闭"; + HotWaterA.LanternBackground = System.Drawing.Color.Green; + } + else + { + BtnHotWaterA.MCValue = "热水秤A使能开始"; + HotWaterA.LanternBackground = System.Drawing.Color.Gray; + } + + + + ab = dB2108.HotWaterB; + + if (ab.enable) + { + BtnHotWaterB.MCValue = "热水秤B使能关闭"; + HotWaterB.LanternBackground = System.Drawing.Color.Green; + } + else + { + BtnHotWaterB.MCValue = "热水秤B使能开始"; + HotWaterB.LanternBackground = System.Drawing.Color.Gray; + } - } } } diff --git a/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs b/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs index ebd1a26..5169f68 100644 --- a/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs +++ b/DataBlockHelper/DBHelpers/DB2110WriteHelper.cs @@ -14,20 +14,23 @@ namespace DataBlockHelper.DBHelpers { var siemensS7Net = PlcConnect.Instance; int start = 3384; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + ushort a = 0; + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); + + + siemensS7Net.Write($"{DbName}.3412.0", a); - } @@ -36,33 +39,35 @@ namespace DataBlockHelper.DBHelpers { var siemensS7Net = PlcConnect.Instance; int start = 3394; - - - siemensS7Net.Write($"{DbName}.{start}.0", 0); + ushort a = 0; + + siemensS7Net.Write($"{DbName}.{start}.0",a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); start += 2; - siemensS7Net.Write($"{DbName}.{start}.0", 0); + siemensS7Net.Write($"{DbName}.{start}.0", a); + + siemensS7Net.Write($"{DbName}.3414.0", a); } } } diff --git a/DataBlockHelper/DBHelpers/Db2110Help.cs b/DataBlockHelper/DBHelpers/Db2110Help.cs index 69c624c..37eb37c 100644 --- a/DataBlockHelper/DBHelpers/Db2110Help.cs +++ b/DataBlockHelper/DBHelpers/Db2110Help.cs @@ -52,7 +52,7 @@ namespace DataBlockHelper.DBHelpers string a= list[i]; if (i > 0) { - stringBuilder.Append("=>"+a); + stringBuilder.Append("=> "+a); } else { diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml index b8df96f..6bb43aa 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml @@ -1,5 +1,195 @@ + + + 221, 193 + HotWaterB + 39, 32 + + + 38, 193 + HotWaterA + 39, 32 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 启动 + 178, 260 + BtnCoolHotWaterB + 120, 31 + 23 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 使能 + 12, 260 + BtnCoolHotWaterA + 120, 31 + 22 + + + 220, 26 + CoolWaterB + 39, 32 + + + 37, 26 + CoolWaterA + 39, 32 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 启动 + 177, 93 + BtnCoolWaterB + 120, 31 + 19 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 使能 + 11, 93 + BtnCoolWaterA + 120, 31 + 18 + + False + 水秤 + 371, 12 + GroupBox4 + 316, 312 + 15 + + + + 220, 26 + HslPuase + 39, 32 + + + 37, 26 + HslEnable + 39, 32 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 启动 + 177, 93 + BtnPuase + 120, 31 + 19 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 使能 + 11, 93 + BtnEnable + 120, 31 + 18 + + False + 主风机 + 25, 12 + GroupBox3 + 316, 145 + 14 + @@ -19,7 +209,7 @@ True True - 341, 254 + 345, 228 plsHopper_Off 100, 21 41 @@ -38,10 +228,10 @@ None True True - plsHopper_Off - 253, 254 + 缓存破功关时间 + 253, 234 MCLabel2147483635 - 83, 12 + 89, 12 @@ -61,7 +251,7 @@ True True - 108, 254 + 130, 228 plsHopper_On 100, 21 39 @@ -80,10 +270,10 @@ None True True - plsHopper_on - 35, 258 + 缓存破功开时间 + 31, 234 MCLabel2147483634 - 77, 12 + 89, 12 @@ -103,7 +293,7 @@ True True - 341, 210 + 345, 187 plsDaybin_Off 100, 21 37 @@ -122,10 +312,10 @@ None True True - plsDaybin_Off - 253, 210 + 日罐破拱关时间 + 253, 191 MCLabel2147483637 - 83, 12 + 89, 12 @@ -145,7 +335,7 @@ True True - 108, 210 + 130, 187 plsDaybin_On 100, 21 35 @@ -164,10 +354,10 @@ None True True - plsDaybin_On - 35, 214 + 日罐破拱开时间 + 31, 191 MCLabel2147483636 - 77, 12 + 89, 12 @@ -187,7 +377,7 @@ True True - 341, 165 + 345, 146 plsSilo_Off 100, 21 33 @@ -206,10 +396,10 @@ None True True - plsSilo_Off - 253, 165 + 大仓脉冲关时间 + 253, 148 MCLabel2147483639 - 71, 12 + 89, 12 @@ -229,7 +419,7 @@ True True - 108, 165 + 130, 146 plsSilo_On 100, 21 31 @@ -248,10 +438,10 @@ None True True - plsSilo_On - 35, 169 + 大仓脉冲开时间 + 31, 148 MCLabel2147483638 - 65, 12 + 89, 12 @@ -271,7 +461,7 @@ True True - 341, 112 + 345, 107 vibHopper_Off 100, 21 29 @@ -290,10 +480,10 @@ None True True - vibHopper_Off - 253, 112 + 缓存震动关时间 + 253, 111 MCLabel2147483641 - 83, 12 + 89, 12 @@ -313,7 +503,7 @@ True True - 108, 112 + 130, 107 vibHopper_On 100, 21 27 @@ -332,10 +522,10 @@ None True True - vibHopper_On - 35, 116 + 缓存震动开时间 + 31, 111 MCLabel2147483640 - 77, 12 + 89, 12 @@ -355,7 +545,7 @@ True True - 341, 70 + 345, 70 vibDaybin_Off 100, 21 25 @@ -374,10 +564,10 @@ None True True - vibDaybin_Off + 日罐震动关时间 253, 70 MCLabel2147483643 - 83, 12 + 89, 12 @@ -397,7 +587,7 @@ True True - 108, 70 + 130, 70 vibDaybin_On 100, 21 23 @@ -416,10 +606,10 @@ None True True - vibDaybin_On - 35, 74 + 日罐震动开时间 + 31, 74 MCLabel2147483642 - 77, 12 + 89, 12 @@ -439,7 +629,7 @@ True True - 340, 37 + 345, 36 vibSilo_Off 100, 21 21 @@ -458,10 +648,10 @@ None True True - vibSilo_Off + 大仓震动关时间 249, 37 MCLabel2147483644 - 71, 12 + 89, 12 @@ -481,7 +671,7 @@ True True - 108, 37 + 130, 37 vibSilo_On 100, 21 19 @@ -500,10 +690,10 @@ None True True - vibSilo_On + 大仓震动开时间 31, 41 MCLabel2147483645 - 65, 12 + 89, 12 @@ -524,7 +714,7 @@ Red DarkGray 同步数据 - 267, 323 + 315, 283 MCButton2147483646 120, 31 18 @@ -548,16 +738,16 @@ Red DarkGray 更新数据 - 45, 323 + 59, 283 BtnUpdate 120, 31 18 False 取消时间 - 415, 21 + 731, 23 GroupBox2 - 638, 440 + 475, 486 13 @@ -576,7 +766,7 @@ True True MCLabel1 - 195, 37 + 11, 102 MCLabelB 53, 12 @@ -618,7 +808,7 @@ Red DarkGray 取消列队B - 177, 93 + 358, 93 BtnB 120, 31 19 @@ -642,16 +832,16 @@ Red DarkGray 取消列队A - 11, 93 + 358, 28 BtnA 120, 31 18 False 取消队列 - 25, 12 + 25, 358 GroupBox1 - 316, 151 + 662, 151 12 @@ -670,7 +860,7 @@ False False Control - 1132, 543 + 1246, 717 WindowsDefaultLocation 缓存队列取消 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index d3afe05..06d325d 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,9 +1,33 @@ + + 1648, 388 + HotWaterBready + 10, 7 + + + 1648, 359 + HotWaterBenable + 10, 7 + + + 1648, 373 + HotWaterBpause + 10, 7 + + + 1563, 389 + CoolWaterBready + 10, 7 + + + 1563, 360 + CoolWaterBenable + 10, 7 + - - + Red DarkGray @@ -23,8 +47,7 @@ 23, 12 - - + Red DarkGray @@ -44,8 +67,7 @@ 23, 12 - - + Red DarkGray @@ -65,8 +87,7 @@ 23, 12 - - + Red DarkGray @@ -86,8 +107,7 @@ 23, 12 - - + Red DarkGray @@ -107,8 +127,7 @@ 23, 12 - - + Red DarkGray @@ -128,8 +147,7 @@ 23, 12 - - + Red DarkGray @@ -149,8 +167,7 @@ 23, 12 - - + Red DarkGray @@ -170,8 +187,7 @@ 23, 12 - - + Red DarkGray @@ -191,8 +207,7 @@ 23, 12 - - + Red DarkGray @@ -212,8 +227,7 @@ 23, 12 - - + Red DarkGray @@ -233,8 +247,7 @@ 23, 12 - - + Red DarkGray @@ -254,8 +267,7 @@ 23, 12 - - + Red DarkGray @@ -275,8 +287,7 @@ 23, 12 - - + Red DarkGray @@ -296,8 +307,7 @@ 23, 12 - - + Red DarkGray @@ -317,8 +327,7 @@ 23, 12 - - + Red DarkGray @@ -338,8 +347,7 @@ 23, 12 - - + Red DarkGray @@ -503,24 +511,39 @@ DayBin1 7, 7 - - 1622, 359 - HotWaterB + + 1563, 374 + CoolWaterBpause + 10, 7 + + + 1090, 390 + HotWaterAready 7, 7 - - 1586, 360 - CoolWaterB - 10, 7 + + 1090, 376 + HotWaterApause + 7, 7 + + + 1090, 359 + HotWaterAenable + 7, 7 + + + 1008, 360 + CoolWaterAenable + 7, 7 - - 1064, 359 - HotWaterA + + 1008, 376 + CoolWaterApause 7, 7 - - 1030, 360 - CoolWaterA + + 1008, 390 + CoolWaterAready 7, 7 diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index d14e733..ecc4316 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -445,6 +445,7 @@ PreserveNewest + PreserveNewest diff --git a/Main/MCRun/Data/SysConfig/MenuConfig.dat b/Main/MCRun/Data/SysConfig/MenuConfig.dat index 79c03bbe01d24c2fa3676df38b809b48f95a2164..857b65abae45bfb4e90029a53884785f4a3bef7b 100644 GIT binary patch delta 3194 zcmZ9NYfMx}6o45G(_F+ZT~Suh-34`dugW7Oksob+G_`B$J8HGYSB;fYUzjx2;)9n^ zMLeygmPUyP#0QF0K&?`vNmHb1leN`qYiYQ57l~RiqGAf2bC!EExtr`{&YAOlJ9l>X z%wJo&a!+Mg8bU*o8DxaHBL@cs1u2tpn1aJp9HxmOcqlL)-B1zM&e+@VxitmOSYuvM zX5!MTxCGAO)wWq84Apj(sKvF~o*K2NQNawK4b8*cd@j~n^jiBo5nBC)M@6k#x16EA~RBFhGvP7B?rp0VN7HaTL&{E+pO!+)wyk(T6iw7xDnh@PM#yu zp_?1#MvY}`bHk^j!Whek;?Zd=4_Zd|S+^q9(R@PNUl^cr;kw<$w~KUewEmga9a!Zr zsW+{$GJU$k17?3 z;5V0lk^`@$jAUgnJv!a`kt|z-GAN7oMwN?F%fQhVAN23MpdBg;NDjcZmSNNa zOJ(>2f}h8DZHEOMsy6RcOPe}cDz)t=70mD|=osVT)wqcieUr8tto7II^Y1!6P>UH} z3y;RS_))A)HENGxt@ho{&TsarMFrx^RxrblL+`i*OP!dqG%-YB?j)qTJk}ZV{yen5 zGMCqOMpT4q#Yg-nssq1G1v9)6w#LR;n#Gi5h=Dw3;rm#RW3udd3q9g3O2kW?_#}OU z&=)rf2E~W7OArz7vRoF+EK>|*x&oefk2OO!y^bb08t-MTked*}TSYCu3Ka?CEWaT8 zhR$At8wnn(TV|7qbtii5UQuP$s`LD%#s0dBYE_}HuF|)+K*2n}3C<)J|6NRjr|8?X z-!c;er+|5W8zv^Z`5h#t>O|~aBz!-BdZN6u{GeL&wOYDgYb;VQ&;P{QX&XMCm4kmD z%RLb?Y%28Fe?xY%$1zIYdK7M5yhVw4i35B`{~V@4r8}H!BF%kp-kr!h#WZ-jz8-a7 zgcj{=i`LYnRh+}Gu(DRcB=3T2;}h8f7&@_yJ%siN!(LGyV*ZhsC-TRr@#q@X4S!5@ z@@`yzvM(ipKgH!4#&QolPf6lExcm$fQe)W*$WCixz2Hc5@?K28gsEw9{6ECrGq66G zlz_17#vDZ7VWh^VRUA1pY$JoAp-e881_@PSb|TUa#zOgNEmi6hW(nbl?Jw)u-|0trWwPQO&Ip`z=5qM?1qe8H)HE`EZe}c z2y2zGpUqf~j%_rs^@LrKvCC!*dpvD2*TA+Cc2UMIn6UyK%QLVYgf+`plNl@1G3@$* zBiT*ZX&I|GV--4fz`)88%RDY)$IMu@j#U{L_I!oH!}Nozk_Cq)0rmift)332))3%D zpio#tf(lvityzHmp9IGZ0p1P@g~v$nr7Qrmpjj6*8Unl)6bjFf;0sw$VisV(ryX1} z1T8qD@JABl$%37-fQd7}rcZ*ah5)Ywg~C=6Y>@?@$pSn??DHhJX$bHZP$=}0V3RD^ zXcpYj1-A_WUJ43@w@8pB3)Y$i_jCbX3V~l8-Vq9gcS*2P7OXG}u;J4q_zVGF2MUE6 z2^PzO_sxO_x}eJt;02*jc%KAwWx*V?0PhOg!6QR}H;F>wLlSso!MkR`Q(f@H5a3m# zP}og^DY9U)S@1#^JTnA6IHRzK1evm6l39Qk6FtI9Lx9(oLSZin(quuZS%5be3Hl8I S-fIeleJHRe$$~_aV95U{0|UhX delta 3051 zcmZ9NeN0nV6u`N%-sCx4NeNPA*cP?Or-HyR!^K5rbgLU=5^*{QAsEycol!Fr;$RF= zbWnFP9dV1I<3pVYqT)A;{;^@0`$IO3E@n91YjM*JBTmdFyXTbN-MuF7=A3iS@7LGc z_PpOdyi?YmWjz$j8I**lM2-sy3DM@`l7q`@VzEpB#$BD)!uuIp0PVIkwh->v+~X`S zKx*W-_FT~tX6)Fh*R~pUE&BG;8di87+>1!zZzFHTz9~yYX!F+`5q*07N5*IEW8GNi z`4Ad8gDr)m$X-?eBau^i0hX6R?8IcY9C9c2vK0^$4X7I?BV!?9&_bhKJrOf<30 zBB&CVh(lP&`0<*Y3;6&^!whw-d&9D`!ruWbU2~+#*2L&9apYiJTT?5^XM#XUrEBp{loaSat zFn3z7y%}5lEuZ>#oEU4t3U2||bT>aNLd$Ht5Bm}9Grp`GZ1C#atHpPzVTB)sBzJ=K zmW5U=BTbLbivQ@ zeXIvM5~6sI=;c@8TEcW|FS7H3?DsG((PNvbvMIzCCiW#=7hN`^`D1^5t-tM({#A{y zt)t`i<*yO17*nE`g%Z2yo1@@SjB8l7qKC<%XFbI~A<+n^2sbV!b6o zhW~y#mD})jipSwn@5YIDBQDV*UgD@1qB^=?Bv$?G38Sma_~IO%d1I@FMSd4XW+w6h z5n2{etB$S4+3x?fVv!pVmYT@@*!nuP4q~gXvsT}==RYeJ`8{x?CGy{~^$l!g_rX5f z$?xOd19)Y20{;{DJhV3indwP<2=^XBX?h%ggnNr=Zy4UqaPnc?dkmEsGuRXGruVWD z*qZ6&BUpY4`!i>T|1CoHmRRUu{t1CQnaN@-rY6Q@k3LiWsLw>Ao)5!Oh>Vtp3yvom zlz}uC8nYs@|562y&4Q&tLB13$!HCi&B=|!WJTMEE2L;Qd0H>@*X#on-e5$}O3krjR zl~S+*KY3ceiv6NsIHDNNU;5<55-TF?wu;>{V>pxvE0x$P!hTe-J~M{nny_^eTT9pv zDt66`Z3A|2@K~teHATIfKy+iw3!5r zs^EZGfCHZdN2LHC2O6bENYJ1PJ~s<+xRcDkwDzaFUb2kOG|Z8l^f3ic~?NS%CAM z1oxx>r@uz&APJVKf&#Mu9|9zJAO-k{&?vo6f;?4_YZg2T3LZ)UK1Vc4he)tU6)ZFh so&*JtrC=B%N{31Csw$Xg7T|-2KEhKez{iqC=?Ds@%uxkdCc*Rn0>_f;761SM