From c5187c76c09dacfda55eff5d56b0381e4a99ec35 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 8 Dec 2023 10:28:38 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=87=AA=E5=8A=A8=E5=B9=B2=E6=B7=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoControl/ControlsHelper.cs | 3 + .../Entity/GelerWeterControlsEntity.cs | 7 +- .../AutoControl/InitAction.cs | 14 +- .../AutoControl/PlcAutoWriteHelper.cs | 13 +- .../MainDetailControlAction.cs | 6 +- .../ManualControl/ManualControlAction.cs | 91 ++++---- .../Data/MCProject/nodeForm/AutoControlC.xml | 199 +++++++++++++++--- .../Data/MCProject/nodeForm/MainDetail.xml | 80 ------- 8 files changed, 244 insertions(+), 169 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs index 7a6e708..4502108 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs @@ -225,6 +225,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl TextE.DryW12.MCValue = Dry.RecipePlcViews[11].Set; TextE.DryWaitTime.MCValue = Dry.RecipeSteps[1].MixTime; TextE.DryOutDelayTime.MCValue = Dry.RecipeSteps[2].MixTime; + TextE.DrySpeed1.MCValue = Dry.RecipeSteps[0].MixSpeed; + TextE.DrySpeed2.MCValue = Dry.RecipeSteps[1].MixSpeed; + TextE.DrySpeed3.MCValue = Dry.RecipeSteps[2].MixSpeed; } public static void GWDataShow(DryerView Gel, List Wet, MCTextBoxEntity TextE) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs index 1daef33..9b69d4b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/Entity/GelerWeterControlsEntity.cs @@ -139,11 +139,14 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.Entity public MCTextBox HADeviation { get; set; } public MCTextBox CBDeviation { get; set; } public MCTextBox HBDeviation { get; set; } + public MCTextBox DrySpeed1 { get; set; } + public MCTextBox DrySpeed2 { get; set; } + public MCTextBox DrySpeed3 { get; set; } + + - - } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs index 0d388df..d3e9c4a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs @@ -151,7 +151,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl #endregion - #region PLC读数刷新控件 + #region PLC读数 刷新控件 private void Mcradion_CheckedChanged(object sender, EventArgs e) { @@ -242,7 +242,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl } ComboE.PasteChooseDry.DataSource = s1; - DB2104Helper dB2104Helper=new DB2104Helper(); + DB2104Helper dB2104Helper = new DB2104Helper(); var data = GetTable(); ComboE.CALeftOrRight.DataSource = data.Copy(); @@ -250,8 +250,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl ComboE.CBLeftOrRight.DataSource = data.Copy(); ComboE.HBLeftOrRight.DataSource = data.Copy(); - var ha= dB2104Helper.GetAHotWater; - + var ha = dB2104Helper.GetAHotWater; TextE.HADeviation.MCValue = ha.differ; ComboE.HALeftOrRight.MCValue = ha.stand; @@ -259,16 +258,12 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl TextE.HBDeviation.MCValue = hb.differ; ComboE.HBLeftOrRight.MCValue = hb.stand; - var ca = dB2104Helper.GetAColWater; - TextE.CADeviation.MCValue = ca.differ; ComboE.CALeftOrRight.MCValue = ca.stand; var cb = dB2104Helper.GetBColWater; - TextE.CBDeviation.MCValue = cb.differ; - ComboE.CBLeftOrRight.MCValue = cb.stand; } @@ -280,7 +275,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl dataTable.Columns.Add("CmbValue", typeof(string)); dataTable.Columns.Add("CmbDisplay", typeof(string)); - DataRow dr=dataTable.NewRow(); + DataRow dr = dataTable.NewRow(); dr[0] = "0"; dr[1] = "无"; dataTable.Rows.Add(dr); @@ -288,7 +283,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl dr[0] = "1"; dr[1] = "左"; dataTable.Rows.Add(dr); - dr = dataTable.NewRow(); dr[0] = "2"; dr[1] = "右"; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs index 358e05a..0de0813 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs @@ -16,6 +16,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl { public static class PlcAutoWriteHelper { + /// + /// 干混公差控制 + /// private static int TFlag = 0; #region 湿混糊化下传 @@ -354,20 +357,26 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl short dryWaitTime = Convert.ToInt16(TextE.DryWaitTime.MCValue.ToString()); short dryOutDelayTime = Convert.ToInt16(TextE.DryOutDelayTime.MCValue.ToString()); + float drySpeed1 = Convert.ToSingle(TextE.DrySpeed1.MCValue.ToString()); + float drySpeed2 = Convert.ToSingle(TextE.DrySpeed2.MCValue.ToString()); + float drySpeed3 = Convert.ToSingle(TextE.DrySpeed3.MCValue.ToString()); Step dryStep1 = new Step() { MixCode = 1, + MixSpeed = drySpeed1, }; Step dryStep2 = new Step() { MixCode = 4, - MixTime = dryWaitTime + MixTime = dryWaitTime, + MixSpeed = drySpeed2, }; Step dryStep3 = new Step() { MixCode = 6, - MixTime = dryOutDelayTime + MixTime = dryOutDelayTime, + MixSpeed = drySpeed3, }; Step dryStep = new Step(); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index f5dd0cc..ff3bc22 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -345,6 +345,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl FreeSqlUnit.Instance.Insert(entity).ExecuteAffrows(); } //逻辑判断插入数据库 + //混炼完成但数据库无记录 if (Mixes[i] && !record.MixIsReady) { FreeSqlUnit.Instance.Update() @@ -352,6 +353,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl .Set(x => x.MixReadyStartTime, DateTime.Now) .Where(x => x.DeviceNo == deviceNo && !x.Done).ExecuteAffrows(); } + //rgv到达但数据库无记录 if (RGVEs[i].RequestFeed && !record.RGVIsReach) { TimeSpan temp = DateTime.Now - record.MixReadyStartTime; @@ -361,12 +363,14 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl .Set(x => x.MixWaitTime, (int)temp.TotalSeconds) .Where(x => x.DeviceNo == deviceNo && !x.Done).ExecuteAffrows(); } + //混炼完成灯灭数据库有记录 if (!Mixes[i] && record.MixIsReady) { FreeSqlUnit.Instance.Update() .Set(x => x.MixReadyEndTime, DateTime.Now) .Where(x => x.DeviceNo == deviceNo && !x.Done).ExecuteAffrows(); } + //rgv到达灯灭数据库有记录 if (!RGVEs[i].RequestFeed && record.RGVIsReach) { TimeSpan temp = DateTime.Now - record.RGVReachTime; @@ -1934,7 +1938,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } else if (flag == 2) { - obj.Text = state ? "开启" : "关闭"; + obj.Text = state ? "启动" : "停止"; } obj.ForeColor = state ? Color.Green : Color.Yellow; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index ea23475..1d5350c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -44,13 +44,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl private byte WetChoose3; private byte WetChoose4; + #region 控件属性定义 + /// /// 取消报警按钮 /// MCButton EliAlarms; - #region 控件属性定义 - MCButton StartMetage1; MCButton StopMetage1; MCButton StartMetage2; @@ -1471,10 +1471,12 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } #endregion + + } /// - /// 下发请求 + /// 下发接料请求 /// /// /// @@ -1496,6 +1498,48 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl }); } + /// + /// 自动控制停止称量控制 + /// + /// plc地址 + /// 控制按钮 + /// 冷水or热水 + /// AorB + private void WaterStopAction(string plcAddress, MCButton button, string h, string a) + { + //先读取plc地址 + bool stopMe1 = PlcConnect.Instance.ReadBool(plcAddress).Content; + bool me1 = !stopMe1; + PlcControl(plcAddress, me1); + string txt = $"{h}水称{a}"; + //如果Plc是1 就证明是点了停止称量 + if (me1) + { + txt += "恢复"; + } + else + { + txt += "停止"; + } + button.Text = txt; + + + txt = $"{h}水称{a}"; + //如果Plc是1 就证明是点了停止称量 + if (!me1) + { + txt += "恢复"; + } + else + { + txt += "停止"; + } + + MessageBox.Show(txt); + ManualLogControl(txt); + MesnacServiceManager.Instance.LoggingService.Info(txt); + } + #endregion #region plc插入控制 @@ -1673,6 +1717,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl #endregion + /// + /// 检测水称冷热交替 + /// + /// + /// private int SelectAddWaterControl(int deviceNo) { var list = FreeSqlUnit.Instance.Select().Where(x => x.DeviceId == deviceNo).ToList(); @@ -1682,42 +1731,6 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl } return Convert.ToInt32(list.LastOrDefault().Hot); } - - private void WaterStopAction(string plcAddress, MCButton button, string h, string a) - { - //先读取plc地址 - bool stopMe1 = PlcConnect.Instance.ReadBool(plcAddress).Content; - bool me1 = !stopMe1; - PlcControl(plcAddress, me1); - string txt = $"{h}水称{a}"; - //如果Plc是1 就证明是点了停止称量 - if (me1) - { - txt += "恢复"; - } - else - { - txt += "停止"; - } - button.Text = txt; - - - txt = $"{h}水称{a}"; - //如果Plc是1 就证明是点了停止称量 - if (!me1) - { - txt += "恢复"; - } - else - { - txt += "停止"; - } - - MessageBox.Show(txt); - ManualLogControl(txt); - MesnacServiceManager.Instance.LoggingService.Info(txt); - } - } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml index 3874c58..4af83d4 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml @@ -3,8 +3,7 @@ - - + Red DarkGray @@ -62,7 +61,9 @@ False - + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + None True True @@ -95,8 +96,7 @@ 19 - - + Red DarkGray @@ -188,8 +188,7 @@ - - + Red DarkGray @@ -247,7 +246,9 @@ False - + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + None True True @@ -280,8 +281,7 @@ 19 - - + Red DarkGray @@ -373,8 +373,7 @@ - - + Red DarkGray @@ -409,7 +408,9 @@ False - + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + None True True @@ -419,8 +420,7 @@ 21 - - + Red DarkGray @@ -558,8 +558,7 @@ - - + Red DarkGray @@ -617,7 +616,9 @@ False - + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAAD1Azw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iVGFibGUxIj4NCiAgICA8eHM6Y29tcGxleFR5cGU+DQogICAgPC94czpjb21wbGV4VHlwZT4NCiAgPC94czplbGVtZW50Pg0KICA8eHM6ZWxlbWVudCBuYW1lPSJ0bXBEYXRhU2V0IiBtc2RhdGE6SXNEYXRhU2V0PSJ0cnVlIiBtc2RhdGE6TWFpbkRhdGFUYWJsZT0iVGFibGUxIiBtc2RhdGE6VXNlQ3VycmVudExvY2FsZT0idHJ1ZSI+DQogICAgPHhzOmNvbXBsZXhUeXBlPg0KICAgICAgPHhzOmNob2ljZSBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib3VuZGVkIiAvPg0KICAgIDwveHM6Y29tcGxleFR5cGU+DQogIDwveHM6ZWxlbWVudD4NCjwveHM6c2NoZW1hPgYFAAAAgAE8ZGlmZmdyOmRpZmZncmFtIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIiB4bWxuczpkaWZmZ3I9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLWRpZmZncmFtLXYxIiAvPgQDAAAADlN5c3RlbS5WZXJzaW9uBAAAAAZfTWFqb3IGX01pbm9yBl9CdWlsZAlfUmV2aXNpb24AAAAACAgICAIAAAAAAAAA//////////8L + None True True @@ -650,8 +651,7 @@ 15 - - + Red DarkGray @@ -763,7 +763,7 @@ 宋体, 12pt 6, 428 WaterDownload - 211, 41 + 211, 70 66 False @@ -771,11 +771,54 @@ 宋体, 12pt 12, 12 GroupBox18 - 223, 475 + 223, 504 63 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + 0 + 0 + True + + + False + + + + Query + True + True + + 66, 47 + DrySpeed2 + 79, 21 + 7 + + + + + Red + DarkGray + + + False + + + + None + True + True + 速度 + 宋体, 9pt + 10, 51 + MCLabel119 + 29, 12 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -794,7 +837,7 @@ True True - 65, 21 + 66, 19 DryWaitTime 79, 21 5 @@ -815,16 +858,16 @@ True 时间 宋体, 9pt - 6, 26 + 10, 23 MCLabel51 29, 12 False 2-时间设定 宋体, 9pt - 6, 50 + 170, 25 GroupBox51 - 158, 53 + 158, 79 7 @@ -847,12 +890,55 @@ DarkGray 干混机下传 宋体, 12pt - 334, 25 + 509, 48 DryDownload - 109, 78 + 160, 56 62 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + 0 + 0 + True + + + False + + + + Query + True + True + + 69, 47 + DrySpeed3 + 79, 21 + 9 + + + + + Red + DarkGray + + + False + + + + None + True + True + 速度 + 宋体, 9pt + 13, 51 + MCLabel120 + 29, 12 + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -871,7 +957,7 @@ True True - 69, 33 + 69, 17 DryOutDelayTime 79, 21 7 @@ -892,33 +978,76 @@ True 排料延时 宋体, 9pt - 10, 37 + 10, 21 MCLabel91 53, 12 False 3-排料等待时间设定 宋体, 9pt - 170, 25 + 334, 25 GroupBox53 - 158, 78 + 158, 79 10 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + 0 + 0 + True + + + False + + + + Query + True + True + + 67, 20 + DrySpeed1 + 79, 21 + 11 + + + + + Red + DarkGray + + + False + + + + None + True + True + 速度 + 宋体, 9pt + 11, 24 + MCLabel121 + 29, 12 + False 1-加粉料 宋体, 9pt 6, 25 GroupBox55 - 158, 19 + 158, 79 1 False 干混机步骤 宋体, 12pt - 241, 522 + 12, 522 GroupBox50 - 449, 110 + 678, 114 61 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 12a9fc0..9a1361f 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -126,86 +126,6 @@ MCLabel132 29, 12 - - - - Red - DarkGray - - - False - - - - None - True - True - 正在下料 - White - 1024, 424 - MCLabel135 - 53, 12 - - - - - Red - DarkGray - - - False - - - - None - True - True - 黑粉罐紫灯： - White - 1024, 409 - MCLabel134 - 77, 12 - - - - - Red - DarkGray - - - False - - - - None - True - True - 下料请求 - White - 1024, 374 - MCLabel136 - 53, 12 - - - - - Red - DarkGray - - - False - - - - None - True - True - 黑粉罐绿灯： - White - 1024, 359 - MCLabel137 - 77, 12 -