From d54cd8c9a43bdd298d5458492b03795642f6b313 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 13 Oct 2023 06:13:28 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E9=BB=91=E7=B2=89=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E5=92=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20change=20-=20=E8=AE=BE=E5=A4=87=E7=BB=86=E8=8A=82=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs | 103 +- .../MainDetailControlAction.cs | 950 ++++++++++-------- .../MainDetailControl/MemoryCacheHelper.cs | 1 - .../Mesnac.Action.ChemicalWeighing.csproj | 2 - .../DeviceDetail2ReportAction.cs | 47 +- .../LjSwith.cs | 11 +- .../MCProject/nodeForm/FormDayWhiteEmbryo.xml | 228 ++++- .../MCProject/nodeForm/FormDeviceDetail2.xml | 2 +- .../Data/MCProject/nodeForm/MainDetail.xml | 602 +---------- 9 files changed, 850 insertions(+), 1096 deletions(-) delete mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MemoryCacheHelper.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs index 0e7c885..712613a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs @@ -4,6 +4,7 @@ using FastReport.Dialog; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.FreeDb; +using Mesnac.Codd.Session; using Mesnac.Controls.Default; using System; @@ -13,6 +14,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using System.Xml.Serialization; namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo { @@ -20,54 +22,89 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo { //BtnOk MCDateTimePicker1 MCDataGridView1 - - private RuntimeParameter _runtime; - MCButton btnOk; + MCButton selectButton; MCDateTimePicker mCDateTimePicker; - - DataGridView dataGridView; - - + MCDateTimePicker startDate; + MCDateTimePicker startTime; + MCDateTimePicker endDate; + MCDateTimePicker endTime; + MCDataGridView dataGridView; + MCDataGridView moreData; DataTable dt; - + DataTable MoreDataTable; + List list; + List listMore; public void Run(RuntimeParameter runtime) { base.RunIni(runtime); //必须调用 this._runtime = runtime; - - var control=GetAllControls(); + var control = GetAllControls(); mCDateTimePicker = control.FirstOrDefault(x => x.Name == "MCDateTimePicker1") as MCDateTimePicker; - btnOk = control.FirstOrDefault(x => x.Name == "MCButton1") as MCButton; - - dataGridView = control.FirstOrDefault(x => x.Name == "MCDataGridView1") as DataGridView; - + dataGridView = control.FirstOrDefault(x => x.Name == "MCDataGridView1") as MCDataGridView; + selectButton = control.FirstOrDefault(x => x.Name == "SelectButton") as MCButton; + moreData = control.FirstOrDefault(x => x.Name == "MoreData") as MCDataGridView; + startDate = control.FirstOrDefault(x => x.Name == "startDate") as MCDateTimePicker; + startTime = control.FirstOrDefault(x => x.Name == "startTime") as MCDateTimePicker; + endDate = control.FirstOrDefault(x => x.Name == "endDate") as MCDateTimePicker; + endTime = control.FirstOrDefault(x => x.Name == "endTime") as MCDateTimePicker; dataGridView.AutoGenerateColumns = true; mCDateTimePicker.Value = DateTime.Now.AddDays(0); + startDate.Value = DateTime.Now.AddDays(-3); - dt=new DataTable(); - dt.Columns.Add("机台",typeof(string)); + dt = new DataTable(); + dt.Columns.Add("机台", typeof(string)); dt.Columns.Add("总量", typeof(string)); + MoreDataTable = new DataTable(); + MoreDataTable.Columns.Add("重量", typeof(string)); + MoreDataTable.Columns.Add("时间", typeof(string)); + btnOk.Click += BtnOk_Click; + selectButton.Click += SelectButton_Click; + dataGridView.CellClick += MoreData_Click; + } private void BtnOk_Click(object sender, EventArgs e) { + dt.Rows.Clear(); + string time = mCDateTimePicker.Value.ToString("yyyyMMdd"); + list = FreeSqlUnit.Instance.Select().Where(x => x.CreateDate == time).ToList(); + for (int i = 1; i <= 8; i++) + { + var dr = dt.NewRow(); + dr[0] = "糊化机" + i; + var totalWeight = list.Where(x => x.DeviceId == i).Sum(x => x.Weight); + dr[1] = totalWeight.ToString(); - + dt.Rows.Add(dr); + } + + dataGridView.DataSource = null; + dataGridView.DataSource = dt; + + } + private void SelectButton_Click(object sender, EventArgs e) + { dt.Rows.Clear(); - string time = mCDateTimePicker.Value.ToString("yyyyMMdd"); - var list=FreeSqlUnit.Instance.Select().Where(x => x.CreateDate == time).ToList(); + DateTime starttime = startDate.Value.Date.AddHours(startTime.Value.Hour); + starttime.AddMinutes(startTime.Value.Minute); + starttime.AddSeconds(startTime.Value.Second); + DateTime endtime = endDate.Value.Date.AddHours(endTime.Value.Hour); + endtime.AddMinutes(endTime.Value.Minute); + endtime.AddSeconds(endTime.Value.Second); - for (int i = 1; i <=8; i++) + list = FreeSqlUnit.Instance.Select().Where(x => (x.CreateTime >= starttime && x.CreateTime <= endtime)).ToList(); + + for(int i = 1; i <= 8; i++) { - var dr=dt.NewRow(); + var dr = dt.NewRow(); dr[0] = "糊化机" + i; var totalWeight = list.Where(x => x.DeviceId == i).Sum(x => x.Weight); dr[1] = totalWeight.ToString(); @@ -78,5 +115,29 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo dataGridView.DataSource = null; dataGridView.DataSource = dt; } + + private void MoreData_Click(object sender, EventArgs e) + { + MoreDataTable.Rows.Clear(); + + string dID = dataGridView.SelectedRows[0].Cells["机台"].Value as string; + + char[] a = dID.ToCharArray(); + char chr = a[3]; + int num = int.Parse(chr.ToString()); + listMore = list.Where(x => x.DeviceId == num).ToList(); + + for (int i = 0; i < listMore.Count; i++) + { + var dr = MoreDataTable.NewRow(); + dr[0] = listMore[i].Weight; + dr[1] = listMore[i].CreateTime; + MoreDataTable.Rows.Add(dr); + } + + moreData.DataSource = null; + moreData.DataSource = MoreDataTable; + + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 99e7578..8904f41 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -14,6 +14,7 @@ using Microsoft.Office.Interop.Excel; using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Data.SqlTypes; using System.Diagnostics; using System.Linq; using System.Text; @@ -844,6 +845,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl public void Run(RuntimeParameter runtime) { + DB2102 = new DB2102Helper(); DB2103 = new DB2103Helper(); DB2107 = new DB2107Helper(); @@ -852,9 +854,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl Controls = GetAllControls(); - SetControl(); + SetControl(); - timer = new Timer(); timer.Interval = 1000; timer.Enabled = true; @@ -862,7 +863,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } - + /// + /// DB2102数据读取、控件赋值 + /// private void NewThreadDb2102() { BU1ASF01_Set = DB2102.BU1ASF01.Set; @@ -961,6 +964,64 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl BUWeter7_Set = DB2102.BUWeter7.Set; BUWeter8_Set = DB2102.BUWeter8.Set; + BU1ASF01_Alarm = DB2102.BU1ASF01.Alarm; + BU1BSF01_Alarm = DB2102.BU1BSF01.Alarm; + BU1CSF01_Alarm = DB2102.BU1CSF01.Alarm; + BU1DSF01_Alarm = DB2102.BU1DSF01.Alarm; + BU1ESF01_Alarm = DB2102.BU1ESF01.Alarm; + BU1FSF01_Alarm = DB2102.BU1FSF01.Alarm; + BU1GSF01_Alarm = DB2102.BU1GSF01.Alarm; + BU1HSF01_Alarm = DB2102.BU1HSF01.Alarm; + BU1ISF01_Alarm = DB2102.BU1ISF01.Alarm; + BU1JSF01_Alarm = DB2102.BU1JSF01.Alarm; + BU1KSF01_Alarm = DB2102.BU1KSF01.Alarm; + BU1LSF01_Alarm = DB2102.BU1LSF01.Alarm; + BU1MSF01_Alarm = DB2102.BU1MSF01.Alarm; + BU1NSF01_Alarm = DB2102.BU1NSF01.Alarm; + BU1OSF01_Alarm = DB2102.BU1OSF01.Alarm; + BU1BLT01_Alarm = DB2102.BU1BLT01.Alarm; + BU1BLT02_Alarm = DB2102.BU1BLT02.Alarm; + BU1BLT03_Alarm = DB2102.BU1BLT03.Alarm; + BU1BLT04_Alarm = DB2102.BU1BLT04.Alarm; + BU1BLT05_Alarm = DB2102.BU1BLT05.Alarm; + BU1BLT06_Alarm = DB2102.BU1BLT06.Alarm; + BU1BLT07_Alarm = DB2102.BU1BLT07.Alarm; + BU2BLT01_Alarm = DB2102.BU2BLT01.Alarm; + BU2BLT02_Alarm = DB2102.BU2BLT02.Alarm; + BU2BLT03_Alarm = DB2102.BU2BLT03.Alarm; + BU2BLT04_Alarm = DB2102.BU2BLT04.Alarm; + BU2BLT05_Alarm = DB2102.BU2BLT05.Alarm; + BU3BLT01_Alarm = DB2102.BU3BLT01.Alarm; + BU3BLT02_Alarm = DB2102.BU3BLT02.Alarm; + BU3BLT03_Alarm = DB2102.BU3BLT03.Alarm; + BU3BLT04_Alarm = DB2102.BU3BLT04.Alarm; + BU3BLT05_Alarm = DB2102.BU3BLT05.Alarm; + BU3BLT06_Alarm = DB2102.BU3BLT06.Alarm; + BU3BLT07_Alarm = DB2102.BU3BLT07.Alarm; + BU4BLT01_Alarm = DB2102.BU4BLT01.Alarm; + BU4BLT02_Alarm = DB2102.BU4BLT02.Alarm; + BU4BLT03_Alarm = DB2102.BU4BLT03.Alarm; + BU4BLT04_Alarm = DB2102.BU4BLT04.Alarm; + BU4BLT05_Alarm = DB2102.BU4BLT05.Alarm; + BU4BLT06_Alarm = DB2102.BU4BLT06.Alarm; + BU4BLT07_Alarm = DB2102.BU4BLT07.Alarm; + BU5BLT01_Alarm = DB2102.BU5BLT01.Alarm; + BU5BLT02_Alarm = DB2102.BU5BLT02.Alarm; + BU5BLT03_Alarm = DB2102.BU5BLT03.Alarm; + BU5BLT04_Alarm = DB2102.BU5BLT04.Alarm; + BU1ADB01_Alarm = DB2102.BU1ADB01.Alarm; + BU1BDB01_Alarm = DB2102.BU1BDB01.Alarm; + BU1CDB01_Alarm = DB2102.BU1CDB01.Alarm; + BU1DDB01_Alarm = DB2102.BU1DDB01.Alarm; + BU1EDB01_Alarm = DB2102.BU1EDB01.Alarm; + BU1FDB01_Alarm = DB2102.BU1FDB01.Alarm; + BU1GDB01_Alarm = DB2102.BU1GDB01.Alarm; + BU1HDB01_Alarm = DB2102.BU1HDB01.Alarm; + BU1IDB01_Alarm = DB2102.BU1IDB01.Alarm; + BU1JDB01_Alarm = DB2102.BU1JDB01.Alarm; + BU1KDB01_Alarm = DB2102.BU1KDB01.Alarm; + BU1LDB01_Alarm = DB2102.BU1LDB01.Alarm; + BU1GEB02_Alarm = DB2102.BU1GEB02.Alarm; BU2GEB02_Alarm = DB2102.BU2GEB02.Alarm; BU3GEB02_Alarm = DB2102.BU3GEB02.Alarm; @@ -1055,8 +1116,120 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DV2PCP11_AlarmR = DB2102.DV2PCP11.AlarmRightPosition; DV2PCP12_AlarmR = DB2102.DV2PCP12.AlarmRightPosition; DV2PCP13_AlarmR = DB2102.DV2PCP13.AlarmRightPosition; + + + SetThreeWayValve(DV2PCP01, DV2PCP01_AlarmR, DV2PCP01_SetR, DV2PCP01_AlarmL, DV2PCP01_SetL); + SetThreeWayValve(DV2PCP02, DV2PCP02_AlarmR, DV2PCP02_SetR, DV2PCP02_AlarmL, DV2PCP02_SetL); + SetThreeWayValve(DV2PCP03, DV2PCP03_AlarmR, DV2PCP03_SetR, DV2PCP03_AlarmL, DV2PCP03_SetL); + SetThreeWayValve(DV2PCP04, DV2PCP04_AlarmR, DV2PCP04_SetR, DV2PCP04_AlarmL, DV2PCP04_SetL); + SetThreeWayValve(DV2PCP05, DV2PCP05_AlarmR, DV2PCP05_SetR, DV2PCP05_AlarmL, DV2PCP05_SetL); + SetThreeWayValve(DV2PCP06, DV2PCP06_AlarmR, DV2PCP06_SetR, DV2PCP06_AlarmL, DV2PCP06_SetL); + SetThreeWayValve(DV2PCP07, DV2PCP07_AlarmR, DV2PCP07_SetR, DV2PCP07_AlarmL, DV2PCP07_SetL); + SetThreeWayValve(DV2PCP08, DV2PCP08_AlarmR, DV2PCP08_SetR, DV2PCP08_AlarmL, DV2PCP08_SetL); + SetThreeWayValve(DV2PCP09, DV2PCP09_AlarmR, DV2PCP09_SetR, DV2PCP09_AlarmL, DV2PCP09_SetL); + SetThreeWayValve(DV2PCP10, DV2PCP10_AlarmR, DV2PCP10_SetR, DV2PCP10_AlarmL, DV2PCP10_SetL); + SetThreeWayValve(DV2PCP11, DV2PCP11_AlarmR, DV2PCP11_SetR, DV2PCP11_AlarmL, DV2PCP11_SetL); + SetThreeWayValve(DV2PCP12, DV2PCP12_AlarmR, DV2PCP12_SetR, DV2PCP12_AlarmL, DV2PCP12_SetL); + SetThreeWayValve(DV2PCP13, DV2PCP13_AlarmR, DV2PCP13_SetR, DV2PCP13_AlarmL, DV2PCP13_SetL); + + SetLjSwith(BU1ASF01, BU1ASF01_Set, BU1ASF01_Alarm); + SetLjSwith(BU1BSF01, BU1BSF01_Set, BU1BSF01_Alarm); + SetLjSwith(BU1CSF01, BU1CSF01_Set, BU1CSF01_Alarm); + SetLjSwith(BU1DSF01, BU1DSF01_Set, BU1DSF01_Alarm); + SetLjSwith(BU1ESF01, BU1ESF01_Set, BU1ESF01_Alarm); + SetLjSwith(BU1FSF01, BU1FSF01_Set, BU1FSF01_Alarm); + SetLjSwith(BU1GSF01, BU1GSF01_Set, BU1GSF01_Alarm); + SetLjSwith(BU1HSF01, BU1HSF01_Set, BU1HSF01_Alarm); + SetLjSwith(BU1ISF01, BU1ISF01_Set, BU1ISF01_Alarm); + SetLjSwith(BU1JSF01, BU1JSF01_Set, BU1JSF01_Alarm); + SetLjSwith(BU1KSF01, BU1KSF01_Set, BU1KSF01_Alarm); + SetLjSwith(BU1LSF01, BU1LSF01_Set, BU1LSF01_Alarm); + SetLjSwith(BU1MSF01, BU1MSF01_Set, BU1MSF01_Alarm); + SetLjSwith(BU1NSF01, BU1NSF01_Set, BU1NSF01_Alarm); + SetLjSwith(BU1OSF01, BU1OSF01_Set, BU1OSF01_Alarm); + SetLjSwith(BU1BLT01, BU1BLT01_Set, BU1BLT01_Alarm); + SetLjSwith(BU1BLT02, BU1BLT02_Set, BU1BLT02_Alarm); + SetLjSwith(BU1BLT03, BU1BLT03_Set, BU1BLT03_Alarm); + SetLjSwith(BU1BLT04, BU1BLT04_Set, BU1BLT04_Alarm); + SetLjSwith(BU1BLT05, BU1BLT05_Set, BU1BLT05_Alarm); + SetLjSwith(BU1BLT06, BU1BLT06_Set, BU1BLT06_Alarm); + SetLjSwith(BU1BLT07, BU1BLT07_Set, BU1BLT07_Alarm); + SetLjSwith(BU2BLT01, BU2BLT01_Set, BU2BLT01_Alarm); + SetLjSwith(BU2BLT02, BU2BLT02_Set, BU2BLT02_Alarm); + SetLjSwith(BU2BLT03, BU2BLT03_Set, BU2BLT03_Alarm); + SetLjSwith(BU2BLT04, BU2BLT04_Set, BU2BLT04_Alarm); + SetLjSwith(BU2BLT05, BU2BLT05_Set, BU2BLT05_Alarm); + SetLjSwith(BU3BLT01, BU3BLT01_Set, BU3BLT01_Alarm); + SetLjSwith(BU3BLT02, BU3BLT02_Set, BU3BLT02_Alarm); + SetLjSwith(BU3BLT03, BU3BLT03_Set, BU3BLT03_Alarm); + SetLjSwith(BU3BLT04, BU3BLT04_Set, BU3BLT04_Alarm); + SetLjSwith(BU3BLT05, BU3BLT05_Set, BU3BLT05_Alarm); + SetLjSwith(BU3BLT06, BU3BLT06_Set, BU3BLT06_Alarm); + SetLjSwith(BU3BLT07, BU3BLT07_Set, BU3BLT07_Alarm); + SetLjSwith(BU4BLT01, BU4BLT01_Set, BU4BLT01_Alarm); + SetLjSwith(BU4BLT02, BU4BLT02_Set, BU4BLT02_Alarm); + SetLjSwith(BU4BLT03, BU4BLT03_Set, BU4BLT03_Alarm); + SetLjSwith(BU4BLT04, BU4BLT04_Set, BU4BLT04_Alarm); + SetLjSwith(BU4BLT05, BU4BLT05_Set, BU4BLT05_Alarm); + SetLjSwith(BU4BLT06, BU4BLT06_Set, BU4BLT06_Alarm); + SetLjSwith(BU4BLT07, BU4BLT07_Set, BU4BLT07_Alarm); + SetLjSwith(BU5BLT01, BU5BLT01_Set, BU5BLT01_Alarm); + SetLjSwith(BU5BLT02, BU5BLT02_Set, BU5BLT02_Alarm); + SetLjSwith(BU5BLT03, BU5BLT03_Set, BU5BLT03_Alarm); + SetLjSwith(BU5BLT04, BU5BLT04_Set, BU5BLT04_Alarm); + SetLjSwith(BU1ADB01, BU1ADB01_Set, BU1ADB01_Alarm); + SetLjSwith(BU1BDB01, BU1BDB01_Set, BU1BDB01_Alarm); + SetLjSwith(BU1CDB01, BU1CDB01_Set, BU1CDB01_Alarm); + SetLjSwith(BU1DDB01, BU1DDB01_Set, BU1DDB01_Alarm); + SetLjSwith(BU1EDB01, BU1EDB01_Set, BU1EDB01_Alarm); + SetLjSwith(BU1FDB01, BU1FDB01_Set, BU1FDB01_Alarm); + SetLjSwith(BU1GDB01, BU1GDB01_Set, BU1GDB01_Alarm); + SetLjSwith(BU1HDB01, BU1HDB01_Set, BU1HDB01_Alarm); + SetLjSwith(BU1IDB01, BU1IDB01_Set, BU1IDB01_Alarm); + SetLjSwith(BU1JDB01, BU1JDB01_Set, BU1JDB01_Alarm); + SetLjSwith(BU1KDB01, BU1KDB01_Set, BU1KDB01_Alarm); + SetLjSwith(BU1LDB01, BU1LDB01_Set, BU1LDB01_Alarm); + SetLjSwith(BU1GEB02, BU1GEB02_Set, BU1GEB02_Alarm); + SetLjSwith(BU2GEB02, BU2GEB02_Set, BU2GEB02_Alarm); + SetLjSwith(BU3GEB02, BU3GEB02_Set, BU3GEB02_Alarm); + SetLjSwith(BU4GEB02, BU4GEB02_Set, BU4GEB02_Alarm); + SetLjSwith(BU5GEB02, BU5GEB02_Set, BU5GEB02_Alarm); + SetLjSwith(BU6GEB02, BU6GEB02_Set, BU6GEB02_Alarm); + SetLjSwith(BU7GEB02, BU7GEB02_Set, BU7GEB02_Alarm); + SetLjSwith(BU8GEB02, BU8GEB02_Set, BU8GEB02_Alarm); + SetLjSwith(BU1DRB01, BU1DRB01_Set, BU1DRB01_Alarm); + SetLjSwith(BU2DRB01, BU2DRB01_Set, BU2DRB01_Alarm); + SetLjSwith(BU3DRB01, BU3DRB01_Set, BU3DRB01_Alarm); + SetLjSwith(BU4DRB01, BU4DRB01_Set, BU4DRB01_Alarm); + SetLjSwith(BU1GEB01, BU1GEB01_Set, BU1GEB01_Alarm); + SetLjSwith(BU2GEB01, BU2GEB01_Set, BU2GEB01_Alarm); + SetLjSwith(BU3GEB01, BU3GEB01_Set, BU3GEB01_Alarm); + SetLjSwith(BU4GEB01, BU4GEB01_Set, BU4GEB01_Alarm); + SetLjSwith(BU5GEB01, BU5GEB01_Set, BU5GEB01_Alarm); + SetLjSwith(BU6GEB01, BU6GEB01_Set, BU6GEB01_Alarm); + SetLjSwith(BU7GEB01, BU7GEB01_Set, BU7GEB01_Alarm); + SetLjSwith(BU8GEB01, BU8GEB01_Set, BU8GEB01_Alarm); + SetLjSwith(BU2ASF01, BU2ASF01_Set, BU2ASF01_Alarm); + SetLjSwith(BU2ASF02, BU2ASF02_Set, BU2ASF02_Alarm); + SetLjSwith(BU2BSF01, BU2BSF01_Set, BU2BSF01_Alarm); + SetLjSwith(BU2BSF02, BU2BSF02_Set, BU2BSF02_Alarm); + SetLjSwith(BU2CSF01, BU2CSF01_Set, BU2CSF01_Alarm); + SetLjSwith(BU2CSF02, BU2CSF02_Set, BU2CSF02_Alarm); + SetLjSwith(BU2DSF01, BU2DSF01_Set, BU2DSF01_Alarm); + SetLjSwith(BU2DSF02, BU2DSF02_Set, BU2DSF02_Alarm); + SetLjSwith(BUWeter1, BUWeter1_Set, BUWeter1_Alarm); + SetLjSwith(BUWeter2, BUWeter2_Set, BUWeter2_Alarm); + SetLjSwith(BUWeter3, BUWeter3_Set, BUWeter3_Alarm); + SetLjSwith(BUWeter4, BUWeter4_Set, BUWeter4_Alarm); + SetLjSwith(BUWeter5, BUWeter5_Set, BUWeter5_Alarm); + SetLjSwith(BUWeter6, BUWeter6_Set, BUWeter6_Alarm); + SetLjSwith(BUWeter7, BUWeter7_Set, BUWeter7_Alarm); + SetLjSwith(BUWeter8, BUWeter8_Set, BUWeter8_Alarm); } + /// + /// DB2103数据读取、控件赋值 + /// private void NewThreadDb2103() { DM1DRY1_ACT_Speed_Set = DB2103.DM1DRY1.ACT_Speed; @@ -1198,9 +1371,86 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl DM1DRY3_Running_Set = DB2103.DM1DRY3.Running; DM1DRY4_Running_Set = DB2103.DM1DRY4.Running; - } + SetMCLabel(DM1DRY1_ACT_Speed, (float)Math.Round(DM1DRY1_ACT_Speed_Set, 2)); + SetMCLabel(DM1DRY2_ACT_Speed, (float)Math.Round(DM1DRY2_ACT_Speed_Set, 2)); + SetMCLabel(DM1DRY3_ACT_Speed, (float)Math.Round(DM1DRY3_ACT_Speed_Set, 2)); + SetMCLabel(DM1DRY4_ACT_Speed, (float)Math.Round(DM1DRY4_ACT_Speed_Set, 2)); + + + SetMCLabel(DM1GEM, (float)Math.Round(DM1GEM_Set, 2)); + SetMCLabel(DM2GEM, (float)Math.Round(DM2GEM_Set, 2)); + SetMCLabel(DM3GEM, (float)Math.Round(DM3GEM_Set, 2)); + SetMCLabel(DM4GEM, (float)Math.Round(DM4GEM_Set, 2)); + SetMCLabel(DM5GEM, (float)Math.Round(DM5GEM_Set, 2)); + SetMCLabel(DM6GEM, (float)Math.Round(DM6GEM_Set, 2)); + SetMCLabel(DM7GEM, (float)Math.Round(DM7GEM_Set, 2)); + SetMCLabel(DM8GEM, (float)Math.Round(DM8GEM_Set, 2)); + SetMCLabel(DM2ASF01, (float)Math.Round(DM2ASF01_Set, 2)); + SetMCLabel(DM2BSF01, (float)Math.Round(DM2BSF01_Set, 2)); + SetMCLabel(DM2CSF01, (float)Math.Round(DM2CSF01_Set, 2)); + SetMCLabel(DM2DSF01, (float)Math.Round(DM2DSF01_Set, 2)); + + + SetRSCREWBIG(DM1ASF01, DM1ASF01_Set); + SetRSCREWBIG(DM1BSF01, DM1BSF01_Set); + SetLSCREWBIG(DM1CSF01, DM1CSF01_Set); + SetLSCREWBIG(DM1DSF01, DM1DSF01_Set); + SetRSCREWBIG(DM1ESF01, DM1ESF01_Set); + SetLSCREWBIG(DM1FSF01, DM1FSF01_Set); + SetRSCREWBIG(DM1GSF01, DM1GSF01_Set); + SetRSCREWBIG(DM1HSF01, DM1HSF01_Set); + SetLSCREWBIG(DM1ISF01, DM1ISF01_Set); + SetLSCREWBIG(DM1JSF01, DM1JSF01_Set); + SetRSCREWBIG(DM1KSF01, DM1KSF01_Set); + SetRSCREWBIG(DM1LSF01, DM1LSF01_Set); + SetLSCREWBIG(DM1MSF01, DM1MSF01_Set); + SetLSCREWBIG(DM1NSF01, DM1NSF01_Set); + SetRSCREWBIG(DM1OSF01, DM1OSF01_Set); + SetLSCREWBIG(DM2ASF01L, DM2ASF01L_Set); + SetLSCREWBIG(DM2BSF01L, DM2BSF01L_Set); + SetLSCREWBIG(DM2CSF01L, DM2CSF01L_Set); + SetLSCREWBIG(DM2DSF01L, DM2DSF01L_Set); + SetRSCREWBIG(DM2ASF01R, DM2ASF01R_Set); + SetRSCREWBIG(DM2BSF01R, DM2BSF01R_Set); + SetRSCREWBIG(DM2CSF01R, DM2CSF01R_Set); + SetRSCREWBIG(DM2DSF01R, DM2DSF01R_Set); + + + SetFan(DM1ADF01, DM1ADF01_Set); + SetFan(DM1BDF01, DM1BDF01_Set); + SetFan(DM1CDF01, DM1CDF01_Set); + SetFan(DM1DDF01, DM1DDF01_Set); + SetFan(DM1EDF01, DM1EDF01_Set); + SetFan(DM1FDF01, DM1FDF01_Set); + SetFan(DM1GDF01, DM1GDF01_Set); + SetFan(DM1HDF01, DM1HDF01_Set); + SetFan(DM1IDF01, DM1IDF01_Set); + SetFan(DM1JDF01, DM1JDF01_Set); + SetFan(DM1KDF01, DM1KDF01_Set); + SetFan(DM1LDF01, DM1LDF01_Set); + SetFan(DM1ADB01, DM1ADB01_Set); + SetFan(DM1BDB01, DM1BDB01_Set); + SetFan(DM1CDB01, DM1CDB01_Set); + SetFan(DM1DDB01, DM1DDB01_Set); + SetFan(DM1EDB01, DM1EDB01_Set); + SetFan(DM1FDB01, DM1FDB01_Set); + SetFan(DM1GDB01, DM1GDB01_Set); + SetFan(DM1HDB01, DM1HDB01_Set); + SetFan(DM1IDB01, DM1IDB01_Set); + SetFan(DM1JDB01, DM1JDB01_Set); + SetFan(DM1KDB01, DM1KDB01_Set); + SetFan(DM1LDB01, DM1LDB01_Set); + SetFan(DM1DRY1_Running, DM1DRY1_Running_Set); + SetFan(DM1DRY2_Running, DM1DRY2_Running_Set); + SetFan(DM1DRY3_Running, DM1DRY3_Running_Set); + SetFan(DM1DRY4_Running, DM1DRY4_Running_Set); + SetFan(PM3ADF01, PM3ADF01_Set); + } + /// + /// DB2107数据读取、控件赋值 + /// private void NewThreadDb2107() { WatchDog_Set = DB2107.NormalStatus.WatchDog >= 1 ? true : false; @@ -1283,7 +1533,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl WScale_2_ActWeight_Set = DB2107.Weight.WScale_2.ActWeight; WScale_3_ActWeight_Set = DB2107.Weight.WScale_3.ActWeight; WScale_4_ActWeight_Set = DB2107.Weight.WScale_4.ActWeight; - + Hopper_1_ActWeight_Set = DB2107.Weight.Hopper_1.ActWeight; + Hopper_2_ActWeight_Set = DB2107.Weight.Hopper_2.ActWeight; + Hopper_3_ActWeight_Set = DB2107.Weight.Hopper_3.ActWeight; + Hopper_4_ActWeight_Set = DB2107.Weight.Hopper_4.ActWeight; AS1BLT01_Set = DB2107.Valve.AS1BLT01; @@ -1353,86 +1606,246 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PM1JDF01_Set = DB2107.Valve.PM1JDF01; PM1KDF01_Set = DB2107.Valve.PM1KDF01; PM1LDF01_Set = DB2107.Valve.PM1LDF01; - } - - private void NewThread(object obj) - { - try - { - - if (conCurrentCache.Count == 0) - { - MesnacServiceManager.Instance.LoggingService.Info("开始"); - Stopwatch stopwatch = new Stopwatch(); - stopwatch.Start(); - - - conCurrentCache.TryAdd("plc", DateTime.Now); - NewThreadDb2102(); - NewThreadDb2107(); - NewThreadDb2103(); - SetControlValue(); - conCurrentCache.Clear(); - stopwatch.Stop(); - var send = stopwatch.ElapsedMilliseconds; - MesnacServiceManager.Instance.LoggingService.Info("线束"+ send); - - - conCurrentCache.Clear(); - } - else - { - MesnacServiceManager.Instance.LoggingService.Info("被过滤"); - } - } - catch(Exception) - { - conCurrentCache.Clear(); - } + SetStateButton(WatchDog, WatchDog_Set); + SetSystemStateShow(EMStop, EMStop_Set); - } - - /// - /// 控件获取 - /// - private void SetControl() - { - WatchDog = GetStateButton("WatchDog"); - EMStop = GetSystemStateShow("EMStop"); - Vessel_1_HighLevel = GetSwitchLight("Vessel_1_HighLevel"); - Vessel_2_HighLevel = GetSwitchLight("Vessel_2_HighLevel"); - Vessel_3_HighLevel = GetSwitchLight("Vessel_3_HighLevel"); - Vessel_4_HighLevel = GetSwitchLight("Vessel_4_HighLevel"); - Vessel_5_HighLevel = GetSwitchLight("Vessel_5_HighLevel"); - Vessel_1_LowLevel = GetSwitchLight("Vessel_1_LowLevel"); - Vessel_2_LowLevel = GetSwitchLight("Vessel_2_LowLevel"); - Vessel_3_LowLevel = GetSwitchLight("Vessel_3_LowLevel"); - Vessel_4_LowLevel = GetSwitchLight("Vessel_4_LowLevel"); - Vessel_5_LowLevel = GetSwitchLight("Vessel_5_LowLevel"); - highLevel_D1 = GetSwitchLight("highLevel_D1"); - highLevel_D2 = GetSwitchLight("highLevel_D2"); - highLevel_D3 = GetSwitchLight("highLevel_D3"); - highLevel_D4 = GetSwitchLight("highLevel_D4"); - highLevel_D5 = GetSwitchLight("highLevel_D5"); - highLevel_D6 = GetSwitchLight("highLevel_D6"); - highLevel_D7 = GetSwitchLight("highLevel_D7"); - highLevel_D8 = GetSwitchLight("highLevel_D8"); - highLevel_D9 = GetSwitchLight("highLevel_D9"); - highLevel_D10 = GetSwitchLight("highLevel_D10"); - highLevel_D11 = GetSwitchLight("highLevel_D11"); - highLevel_D12 = GetSwitchLight("highLevel_D12"); - lowLevel_D1 = GetSwitchLight("lowLevel_D1"); - lowLevel_D2 = GetSwitchLight("lowLevel_D2"); - lowLevel_D3 = GetSwitchLight("lowLevel_D3"); - lowLevel_D4 = GetSwitchLight("lowLevel_D4"); - lowLevel_D5 = GetSwitchLight("lowLevel_D5"); - lowLevel_D6 = GetSwitchLight("lowLevel_D6"); - lowLevel_D7 = GetSwitchLight("lowLevel_D7"); - lowLevel_D8 = GetSwitchLight("lowLevel_D8"); - lowLevel_D9 = GetSwitchLight("lowLevel_D9"); + SetSwitchLight(Vessel_1_HighLevel, Vessel_1_HighLevel_Set, false); + SetSwitchLight(Vessel_2_HighLevel, Vessel_2_HighLevel_Set, false); + SetSwitchLight(Vessel_3_HighLevel, Vessel_3_HighLevel_Set, false); + SetSwitchLight(Vessel_4_HighLevel, Vessel_4_HighLevel_Set, false); + SetSwitchLight(Vessel_5_HighLevel, Vessel_5_HighLevel_Set, false); + SetSwitchLight(Vessel_1_LowLevel, Vessel_1_LowLevel_Set, false); + SetSwitchLight(Vessel_2_LowLevel, Vessel_2_LowLevel_Set, false); + SetSwitchLight(Vessel_3_LowLevel, Vessel_3_LowLevel_Set, false); + SetSwitchLight(Vessel_4_LowLevel, Vessel_4_LowLevel_Set, false); + SetSwitchLight(Vessel_5_LowLevel, Vessel_5_LowLevel_Set, false); + SetSwitchLight(highLevel_D1, highLevel_D1_Set, false); + SetSwitchLight(highLevel_D2, highLevel_D2_Set, false); + SetSwitchLight(highLevel_D3, highLevel_D3_Set, false); + SetSwitchLight(highLevel_D4, highLevel_D4_Set, false); + SetSwitchLight(highLevel_D5, highLevel_D5_Set, false); + SetSwitchLight(highLevel_D6, highLevel_D6_Set, false); + SetSwitchLight(highLevel_D7, highLevel_D7_Set, false); + SetSwitchLight(highLevel_D8, highLevel_D8_Set, false); + SetSwitchLight(highLevel_D9, highLevel_D9_Set, false); + SetSwitchLight(highLevel_D10, highLevel_D10_Set, false); + SetSwitchLight(highLevel_D11, highLevel_D11_Set, false); + SetSwitchLight(highLevel_D12, highLevel_D12_Set, false); + SetSwitchLight(lowLevel_D1, lowLevel_D1_Set, false); + SetSwitchLight(lowLevel_D2, lowLevel_D2_Set, false); + SetSwitchLight(lowLevel_D3, lowLevel_D3_Set, false); + SetSwitchLight(lowLevel_D4, lowLevel_D4_Set, false); + SetSwitchLight(lowLevel_D5, lowLevel_D5_Set, false); + SetSwitchLight(lowLevel_D6, lowLevel_D6_Set, false); + SetSwitchLight(lowLevel_D7, lowLevel_D7_Set, false); + SetSwitchLight(lowLevel_D8, lowLevel_D8_Set, false); + SetSwitchLight(lowLevel_D9, lowLevel_D9_Set, false); + SetSwitchLight(lowLevel_D10, lowLevel_D10_Set, false); + SetSwitchLight(lowLevel_D11, lowLevel_D11_Set, false); + SetSwitchLight(lowLevel_D12, lowLevel_D12_Set, false); + SetSwitchLight(Hopper_1_HighLevel, Hopper_1_HighLevel_Set, false); + SetSwitchLight(Hopper_2_HighLevel, Hopper_2_HighLevel_Set, false); + SetSwitchLight(Hopper_3_HighLevel, Hopper_3_HighLevel_Set, false); + SetSwitchLight(Hopper_4_HighLevel, Hopper_4_HighLevel_Set, false); + SetSwitchLight(Hopper_1_LowLevel, Hopper_1_LowLevel_Set, false); + SetSwitchLight(Hopper_2_LowLevel, Hopper_2_LowLevel_Set, false); + SetSwitchLight(Hopper_3_LowLevel, Hopper_3_LowLevel_Set, false); + SetSwitchLight(Hopper_4_LowLevel, Hopper_4_LowLevel_Set, false); + SetSwitchLight(WScale_1_HighLevel, WScale_1_HighLevel_Set, false); + SetSwitchLight(WScale_2_HighLevel, WScale_2_HighLevel_Set, false); + SetSwitchLight(WScale_3_HighLevel, WScale_3_HighLevel_Set, false); + SetSwitchLight(WScale_4_HighLevel, WScale_4_HighLevel_Set, false); + SetSwitchLight(WScale_1_LowLevel, WScale_1_LowLevel_Set, false); + SetSwitchLight(WScale_2_LowLevel, WScale_2_LowLevel_Set, false); + SetSwitchLight(WScale_3_LowLevel, WScale_3_LowLevel_Set, false); + SetSwitchLight(WScale_4_LowLevel, WScale_4_LowLevel_Set, false); + + + SetMCLabel(topPressure_V1, (float)Math.Round(topPressure_V2_Set, 2)); + SetMCLabel(topPressure_V2, (float)Math.Round(topPressure_V2_Set, 2)); + SetMCLabel(topPressure_V3, (float)Math.Round(topPressure_V3_Set, 2)); + SetMCLabel(topPressure_V4, (float)Math.Round(topPressure_V4_Set, 2)); + SetMCLabel(topPressure_V5, (float)Math.Round(topPressure_V5_Set, 2)); + SetMCLabel(Vessel_1_ActWeight, (float)Math.Round(Vessel_1_ActWeight_Set, 2)); + SetMCLabel(Vessel_2_ActWeight, (float)Math.Round(Vessel_2_ActWeight_Set, 2)); + SetMCLabel(Vessel_3_ActWeight, (float)Math.Round(Vessel_3_ActWeight_Set, 2)); + SetMCLabel(Vessel_4_ActWeight, (float)Math.Round(Vessel_4_ActWeight_Set, 2)); + SetMCLabel(Vessel_5_ActWeight, (float)Math.Round(Vessel_5_ActWeight_Set, 2)); + SetMCLabel(conveyV1_PV, (float)Math.Round(conveyV1_PV_Set, 2)); + SetMCLabel(conveyV2_PV, (float)Math.Round(conveyV2_PV_Set, 2)); + SetMCLabel(conveyV3_PV, (float)Math.Round(conveyV3_PV_Set, 2)); + SetMCLabel(conveyV5_PV, (float)Math.Round(conveyV5_PV_Set, 2)); + SetMCLabel(mainPress_V1_ActualValue, (float)Math.Round(mainPress_V1_ActualValue_Set, 2)); + SetMCLabel(mainPress_V2_ActualValue, (float)Math.Round(mainPress_V2_ActualValue_Set, 2)); + SetMCLabel(mainPress_V3_ActualValue, (float)Math.Round(mainPress_V3_ActualValue_Set, 2)); + SetMCLabel(mainPress_V5_ActualValue, (float)Math.Round(mainPress_V5_ActualValue_Set, 2)); + SetMCLabel(purgeV1_PV, (float)Math.Round(purgeV1_PV_Set, 2)); + SetMCLabel(purgeV2_PV, (float)Math.Round(purgeV2_PV_Set, 2)); + SetMCLabel(purgeV3_PV, (float)Math.Round(purgeV3_PV_Set, 2)); + SetMCLabel(purgeV5_PV, (float)Math.Round(purgeV5_PV_Set, 2)); + SetMCLabel(WScale_1_ActWeight, (float)Math.Round(WScale_1_ActWeight_Set, 2)); + SetMCLabel(WScale_2_ActWeight, (float)Math.Round(WScale_2_ActWeight_Set, 2)); + SetMCLabel(WScale_3_ActWeight, (float)Math.Round(WScale_3_ActWeight_Set, 2)); + SetMCLabel(WScale_4_ActWeight, (float)Math.Round(WScale_4_ActWeight_Set, 2)); + SetMCLabel(Hopper_1_ActWeight, (float)Math.Round(Hopper_1_ActWeight_Set, 2)); + SetMCLabel(Hopper_2_ActWeight, (float)Math.Round(Hopper_2_ActWeight_Set, 2)); + SetMCLabel(Hopper_3_ActWeight, (float)Math.Round(Hopper_3_ActWeight_Set, 2)); + SetMCLabel(Hopper_4_ActWeight, (float)Math.Round(Hopper_4_ActWeight_Set, 2)); + + + SetJzf(AS1BLT01, AS1BLT01_Set); + SetJzf(AS1BLT02, AS1BLT02_Set); + SetJzf(AS1BLT03, AS1BLT03_Set); + SetJzf(AS1BLT04, AS1BLT04_Set); + SetJzf(AS1BLT05, AS1BLT05_Set); + SetJzf(AS2BLT01, AS2BLT01_Set); + SetJzf(AS2BLT02, AS2BLT02_Set); + SetJzf(AS2BLT03, AS2BLT03_Set); + SetJzf(AS2BLT04, AS2BLT04_Set); + SetJzf(AS2BLT05, AS2BLT05_Set); + SetJzf(AS3BLT01, AS3BLT01_Set); + SetJzf(AS3BLT02, AS3BLT02_Set); + SetJzf(AS3BLT03, AS3BLT03_Set); + SetJzf(AS3BLT04, AS3BLT04_Set); + SetJzf(AS3BLT05, AS3BLT05_Set); + SetJzf(AS4BLT01, AS4BLT01_Set); + SetJzf(AS4BLT03, AS4BLT03_Set); + SetJzf(AS5BLT01, AS5BLT01_Set); + SetJzf(AS5BLT02, AS5BLT02_Set); + SetJzf(AS5BLT03, AS5BLT03_Set); + SetJzf(AS5BLT04, AS5BLT04_Set); + SetJzf(AS5BLT05, AS5BLT05_Set); + SetJzf(AS2PCP01, AS2PCP01_Set); + SetJzf(AS2PCP02, AS2PCP02_Set); + SetJzf(AS2PCP03, AS2PCP03_Set); + SetJzf(AS1OIS01, AS1OIS01_Set); + SetJzf(AS1OIS02, AS1OIS02_Set); + SetJzf(AS1OIS03, AS1OIS03_Set); + SetJzf(AS2OIS01, AS2OIS01_Set); + SetJzf(AS2OIS02, AS2OIS02_Set); + SetJzf(AS2OIS03, AS2OIS03_Set); + SetJzf(AS3OIS01, AS3OIS01_Set); + SetJzf(AS3OIS02, AS3OIS02_Set); + SetJzf(AS3OIS03, AS3OIS03_Set); + SetJzf(AS4OIS01, AS4OIS01_Set); + SetJzf(AS4OIS02, AS4OIS02_Set); + SetJzf(AS4OIS03, AS4OIS03_Set); + SetJzf(AS1GET01, AS1GET01_Set); + SetJzf(AS1GET02, AS1GET02_Set); + SetJzf(AS2GET01, AS2GET01_Set); + SetJzf(AS2GET02, AS2GET02_Set); + SetJzf(AS3GET01, AS3GET01_Set); + SetJzf(AS3GET02, AS3GET02_Set); + SetJzf(AS4GET01, AS4GET01_Set); + SetJzf(AS4GET02, AS4GET02_Set); + SetJzf(AS5GET01, AS5GET01_Set); + SetJzf(AS5GET02, AS5GET02_Set); + SetJzf(AS6GET01, AS6GET01_Set); + SetJzf(AS6GET02, AS6GET02_Set); + SetJzf(AS7GET01, AS7GET01_Set); + SetJzf(AS7GET02, AS7GET02_Set); + SetJzf(AS8GET01, AS8GET01_Set); + SetJzf(AS8GET02, AS8GET02_Set); + + + SetControlCabinet(PM1ADF01, PM1ADF01_Set); + SetControlCabinet(PM1BDF01, PM1BDF01_Set); + SetControlCabinet(PM1CDF01, PM1CDF01_Set); + SetControlCabinet(PM1DDF01, PM1DDF01_Set); + SetControlCabinet(PM1EDF01, PM1EDF01_Set); + SetControlCabinet(PM1FDF01, PM1FDF01_Set); + SetControlCabinet(PM1GDF01, PM1GDF01_Set); + SetControlCabinet(PM1HDF01, PM1HDF01_Set); + SetControlCabinet(PM1IDF01, PM1IDF01_Set); + SetControlCabinet(PM1JDF01, PM1JDF01_Set); + SetControlCabinet(PM1KDF01, PM1KDF01_Set); + SetControlCabinet(PM1LDF01, PM1LDF01_Set); + } + + /// + /// 新建PLC读取线程 + /// + /// + private void NewThread(object obj) + { + try + { + + if (conCurrentCache.Count == 0) + { + MesnacServiceManager.Instance.LoggingService.Info("开始"); + Stopwatch stopwatch = new Stopwatch(); + stopwatch.Start(); + + + conCurrentCache.TryAdd("plc", DateTime.Now); + NewThreadDb2102(); + NewThreadDb2107(); + NewThreadDb2103(); + conCurrentCache.Clear(); + stopwatch.Stop(); + var send = stopwatch.ElapsedMilliseconds; + MesnacServiceManager.Instance.LoggingService.Info("线束"+ send); + + + conCurrentCache.Clear(); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("被过滤"); + } + } + catch(Exception) + { + conCurrentCache.Clear(); + } + + + + } + + /// + /// 控件获取 + /// + private void SetControl() + { + WatchDog = GetStateButton("WatchDog"); + EMStop = GetSystemStateShow("EMStop"); + + Vessel_1_HighLevel = GetSwitchLight("Vessel_1_HighLevel"); + Vessel_2_HighLevel = GetSwitchLight("Vessel_2_HighLevel"); + Vessel_3_HighLevel = GetSwitchLight("Vessel_3_HighLevel"); + Vessel_4_HighLevel = GetSwitchLight("Vessel_4_HighLevel"); + Vessel_5_HighLevel = GetSwitchLight("Vessel_5_HighLevel"); + Vessel_1_LowLevel = GetSwitchLight("Vessel_1_LowLevel"); + Vessel_2_LowLevel = GetSwitchLight("Vessel_2_LowLevel"); + Vessel_3_LowLevel = GetSwitchLight("Vessel_3_LowLevel"); + Vessel_4_LowLevel = GetSwitchLight("Vessel_4_LowLevel"); + Vessel_5_LowLevel = GetSwitchLight("Vessel_5_LowLevel"); + highLevel_D1 = GetSwitchLight("highLevel_D1"); + highLevel_D2 = GetSwitchLight("highLevel_D2"); + highLevel_D3 = GetSwitchLight("highLevel_D3"); + highLevel_D4 = GetSwitchLight("highLevel_D4"); + highLevel_D5 = GetSwitchLight("highLevel_D5"); + highLevel_D6 = GetSwitchLight("highLevel_D6"); + highLevel_D7 = GetSwitchLight("highLevel_D7"); + highLevel_D8 = GetSwitchLight("highLevel_D8"); + highLevel_D9 = GetSwitchLight("highLevel_D9"); + highLevel_D10 = GetSwitchLight("highLevel_D10"); + highLevel_D11 = GetSwitchLight("highLevel_D11"); + highLevel_D12 = GetSwitchLight("highLevel_D12"); + lowLevel_D1 = GetSwitchLight("lowLevel_D1"); + lowLevel_D2 = GetSwitchLight("lowLevel_D2"); + lowLevel_D3 = GetSwitchLight("lowLevel_D3"); + lowLevel_D4 = GetSwitchLight("lowLevel_D4"); + lowLevel_D5 = GetSwitchLight("lowLevel_D5"); + lowLevel_D6 = GetSwitchLight("lowLevel_D6"); + lowLevel_D7 = GetSwitchLight("lowLevel_D7"); + lowLevel_D8 = GetSwitchLight("lowLevel_D8"); + lowLevel_D9 = GetSwitchLight("lowLevel_D9"); lowLevel_D10 = GetSwitchLight("lowLevel_D10"); lowLevel_D11 = GetSwitchLight("lowLevel_D11"); lowLevel_D12 = GetSwitchLight("lowLevel_D12"); @@ -1732,12 +2145,12 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } /// - /// Plc读数 + /// Plc读数线程池，定时器退出删除 /// private void GetPlcValue(object sender, EventArgs e) { - - if (GetAllDbMCControlsByOption(DbOptionTypes.None).Count == 0) + int x = GetAllDbMCControlsByOption(DbOptionTypes.QueryAndModify).Count; + if (GetAllDbMCControlsByOption(DbOptionTypes.QueryAndModify).Count == 0) { timer.Stop(); timer.Dispose(); @@ -1745,356 +2158,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ThreadPool.QueueUserWorkItem(new WaitCallback(NewThread)); - - - } - /// - /// 控件赋值 - /// - private void SetControlValue() - { - SetStateButton(WatchDog, WatchDog_Set); - SetSystemStateShow(EMStop, EMStop_Set); - - SetSwitchLight(Vessel_1_HighLevel, Vessel_1_HighLevel_Set, false); - SetSwitchLight(Vessel_2_HighLevel, Vessel_2_HighLevel_Set, false); - SetSwitchLight(Vessel_3_HighLevel, Vessel_3_HighLevel_Set, false); - SetSwitchLight(Vessel_4_HighLevel, Vessel_4_HighLevel_Set, false); - SetSwitchLight(Vessel_5_HighLevel, Vessel_5_HighLevel_Set, false); - SetSwitchLight(Vessel_1_LowLevel, Vessel_1_LowLevel_Set, false); - SetSwitchLight(Vessel_2_LowLevel, Vessel_2_LowLevel_Set, false); - SetSwitchLight(Vessel_3_LowLevel, Vessel_3_LowLevel_Set, false); - SetSwitchLight(Vessel_4_LowLevel, Vessel_4_LowLevel_Set, false); - SetSwitchLight(Vessel_5_LowLevel, Vessel_5_LowLevel_Set, false); - SetSwitchLight(highLevel_D1, highLevel_D1_Set, false); - SetSwitchLight(highLevel_D2, highLevel_D2_Set, false); - SetSwitchLight(highLevel_D3, highLevel_D3_Set, false); - SetSwitchLight(highLevel_D4, highLevel_D4_Set, false); - SetSwitchLight(highLevel_D5, highLevel_D5_Set, false); - SetSwitchLight(highLevel_D6, highLevel_D6_Set, false); - SetSwitchLight(highLevel_D7, highLevel_D7_Set, false); - SetSwitchLight(highLevel_D8, highLevel_D8_Set, false); - SetSwitchLight(highLevel_D9, highLevel_D9_Set, false); - SetSwitchLight(highLevel_D10, highLevel_D10_Set, false); - SetSwitchLight(highLevel_D11, highLevel_D11_Set, false); - SetSwitchLight(highLevel_D12, highLevel_D12_Set, false); - SetSwitchLight(lowLevel_D1, lowLevel_D1_Set, false); - SetSwitchLight(lowLevel_D2, lowLevel_D2_Set, false); - SetSwitchLight(lowLevel_D3, lowLevel_D3_Set, false); - SetSwitchLight(lowLevel_D4, lowLevel_D4_Set, false); - SetSwitchLight(lowLevel_D5, lowLevel_D5_Set, false); - SetSwitchLight(lowLevel_D6, lowLevel_D6_Set, false); - SetSwitchLight(lowLevel_D7, lowLevel_D7_Set, false); - SetSwitchLight(lowLevel_D8, lowLevel_D8_Set, false); - SetSwitchLight(lowLevel_D9, lowLevel_D9_Set, false); - SetSwitchLight(lowLevel_D10, lowLevel_D10_Set, false); - SetSwitchLight(lowLevel_D11, lowLevel_D11_Set, false); - SetSwitchLight(lowLevel_D12, lowLevel_D12_Set, false); - SetSwitchLight(Hopper_1_HighLevel, Hopper_1_HighLevel_Set, false); - SetSwitchLight(Hopper_2_HighLevel, Hopper_2_HighLevel_Set, false); - SetSwitchLight(Hopper_3_HighLevel, Hopper_3_HighLevel_Set, false); - SetSwitchLight(Hopper_4_HighLevel, Hopper_4_HighLevel_Set, false); - SetSwitchLight(Hopper_1_LowLevel, Hopper_1_LowLevel_Set, false); - SetSwitchLight(Hopper_2_LowLevel, Hopper_2_LowLevel_Set, false); - SetSwitchLight(Hopper_3_LowLevel, Hopper_3_LowLevel_Set, false); - SetSwitchLight(Hopper_4_LowLevel, Hopper_4_LowLevel_Set, false); - SetSwitchLight(WScale_1_HighLevel, WScale_1_HighLevel_Set, false); - SetSwitchLight(WScale_2_HighLevel, WScale_2_HighLevel_Set, false); - SetSwitchLight(WScale_3_HighLevel, WScale_3_HighLevel_Set, false); - SetSwitchLight(WScale_4_HighLevel, WScale_4_HighLevel_Set, false); - SetSwitchLight(WScale_1_LowLevel, WScale_1_LowLevel_Set, false); - SetSwitchLight(WScale_2_LowLevel, WScale_2_LowLevel_Set, false); - SetSwitchLight(WScale_3_LowLevel, WScale_3_LowLevel_Set, false); - SetSwitchLight(WScale_4_LowLevel, WScale_4_LowLevel_Set, false); - - - SetMCLabel(topPressure_V1, topPressure_V1_Set); - SetMCLabel(topPressure_V2, topPressure_V2_Set); - SetMCLabel(topPressure_V3, topPressure_V3_Set); - SetMCLabel(topPressure_V4, topPressure_V4_Set); - SetMCLabel(topPressure_V5, topPressure_V5_Set); - SetMCLabel(Vessel_1_ActWeight, Vessel_1_ActWeight_Set); - SetMCLabel(Vessel_2_ActWeight, Vessel_2_ActWeight_Set); - SetMCLabel(Vessel_3_ActWeight, Vessel_3_ActWeight_Set); - SetMCLabel(Vessel_4_ActWeight, Vessel_4_ActWeight_Set); - SetMCLabel(Vessel_5_ActWeight, Vessel_5_ActWeight_Set); - SetMCLabel(conveyV1_PV, conveyV1_PV_Set); - SetMCLabel(conveyV2_PV, conveyV2_PV_Set); - SetMCLabel(conveyV3_PV, conveyV3_PV_Set); - SetMCLabel(conveyV5_PV, conveyV5_PV_Set); - SetMCLabel(mainPress_V1_ActualValue, mainPress_V1_ActualValue_Set); - SetMCLabel(mainPress_V2_ActualValue, mainPress_V2_ActualValue_Set); - SetMCLabel(mainPress_V3_ActualValue, mainPress_V3_ActualValue_Set); - SetMCLabel(mainPress_V5_ActualValue, mainPress_V5_ActualValue_Set); - SetMCLabel(purgeV1_PV, purgeV1_PV_Set); - SetMCLabel(purgeV2_PV, purgeV2_PV_Set); - SetMCLabel(purgeV3_PV, purgeV3_PV_Set); - SetMCLabel(purgeV5_PV, purgeV5_PV_Set); - SetMCLabel(WScale_1_ActWeight, WScale_1_ActWeight_Set); - SetMCLabel(WScale_2_ActWeight, WScale_2_ActWeight_Set); - SetMCLabel(WScale_3_ActWeight, WScale_3_ActWeight_Set); - SetMCLabel(WScale_4_ActWeight, WScale_4_ActWeight_Set); - SetMCLabel(DM1DRY1_ACT_Speed, DM1DRY1_ACT_Speed_Set); - SetMCLabel(DM1DRY2_ACT_Speed, DM1DRY2_ACT_Speed_Set); - SetMCLabel(DM1DRY3_ACT_Speed, DM1DRY3_ACT_Speed_Set); - SetMCLabel(DM1DRY4_ACT_Speed, DM1DRY4_ACT_Speed_Set); - SetMCLabel(Hopper_1_ActWeight, Hopper_1_ActWeight_Set); - SetMCLabel(Hopper_2_ActWeight, Hopper_2_ActWeight_Set); - SetMCLabel(Hopper_3_ActWeight, Hopper_3_ActWeight_Set); - SetMCLabel(Hopper_4_ActWeight, Hopper_4_ActWeight_Set); - SetMCLabel(DM1GEM, DM1GEM_Set); - SetMCLabel(DM2GEM, DM2GEM_Set); - SetMCLabel(DM3GEM, DM3GEM_Set); - SetMCLabel(DM4GEM, DM4GEM_Set); - SetMCLabel(DM5GEM, DM5GEM_Set); - SetMCLabel(DM6GEM, DM6GEM_Set); - SetMCLabel(DM7GEM, DM7GEM_Set); - SetMCLabel(DM8GEM, DM8GEM_Set); - SetMCLabel(DM2ASF01, DM2ASF01_Set); - SetMCLabel(DM2BSF01, DM2BSF01_Set); - SetMCLabel(DM2CSF01, DM2CSF01_Set); - SetMCLabel(DM2DSF01, DM2DSF01_Set); - - - SetRSCREWBIG(DM1ASF01, DM1ASF01_Set); - SetRSCREWBIG(DM1BSF01, DM1BSF01_Set); - SetLSCREWBIG(DM1CSF01, DM1CSF01_Set); - SetLSCREWBIG(DM1DSF01, DM1DSF01_Set); - SetRSCREWBIG(DM1ESF01, DM1ESF01_Set); - SetLSCREWBIG(DM1FSF01, DM1FSF01_Set); - SetRSCREWBIG(DM1GSF01, DM1GSF01_Set); - SetRSCREWBIG(DM1HSF01, DM1HSF01_Set); - SetLSCREWBIG(DM1ISF01, DM1ISF01_Set); - SetLSCREWBIG(DM1JSF01, DM1JSF01_Set); - SetRSCREWBIG(DM1KSF01, DM1KSF01_Set); - SetRSCREWBIG(DM1LSF01, DM1LSF01_Set); - SetLSCREWBIG(DM1MSF01, DM1MSF01_Set); - SetLSCREWBIG(DM1NSF01, DM1NSF01_Set); - SetRSCREWBIG(DM1OSF01, DM1OSF01_Set); - SetLSCREWBIG(DM2ASF01L, DM2ASF01L_Set); - SetLSCREWBIG(DM2BSF01L, DM2BSF01L_Set); - SetLSCREWBIG(DM2CSF01L, DM2CSF01L_Set); - SetLSCREWBIG(DM2DSF01L, DM2DSF01L_Set); - SetRSCREWBIG(DM2ASF01R, DM2ASF01R_Set); - SetRSCREWBIG(DM2BSF01R, DM2BSF01R_Set); - SetRSCREWBIG(DM2CSF01R, DM2CSF01R_Set); - SetRSCREWBIG(DM2DSF01R, DM2DSF01R_Set); - - - SetJzf(AS1BLT01, AS1BLT01_Set); - SetJzf(AS1BLT02, AS1BLT02_Set); - SetJzf(AS1BLT03, AS1BLT03_Set); - SetJzf(AS1BLT04, AS1BLT04_Set); - SetJzf(AS1BLT05, AS1BLT05_Set); - SetJzf(AS2BLT01, AS2BLT01_Set); - SetJzf(AS2BLT02, AS2BLT02_Set); - SetJzf(AS2BLT03, AS2BLT03_Set); - SetJzf(AS2BLT04, AS2BLT04_Set); - SetJzf(AS2BLT05, AS2BLT05_Set); - SetJzf(AS3BLT01, AS3BLT01_Set); - SetJzf(AS3BLT02, AS3BLT02_Set); - SetJzf(AS3BLT03, AS3BLT03_Set); - SetJzf(AS3BLT04, AS3BLT04_Set); - SetJzf(AS3BLT05, AS3BLT05_Set); - SetJzf(AS4BLT01, AS4BLT01_Set); - SetJzf(AS4BLT03, AS4BLT03_Set); - SetJzf(AS5BLT01, AS5BLT01_Set); - SetJzf(AS5BLT02, AS5BLT02_Set); - SetJzf(AS5BLT03, AS5BLT03_Set); - SetJzf(AS5BLT04, AS5BLT04_Set); - SetJzf(AS5BLT05, AS5BLT05_Set); - SetJzf(AS2PCP01, AS2PCP01_Set); - SetJzf(AS2PCP02, AS2PCP02_Set); - SetJzf(AS2PCP03, AS2PCP03_Set); - SetJzf(AS1OIS01, AS1OIS01_Set); - SetJzf(AS1OIS02, AS1OIS02_Set); - SetJzf(AS1OIS03, AS1OIS03_Set); - SetJzf(AS2OIS01, AS2OIS01_Set); - SetJzf(AS2OIS02, AS2OIS02_Set); - SetJzf(AS2OIS03, AS2OIS03_Set); - SetJzf(AS3OIS01, AS3OIS01_Set); - SetJzf(AS3OIS02, AS3OIS02_Set); - SetJzf(AS3OIS03, AS3OIS03_Set); - SetJzf(AS4OIS01, AS4OIS01_Set); - SetJzf(AS4OIS02, AS4OIS02_Set); - SetJzf(AS4OIS03, AS4OIS03_Set); - SetJzf(AS1GET01, AS1GET01_Set); - SetJzf(AS1GET02, AS1GET02_Set); - SetJzf(AS2GET01, AS2GET01_Set); - SetJzf(AS2GET02, AS2GET02_Set); - SetJzf(AS3GET01, AS3GET01_Set); - SetJzf(AS3GET02, AS3GET02_Set); - SetJzf(AS4GET01, AS4GET01_Set); - SetJzf(AS4GET02, AS4GET02_Set); - SetJzf(AS5GET01, AS5GET01_Set); - SetJzf(AS5GET02, AS5GET02_Set); - SetJzf(AS6GET01, AS6GET01_Set); - SetJzf(AS6GET02, AS6GET02_Set); - SetJzf(AS7GET01, AS7GET01_Set); - SetJzf(AS7GET02, AS7GET02_Set); - SetJzf(AS8GET01, AS8GET01_Set); - SetJzf(AS8GET02, AS8GET02_Set); - - - SetFan(DM1ADF01, DM1ADF01_Set); - SetFan(DM1BDF01, DM1BDF01_Set); - SetFan(DM1CDF01, DM1CDF01_Set); - SetFan(DM1DDF01, DM1DDF01_Set); - SetFan(DM1EDF01, DM1EDF01_Set); - SetFan(DM1FDF01, DM1FDF01_Set); - SetFan(DM1GDF01, DM1GDF01_Set); - SetFan(DM1HDF01, DM1HDF01_Set); - SetFan(DM1IDF01, DM1IDF01_Set); - SetFan(DM1JDF01, DM1JDF01_Set); - SetFan(DM1KDF01, DM1KDF01_Set); - SetFan(DM1LDF01, DM1LDF01_Set); - SetFan(DM1ADB01, DM1ADB01_Set); - SetFan(DM1BDB01, DM1BDB01_Set); - SetFan(DM1CDB01, DM1CDB01_Set); - SetFan(DM1DDB01, DM1DDB01_Set); - SetFan(DM1EDB01, DM1EDB01_Set); - SetFan(DM1FDB01, DM1FDB01_Set); - SetFan(DM1GDB01, DM1GDB01_Set); - SetFan(DM1HDB01, DM1HDB01_Set); - SetFan(DM1IDB01, DM1IDB01_Set); - SetFan(DM1JDB01, DM1JDB01_Set); - SetFan(DM1KDB01, DM1KDB01_Set); - SetFan(DM1LDB01, DM1LDB01_Set); - SetFan(DM1DRY1_Running, DM1DRY1_Running_Set); - SetFan(DM1DRY2_Running, DM1DRY2_Running_Set); - SetFan(DM1DRY3_Running, DM1DRY3_Running_Set); - SetFan(DM1DRY4_Running, DM1DRY4_Running_Set); - SetFan(PM3ADF01, PM3ADF01_Set); - - SetControlCabinet(PM1ADF01, PM1ADF01_Set); - SetControlCabinet(PM1BDF01, PM1BDF01_Set); - SetControlCabinet(PM1CDF01, PM1CDF01_Set); - SetControlCabinet(PM1DDF01, PM1DDF01_Set); - SetControlCabinet(PM1EDF01, PM1EDF01_Set); - SetControlCabinet(PM1FDF01, PM1FDF01_Set); - SetControlCabinet(PM1GDF01, PM1GDF01_Set); - SetControlCabinet(PM1HDF01, PM1HDF01_Set); - SetControlCabinet(PM1IDF01, PM1IDF01_Set); - SetControlCabinet(PM1JDF01, PM1JDF01_Set); - SetControlCabinet(PM1KDF01, PM1KDF01_Set); - SetControlCabinet(PM1LDF01, PM1LDF01_Set); - - - SetLjSwith(BU1ASF01, BU1ASF01_Set, BU1ASF01_Alarm); - SetLjSwith(BU1BSF01, BU1BSF01_Set, BU1BSF01_Alarm); - SetLjSwith(BU1CSF01, BU1CSF01_Set, BU1CSF01_Alarm); - SetLjSwith(BU1DSF01, BU1DSF01_Set, BU1DSF01_Alarm); - SetLjSwith(BU1ESF01, BU1ESF01_Set, BU1ESF01_Alarm); - SetLjSwith(BU1FSF01, BU1FSF01_Set, BU1FSF01_Alarm); - SetLjSwith(BU1GSF01, BU1GSF01_Set, BU1GSF01_Alarm); - SetLjSwith(BU1HSF01, BU1HSF01_Set, BU1HSF01_Alarm); - SetLjSwith(BU1ISF01, BU1ISF01_Set, BU1ISF01_Alarm); - SetLjSwith(BU1JSF01, BU1JSF01_Set, BU1JSF01_Alarm); - SetLjSwith(BU1KSF01, BU1KSF01_Set, BU1KSF01_Alarm); - SetLjSwith(BU1LSF01, BU1LSF01_Set, BU1LSF01_Alarm); - SetLjSwith(BU1MSF01, BU1MSF01_Set, BU1MSF01_Alarm); - SetLjSwith(BU1NSF01, BU1NSF01_Set, BU1NSF01_Alarm); - SetLjSwith(BU1OSF01, BU1OSF01_Set, BU1OSF01_Alarm); - SetLjSwith(BU1BLT01, BU1BLT01_Set, BU1BLT01_Alarm); - SetLjSwith(BU1BLT02, BU1BLT02_Set, BU1BLT02_Alarm); - SetLjSwith(BU1BLT03, BU1BLT03_Set, BU1BLT03_Alarm); - SetLjSwith(BU1BLT04, BU1BLT04_Set, BU1BLT04_Alarm); - SetLjSwith(BU1BLT05, BU1BLT05_Set, BU1BLT05_Alarm); - SetLjSwith(BU1BLT06, BU1BLT06_Set, BU1BLT06_Alarm); - SetLjSwith(BU1BLT07, BU1BLT07_Set, BU1BLT07_Alarm); - SetLjSwith(BU2BLT01, BU2BLT01_Set, BU2BLT01_Alarm); - SetLjSwith(BU2BLT02, BU2BLT02_Set, BU2BLT02_Alarm); - SetLjSwith(BU2BLT03, BU2BLT03_Set, BU2BLT03_Alarm); - SetLjSwith(BU2BLT04, BU2BLT04_Set, BU2BLT04_Alarm); - SetLjSwith(BU2BLT05, BU2BLT05_Set, BU2BLT05_Alarm); - SetLjSwith(BU3BLT01, BU3BLT01_Set, BU3BLT01_Alarm); - SetLjSwith(BU3BLT02, BU3BLT02_Set, BU3BLT02_Alarm); - SetLjSwith(BU3BLT03, BU3BLT03_Set, BU3BLT03_Alarm); - SetLjSwith(BU3BLT04, BU3BLT04_Set, BU3BLT04_Alarm); - SetLjSwith(BU3BLT05, BU3BLT05_Set, BU3BLT05_Alarm); - SetLjSwith(BU3BLT06, BU3BLT06_Set, BU3BLT06_Alarm); - SetLjSwith(BU3BLT07, BU3BLT07_Set, BU3BLT07_Alarm); - SetLjSwith(BU4BLT01, BU4BLT01_Set, BU4BLT01_Alarm); - SetLjSwith(BU4BLT02, BU4BLT02_Set, BU4BLT02_Alarm); - SetLjSwith(BU4BLT03, BU4BLT03_Set, BU4BLT03_Alarm); - SetLjSwith(BU4BLT04, BU4BLT04_Set, BU4BLT04_Alarm); - SetLjSwith(BU4BLT05, BU4BLT05_Set, BU4BLT05_Alarm); - SetLjSwith(BU4BLT06, BU4BLT06_Set, BU4BLT06_Alarm); - SetLjSwith(BU4BLT07, BU4BLT07_Set, BU4BLT07_Alarm); - SetLjSwith(BU5BLT01, BU5BLT01_Set, BU5BLT01_Alarm); - SetLjSwith(BU5BLT02, BU5BLT02_Set, BU5BLT02_Alarm); - SetLjSwith(BU5BLT03, BU5BLT03_Set, BU5BLT03_Alarm); - SetLjSwith(BU5BLT04, BU5BLT04_Set, BU5BLT04_Alarm); - SetLjSwith(BU1ADB01, BU1ADB01_Set, BU1ADB01_Alarm); - SetLjSwith(BU1BDB01, BU1BDB01_Set, BU1BDB01_Alarm); - SetLjSwith(BU1CDB01, BU1CDB01_Set, BU1CDB01_Alarm); - SetLjSwith(BU1DDB01, BU1DDB01_Set, BU1DDB01_Alarm); - SetLjSwith(BU1EDB01, BU1EDB01_Set, BU1EDB01_Alarm); - SetLjSwith(BU1FDB01, BU1FDB01_Set, BU1FDB01_Alarm); - SetLjSwith(BU1GDB01, BU1GDB01_Set, BU1GDB01_Alarm); - SetLjSwith(BU1HDB01, BU1HDB01_Set, BU1HDB01_Alarm); - SetLjSwith(BU1IDB01, BU1IDB01_Set, BU1IDB01_Alarm); - SetLjSwith(BU1JDB01, BU1JDB01_Set, BU1JDB01_Alarm); - SetLjSwith(BU1KDB01, BU1KDB01_Set, BU1KDB01_Alarm); - SetLjSwith(BU1LDB01, BU1LDB01_Set, BU1LDB01_Alarm); - SetLjSwith(BU1GEB02, BU1GEB02_Set, BU1GEB02_Alarm); - SetLjSwith(BU2GEB02, BU2GEB02_Set, BU2GEB02_Alarm); - SetLjSwith(BU3GEB02, BU3GEB02_Set, BU3GEB02_Alarm); - SetLjSwith(BU4GEB02, BU4GEB02_Set, BU4GEB02_Alarm); - SetLjSwith(BU5GEB02, BU5GEB02_Set, BU5GEB02_Alarm); - SetLjSwith(BU6GEB02, BU6GEB02_Set, BU6GEB02_Alarm); - SetLjSwith(BU7GEB02, BU7GEB02_Set, BU7GEB02_Alarm); - SetLjSwith(BU8GEB02, BU8GEB02_Set, BU8GEB02_Alarm); - SetLjSwith(BU1DRB01, BU1DRB01_Set, BU1DRB01_Alarm); - SetLjSwith(BU2DRB01, BU2DRB01_Set, BU2DRB01_Alarm); - SetLjSwith(BU3DRB01, BU3DRB01_Set, BU3DRB01_Alarm); - SetLjSwith(BU4DRB01, BU4DRB01_Set, BU4DRB01_Alarm); - SetLjSwith(BU1GEB01, BU1GEB01_Set, BU1GEB01_Alarm); - SetLjSwith(BU2GEB01, BU2GEB01_Set, BU2GEB01_Alarm); - SetLjSwith(BU3GEB01, BU3GEB01_Set, BU3GEB01_Alarm); - SetLjSwith(BU4GEB01, BU4GEB01_Set, BU4GEB01_Alarm); - SetLjSwith(BU5GEB01, BU5GEB01_Set, BU5GEB01_Alarm); - SetLjSwith(BU6GEB01, BU6GEB01_Set, BU6GEB01_Alarm); - SetLjSwith(BU7GEB01, BU7GEB01_Set, BU7GEB01_Alarm); - SetLjSwith(BU8GEB01, BU8GEB01_Set, BU8GEB01_Alarm); - SetLjSwith(BU2ASF01, BU2ASF01_Set, BU2ASF01_Alarm); - SetLjSwith(BU2ASF02, BU2ASF02_Set, BU2ASF02_Alarm); - SetLjSwith(BU2BSF01, BU2BSF01_Set, BU2BSF01_Alarm); - SetLjSwith(BU2BSF02, BU2BSF02_Set, BU2BSF02_Alarm); - SetLjSwith(BU2CSF01, BU2CSF01_Set, BU2CSF01_Alarm); - SetLjSwith(BU2CSF02, BU2CSF02_Set, BU2CSF02_Alarm); - SetLjSwith(BU2DSF01, BU2DSF01_Set, BU2DSF01_Alarm); - SetLjSwith(BU2DSF02, BU2DSF02_Set, BU2DSF02_Alarm); - SetLjSwith(BUWeter1, BUWeter1_Set, BUWeter1_Alarm); - SetLjSwith(BUWeter2, BUWeter2_Set, BUWeter2_Alarm); - SetLjSwith(BUWeter3, BUWeter3_Set, BUWeter3_Alarm); - SetLjSwith(BUWeter4, BUWeter4_Set, BUWeter4_Alarm); - SetLjSwith(BUWeter5, BUWeter5_Set, BUWeter5_Alarm); - SetLjSwith(BUWeter6, BUWeter6_Set, BUWeter6_Alarm); - SetLjSwith(BUWeter7, BUWeter7_Set, BUWeter7_Alarm); - SetLjSwith(BUWeter8, BUWeter8_Set, BUWeter8_Alarm); - - - SetThreeWayValve(DV2PCP01, DV2PCP01_AlarmR, DV2PCP01_SetR, DV2PCP01_AlarmL, DV2PCP01_SetL); - SetThreeWayValve(DV2PCP02, DV2PCP02_AlarmR, DV2PCP02_SetR, DV2PCP02_AlarmL, DV2PCP02_SetL); - SetThreeWayValve(DV2PCP03, DV2PCP03_AlarmR, DV2PCP03_SetR, DV2PCP03_AlarmL, DV2PCP03_SetL); - SetThreeWayValve(DV2PCP04, DV2PCP04_AlarmR, DV2PCP04_SetR, DV2PCP04_AlarmL, DV2PCP04_SetL); - SetThreeWayValve(DV2PCP05, DV2PCP05_AlarmR, DV2PCP05_SetR, DV2PCP05_AlarmL, DV2PCP05_SetL); - SetThreeWayValve(DV2PCP06, DV2PCP06_AlarmR, DV2PCP06_SetR, DV2PCP06_AlarmL, DV2PCP06_SetL); - SetThreeWayValve(DV2PCP07, DV2PCP07_AlarmR, DV2PCP07_SetR, DV2PCP07_AlarmL, DV2PCP07_SetL); - SetThreeWayValve(DV2PCP08, DV2PCP08_AlarmR, DV2PCP08_SetR, DV2PCP08_AlarmL, DV2PCP08_SetL); - SetThreeWayValve(DV2PCP09, DV2PCP09_AlarmR, DV2PCP09_SetR, DV2PCP09_AlarmL, DV2PCP09_SetL); - SetThreeWayValve(DV2PCP10, DV2PCP10_AlarmR, DV2PCP10_SetR, DV2PCP10_AlarmL, DV2PCP10_SetL); - SetThreeWayValve(DV2PCP11, DV2PCP11_AlarmR, DV2PCP11_SetR, DV2PCP11_AlarmL, DV2PCP11_SetL); - SetThreeWayValve(DV2PCP12, DV2PCP12_AlarmR, DV2PCP12_SetR, DV2PCP12_AlarmL, DV2PCP12_SetL); - SetThreeWayValve(DV2PCP13, DV2PCP13_AlarmR, DV2PCP13_SetR, DV2PCP13_AlarmL, DV2PCP13_SetL); - - - - } + #region 控件交互 /// /// 看门狗 @@ -2148,7 +2215,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl /// public void SetSwitchLight(SwitchLight obj, bool set, bool alarm) { - if (set == true || alarm == false) + if (set == true && alarm == false) { obj.Status = SwitchLight.Statuses.ylMove; } @@ -2175,8 +2242,21 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl /// public void SetLjSwith(LjSwith obj, bool set, bool alarm) { - obj.Alarm = alarm; - obj.Set = set; + if (set == true && alarm == false) + { + obj.Set = true; + obj.Alarm = false; + } + else if(alarm == true) + { + obj.Set = false; + obj.Alarm = true; + } + else + { + obj.Set = false; + obj.Alarm = false; + } } public LjSwith GetLjSwith(string name) @@ -2329,5 +2409,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl { return Controls.First(x => x.Name == name) as ControlCabinet; } + + #endregion } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MemoryCacheHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MemoryCacheHelper.cs deleted file mode 100644 index 5f28270..0000000 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MemoryCacheHelper.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index d3d1e68..538cc63 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -513,7 +513,6 @@ - @@ -828,7 +827,6 @@ - diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs index c3f2e38..ec37a1c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs @@ -43,7 +43,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.DAStepCode = StringToLable("DAStepCode"); DeviceDetailForm.DATotalTime = StringToLable("DATotalTime"); DeviceDetailForm.DAStepTime = StringToLable("DAStepTime"); - DeviceDetailForm.DATemperature = StringToLable("DATemperature"); DeviceDetailForm.DASpeed = StringToLable("DASpeed"); DeviceDetailForm.DBMode = StringToLable("DBMode"); @@ -53,7 +52,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.DBStepCode = StringToLable("DBStepCode"); DeviceDetailForm.DBTotalTime = StringToLable("DBTotalTime"); DeviceDetailForm.DBStepTime = StringToLable("DBStepTime"); - DeviceDetailForm.DBTemperature = StringToLable("DBTemperature"); DeviceDetailForm.DBSpeed = StringToLable("DBSpeed"); DeviceDetailForm.DCMode = StringToLable("DCMode"); @@ -63,7 +61,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.DCStepCode = StringToLable("DCStepCode"); DeviceDetailForm.DCTotalTime = StringToLable("DCTotalTime"); DeviceDetailForm.DCStepTime = StringToLable("DCStepTime"); - DeviceDetailForm.DCTemperature = StringToLable("DCTemperature"); DeviceDetailForm.DCSpeed = StringToLable("DCSpeed"); DeviceDetailForm.DDMode = StringToLable("DDMode"); @@ -73,7 +70,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.DDStepCode = StringToLable("DDStepCode"); DeviceDetailForm.DDTotalTime = StringToLable("DDTotalTime"); DeviceDetailForm.DDStepTime = StringToLable("DDStepTime"); - DeviceDetailForm.DDTemperature = StringToLable("DDTemperature"); DeviceDetailForm.DDSpeed = StringToLable("DDSpeed"); @@ -85,7 +81,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WAStepCode = StringToLable("WAStepCode"); DeviceDetailForm.WATotalTime = StringToLable("WATotalTime"); DeviceDetailForm.WAStepTime = StringToLable("WAStepTime"); - DeviceDetailForm.WATemperature = StringToLable("WATemperature"); DeviceDetailForm.WASpeed = StringToLable("WASpeed"); DeviceDetailForm.WACurrent = StringToLable("WACurrent"); DeviceDetailForm.WAPressure = StringToLable("WAPressure"); @@ -97,7 +92,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WBStepCode = StringToLable("WBStepCode"); DeviceDetailForm.WBTotalTime = StringToLable("WBTotalTime"); DeviceDetailForm.WBStepTime = StringToLable("WBStepTime"); - DeviceDetailForm.WBTemperature = StringToLable("WBTemperature"); DeviceDetailForm.WBSpeed = StringToLable("WBSpeed"); DeviceDetailForm.WBCurrent = StringToLable("WBCurrent"); DeviceDetailForm.WBPressure = StringToLable("WBPressure"); @@ -109,7 +103,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WCStepCode = StringToLable("WCStepCode"); DeviceDetailForm.WCTotalTime = StringToLable("WCTotalTime"); DeviceDetailForm.WCStepTime = StringToLable("WCStepTime"); - DeviceDetailForm.WCTemperature = StringToLable("WCTemperature"); DeviceDetailForm.WCSpeed = StringToLable("WCSpeed"); DeviceDetailForm.WCCurrent = StringToLable("WCCurrent"); DeviceDetailForm.WCPressure = StringToLable("WCPressure"); @@ -121,7 +114,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WDStepCode = StringToLable("WDStepCode"); DeviceDetailForm.WDTotalTime = StringToLable("WDTotalTime"); DeviceDetailForm.WDStepTime = StringToLable("WDStepTime"); - DeviceDetailForm.WDTemperature = StringToLable("WDTemperature"); DeviceDetailForm.WDSpeed = StringToLable("WDSpeed"); DeviceDetailForm.WDCurrent = StringToLable("WDCurrent"); DeviceDetailForm.WDPressure = StringToLable("WDPressure"); @@ -133,7 +125,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WEStepCode = StringToLable("WEStepCode"); DeviceDetailForm.WETotalTime = StringToLable("WETotalTime"); DeviceDetailForm.WEStepTime = StringToLable("WEStepTime"); - DeviceDetailForm.WETemperature = StringToLable("WETemperature"); DeviceDetailForm.WESpeed = StringToLable("WESpeed"); DeviceDetailForm.WECurrent = StringToLable("WECurrent"); DeviceDetailForm.WEPressure = StringToLable("WEPressure"); @@ -145,7 +136,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WFStepCode = StringToLable("WFStepCode"); DeviceDetailForm.WFTotalTime = StringToLable("WFTotalTime"); DeviceDetailForm.WFStepTime = StringToLable("WFStepTime"); - DeviceDetailForm.WFTemperature = StringToLable("WFTemperature"); DeviceDetailForm.WFSpeed = StringToLable("WFSpeed"); DeviceDetailForm.WFCurrent = StringToLable("WFCurrent"); DeviceDetailForm.WFPressure = StringToLable("WFPressure"); @@ -157,7 +147,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WGStepCode = StringToLable("WGStepCode"); DeviceDetailForm.WGTotalTime = StringToLable("WGTotalTime"); DeviceDetailForm.WGStepTime = StringToLable("WGStepTime"); - DeviceDetailForm.WGTemperature = StringToLable("WGTemperature"); DeviceDetailForm.WGSpeed = StringToLable("WGSpeed"); DeviceDetailForm.WGCurrent = StringToLable("WGCurrent"); DeviceDetailForm.WGPressure = StringToLable("WGPressure"); @@ -169,7 +158,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WHStepCode = StringToLable("WHStepCode"); DeviceDetailForm.WHTotalTime = StringToLable("WHTotalTime"); DeviceDetailForm.WHStepTime = StringToLable("WHStepTime"); - DeviceDetailForm.WHTemperature = StringToLable("WHTemperature"); DeviceDetailForm.WHSpeed = StringToLable("WHSpeed"); DeviceDetailForm.WHCurrent = StringToLable("WHCurrent"); DeviceDetailForm.WHPressure = StringToLable("WHPressure"); @@ -183,7 +171,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GAStepCode = StringToLable("GAStepCode"); DeviceDetailForm.GATotalTime = StringToLable("GATotalTime"); DeviceDetailForm.GAStepTime = StringToLable("GAStepTime"); - DeviceDetailForm.GATemperature = StringToLable("GATemperature"); DeviceDetailForm.GASpeed = StringToLable("GASpeed"); DeviceDetailForm.GBMode = StringToLable("GBMode"); @@ -193,7 +180,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GBStepCode = StringToLable("GBStepCode"); DeviceDetailForm.GBTotalTime = StringToLable("GBTotalTime"); DeviceDetailForm.GBStepTime = StringToLable("GBStepTime"); - DeviceDetailForm.GBTemperature = StringToLable("GBTemperature"); DeviceDetailForm.GBSpeed = StringToLable("GBSpeed"); DeviceDetailForm.GCMode = StringToLable("GCMode"); @@ -203,7 +189,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GCStepCode = StringToLable("GCStepCode"); DeviceDetailForm.GCTotalTime = StringToLable("GCTotalTime"); DeviceDetailForm.GCStepTime = StringToLable("GCStepTime"); - DeviceDetailForm.GCTemperature = StringToLable("GCTemperature"); DeviceDetailForm.GCSpeed = StringToLable("GCSpeed"); DeviceDetailForm.GDMode = StringToLable("GDMode"); @@ -213,7 +198,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GDStepCode = StringToLable("GDStepCode"); DeviceDetailForm.GDTotalTime = StringToLable("GDTotalTime"); DeviceDetailForm.GDStepTime = StringToLable("GDStepTime"); - DeviceDetailForm.GDTemperature = StringToLable("GDTemperature"); DeviceDetailForm.GDSpeed = StringToLable("GDSpeed"); DeviceDetailForm.GEMode = StringToLable("GEMode"); @@ -223,7 +207,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GEStepCode = StringToLable("GEStepCode"); DeviceDetailForm.GETotalTime = StringToLable("GETotalTime"); DeviceDetailForm.GEStepTime = StringToLable("GEStepTime"); - DeviceDetailForm.GETemperature = StringToLable("GETemperature"); DeviceDetailForm.GESpeed = StringToLable("GESpeed"); DeviceDetailForm.GFMode = StringToLable("GFMode"); @@ -233,7 +216,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GFStepCode = StringToLable("GFStepCode"); DeviceDetailForm.GFTotalTime = StringToLable("GFTotalTime"); DeviceDetailForm.GFStepTime = StringToLable("GFStepTime"); - DeviceDetailForm.GFTemperature = StringToLable("GFTemperature"); DeviceDetailForm.GFSpeed = StringToLable("GFSpeed"); DeviceDetailForm.GGMode = StringToLable("GGMode"); @@ -243,7 +225,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GGStepCode = StringToLable("GGStepCode"); DeviceDetailForm.GGTotalTime = StringToLable("GGTotalTime"); DeviceDetailForm.GGStepTime = StringToLable("GGStepTime"); - DeviceDetailForm.GGTemperature = StringToLable("GGTemperature"); DeviceDetailForm.GGSpeed = StringToLable("GGSpeed"); DeviceDetailForm.GHMode = StringToLable("GHMode"); @@ -253,7 +234,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GHStepCode = StringToLable("GHStepCode"); DeviceDetailForm.GHTotalTime = StringToLable("GHTotalTime"); DeviceDetailForm.GHStepTime = StringToLable("GHStepTime"); - DeviceDetailForm.GHTemperature = StringToLable("GHTemperature"); DeviceDetailForm.GHSpeed = StringToLable("GHSpeed"); #endregion @@ -333,10 +313,9 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report string stepName = Convert.ToString(row["stepName"]); int totalTime = (int)row["totalTime"]; int stepTime = (int)row["stepTime"]; - float temperature = Convert.ToSingle(row["temperature"]); - float speed = Convert.ToSingle(row["speed"]); - float current = Convert.ToSingle(row["currnet"]); - float pressure = Convert.ToSingle(row["pressure"]); + float speed = (float)Math.Round(Convert.ToSingle(row["speed"]), 2); + float current = (float)Math.Round(Convert.ToSingle(row["currnet"]), 2); + float pressure = (float)Math.Round(Convert.ToSingle(row["pressure"]), 2); #region 控件赋值 switch (id) @@ -351,7 +330,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.DAStepCode.MCValue = stepName; this.DeviceDetailForm.DATotalTime.MCValue = totalTime; this.DeviceDetailForm.DAStepTime.MCValue = stepTime; - this.DeviceDetailForm.DATemperature.MCValue = temperature; this.DeviceDetailForm.DASpeed.MCValue = speed; break; case "Dryer1": @@ -364,7 +342,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.DBStepCode.MCValue = stepName; this.DeviceDetailForm.DBTotalTime.MCValue = totalTime; this.DeviceDetailForm.DBStepTime.MCValue = stepTime; - this.DeviceDetailForm.DBTemperature.MCValue = temperature; this.DeviceDetailForm.DBSpeed.MCValue = speed; break; case "Dryer2": @@ -377,7 +354,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.DCStepCode.MCValue = stepName; this.DeviceDetailForm.DCTotalTime.MCValue = totalTime; this.DeviceDetailForm.DCStepTime.MCValue = stepTime; - this.DeviceDetailForm.DCTemperature.MCValue = temperature; this.DeviceDetailForm.DCSpeed.MCValue = speed; break; case "Dryer3": @@ -390,7 +366,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.DDStepCode.MCValue = stepName; this.DeviceDetailForm.DDTotalTime.MCValue = totalTime; this.DeviceDetailForm.DDStepTime.MCValue = stepTime; - this.DeviceDetailForm.DDTemperature.MCValue = temperature; this.DeviceDetailForm.DDSpeed.MCValue = speed; break; case "Weter0": @@ -403,7 +378,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WAStepCode.MCValue = stepName; this.DeviceDetailForm.WATotalTime.MCValue = totalTime; this.DeviceDetailForm.WAStepTime.MCValue = stepTime; - this.DeviceDetailForm.WATemperature.MCValue = temperature; this.DeviceDetailForm.WASpeed.MCValue = speed; this.DeviceDetailForm.WACurrent.MCValue = current; this.DeviceDetailForm.WAPressure.MCValue = pressure; @@ -418,7 +392,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WBStepCode.MCValue = stepName; this.DeviceDetailForm.WBTotalTime.MCValue = totalTime; this.DeviceDetailForm.WBStepTime.MCValue = stepTime; - this.DeviceDetailForm.WBTemperature.MCValue = temperature; this.DeviceDetailForm.WBSpeed.MCValue = speed; this.DeviceDetailForm.WBCurrent.MCValue = current; this.DeviceDetailForm.WBPressure.MCValue = pressure; @@ -433,7 +406,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WCStepCode.MCValue = stepName; this.DeviceDetailForm.WCTotalTime.MCValue = totalTime; this.DeviceDetailForm.WCStepTime.MCValue = stepTime; - this.DeviceDetailForm.WCTemperature.MCValue = temperature; this.DeviceDetailForm.WCSpeed.MCValue = speed; this.DeviceDetailForm.WCCurrent.MCValue = current; this.DeviceDetailForm.WCPressure.MCValue = pressure; @@ -448,7 +420,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WDStepCode.MCValue = stepName; this.DeviceDetailForm.WDTotalTime.MCValue = totalTime; this.DeviceDetailForm.WDStepTime.MCValue = stepTime; - this.DeviceDetailForm.WDTemperature.MCValue = temperature; this.DeviceDetailForm.WDSpeed.MCValue = speed; this.DeviceDetailForm.WDCurrent.MCValue = current; this.DeviceDetailForm.WDPressure.MCValue = pressure; @@ -463,7 +434,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WEStepCode.MCValue = stepName; this.DeviceDetailForm.WETotalTime.MCValue = totalTime; this.DeviceDetailForm.WEStepTime.MCValue = stepTime; - this.DeviceDetailForm.WETemperature.MCValue = temperature; this.DeviceDetailForm.WESpeed.MCValue = speed; this.DeviceDetailForm.WECurrent.MCValue = current; this.DeviceDetailForm.WEPressure.MCValue = pressure; @@ -478,7 +448,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WFStepCode.MCValue = stepName; this.DeviceDetailForm.WFTotalTime.MCValue = totalTime; this.DeviceDetailForm.WFStepTime.MCValue = stepTime; - this.DeviceDetailForm.WFTemperature.MCValue = temperature; this.DeviceDetailForm.WFSpeed.MCValue = speed; this.DeviceDetailForm.WFCurrent.MCValue = current; this.DeviceDetailForm.WFPressure.MCValue = pressure; @@ -493,7 +462,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WGStepCode.MCValue = stepName; this.DeviceDetailForm.WGTotalTime.MCValue = totalTime; this.DeviceDetailForm.WGStepTime.MCValue = stepTime; - this.DeviceDetailForm.WGTemperature.MCValue = temperature; this.DeviceDetailForm.WGSpeed.MCValue = speed; this.DeviceDetailForm.WGCurrent.MCValue = current; this.DeviceDetailForm.WGPressure.MCValue = pressure; @@ -508,7 +476,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.WHStepCode.MCValue = stepName; this.DeviceDetailForm.WHTotalTime.MCValue = totalTime; this.DeviceDetailForm.WHStepTime.MCValue = stepTime; - this.DeviceDetailForm.WHTemperature.MCValue = temperature; this.DeviceDetailForm.WHSpeed.MCValue = speed; this.DeviceDetailForm.WHCurrent.MCValue = current; this.DeviceDetailForm.WHPressure.MCValue = pressure; @@ -523,7 +490,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GAStepCode.MCValue = stepName; this.DeviceDetailForm.GATotalTime.MCValue = totalTime; this.DeviceDetailForm.GAStepTime.MCValue = stepTime; - this.DeviceDetailForm.GATemperature.MCValue = temperature; this.DeviceDetailForm.GASpeed.MCValue = speed; break; case "Gelater1": @@ -536,7 +502,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GBStepCode.MCValue = stepName; this.DeviceDetailForm.GBTotalTime.MCValue = totalTime; this.DeviceDetailForm.GBStepTime.MCValue = stepTime; - this.DeviceDetailForm.GBTemperature.MCValue = temperature; this.DeviceDetailForm.GBSpeed.MCValue = speed; break; case "Gelater2": @@ -549,7 +514,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GCStepCode.MCValue = stepName; this.DeviceDetailForm.GCTotalTime.MCValue = totalTime; this.DeviceDetailForm.GCStepTime.MCValue = stepTime; - this.DeviceDetailForm.GCTemperature.MCValue = temperature; this.DeviceDetailForm.GCSpeed.MCValue = speed; break; case "Gelater3": @@ -562,7 +526,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GDStepCode.MCValue = stepName; this.DeviceDetailForm.GDTotalTime.MCValue = totalTime; this.DeviceDetailForm.GDStepTime.MCValue = stepTime; - this.DeviceDetailForm.GDTemperature.MCValue = temperature; this.DeviceDetailForm.GDSpeed.MCValue = speed; break; case "Gelater4": @@ -575,7 +538,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GEStepCode.MCValue = stepName; this.DeviceDetailForm.GETotalTime.MCValue = totalTime; this.DeviceDetailForm.GEStepTime.MCValue = stepTime; - this.DeviceDetailForm.GETemperature.MCValue = temperature; this.DeviceDetailForm.GESpeed.MCValue = speed; break; case "Gelater5": @@ -588,7 +550,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GFStepCode.MCValue = stepName; this.DeviceDetailForm.GFTotalTime.MCValue = totalTime; this.DeviceDetailForm.GFStepTime.MCValue = stepTime; - this.DeviceDetailForm.GFTemperature.MCValue = temperature; this.DeviceDetailForm.GFSpeed.MCValue = speed; break; case "Gelater6": @@ -601,7 +562,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GGStepCode.MCValue = stepName; this.DeviceDetailForm.GGTotalTime.MCValue = totalTime; this.DeviceDetailForm.GGStepTime.MCValue = stepTime; - this.DeviceDetailForm.GGTemperature.MCValue = temperature; this.DeviceDetailForm.GGSpeed.MCValue = speed; break; case "Gelater7": @@ -614,7 +574,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.DeviceDetailForm.GHStepCode.MCValue = stepName; this.DeviceDetailForm.GHTotalTime.MCValue = totalTime; this.DeviceDetailForm.GHStepTime.MCValue = stepTime; - this.DeviceDetailForm.GHTemperature.MCValue = temperature; this.DeviceDetailForm.GHSpeed.MCValue = speed; break; default: break; diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs b/Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs index 6707c50..f35bb09 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs +++ b/Controls/Mesnac.Controls.ChemicalWeighing/LjSwith.cs @@ -91,11 +91,11 @@ namespace Mesnac.Controls.ChemicalWeighing get => _alarm; set { - - + if (_alarm != value) + { _alarm = value; R(); - + } } } @@ -105,10 +105,11 @@ namespace Mesnac.Controls.ChemicalWeighing get => _set; set { - + if (_set != value) + { _set = value; R(); - + } } } } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml index b781f28..4d9f448 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml @@ -1,6 +1,6 @@ - + False AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAL @@ -26,37 +26,193 @@ True True False - 73, 85 - MCDataGridView1 - 517, 395 - 2 + 349, 12 + MoreData + 330, 623 + 5 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Time + True + 110, 104 + endTime + 77, 21 + 7 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Time + True + 110, 77 + startTime + 77, 21 + 6 + + + + + + + False + + + + None + True + True + MiddleCenter + 224, 224, 224 + 21, 61 + SpecialLabelBlue1 + 287, 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 21, 104 + endDate + 84, 21 + 4 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + Short + 21, 77 + startDate + 84, 21 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 范围查询 + 206, 77 + SelectButton + 103, 48 + 2 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + False + + + Red + DarkGray + 统计单日 + 206, 26 + MCButton1 + 103, 21 + 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + + False + + + + None + True + True + 21, 26 + MCDateTimePicker1 + 166, 21 + 0 + + False + 统计查询 + 12, 12 + GroupBox1 + 330, 145 + 3 - + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAAAAAAAAAAAHAwAAAAABAAAAAAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - False - - - - None - True - True - False - - - Red - DarkGray - 统计 - 286, 25 - MCButton1 - 159, 33 - 1 - - - + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -64,14 +220,18 @@ False - + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + None True True - 73, 29 - MCDateTimePicker1 - 166, 21 - 0 + False + False + 12, 163 + MCDataGridView1 + 330, 472 + 2 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg2NDAyODIxNjQ1N0E4MTI4NzVFN0NCREQ4Qjc2REI2BgYAAAAV57OK5YyW5py65pel5oqV5oql6KGoBgcAAAAV57OK5YyW5py65pel5oqV5oql6KGoCw== @@ -89,7 +249,7 @@ False False Control - 896, 688 + 707, 685 WindowsDefaultLocation 糊化机黑粉日统计 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml index 2773661..70b6b36 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml @@ -12216,7 +12216,7 @@ 1924, 1037 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhjZGQyYmNhYjgyYjRmODFhYjgyZmZiNWU1MTJmOTBmBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhjZGQyYmNhYjgyYjRmODFhYjgyZmZiNWU1MTJmOTBmBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index ba65324..45e4e99 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -494,28 +494,6 @@ MCLabel778 11, 12 - - - - Red - DarkGray - DDTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 488, 267 - MCLabel779 - 11, 12 - @@ -534,7 +512,7 @@ 0 Transparent ButtonHighlight - 430, 267 + 469, 267 MCLabel780 11, 12 @@ -556,7 +534,7 @@ 0 Transparent ButtonHighlight - 375, 267 + 394, 267 MCLabel781 11, 12 @@ -692,28 +670,6 @@ MCLabel769 11, 12 - - - - Red - DarkGray - DCTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 488, 207 - MCLabel770 - 11, 12 - @@ -732,7 +688,7 @@ 0 Transparent ButtonHighlight - 430, 207 + 469, 207 MCLabel771 11, 12 @@ -754,7 +710,7 @@ 0 Transparent ButtonHighlight - 375, 207 + 394, 207 MCLabel772 11, 12 @@ -890,28 +846,6 @@ MCLabel760 11, 12 - - - - Red - DarkGray - DBTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 488, 147 - MCLabel761 - 11, 12 - @@ -930,7 +864,7 @@ 0 Transparent ButtonHighlight - 430, 147 + 469, 147 MCLabel762 11, 12 @@ -952,7 +886,7 @@ 0 Transparent ButtonHighlight - 375, 147 + 394, 147 MCLabel763 11, 12 @@ -1088,28 +1022,6 @@ MCLabel671 11, 12 - - - - Red - DarkGray - DATemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 488, 87 - MCLabel674 - 11, 12 - @@ -1128,7 +1040,7 @@ 0 Transparent ButtonHighlight - 430, 87 + 469, 87 MCLabel687 11, 12 @@ -1150,7 +1062,7 @@ 0 Transparent ButtonHighlight - 375, 87 + 394, 87 MCLabel690 11, 12 @@ -1399,28 +1311,6 @@ MCLabel750 29, 12 - - - - Red - DarkGray - - - False - - - - None - True - True - MiddleRight - 温度 - Transparent - ButtonHighlight - 489, 55 - MCLabel751 - 29, 12 - @@ -1439,7 +1329,7 @@ 分步时间 Transparent ButtonHighlight - 430, 55 + 469, 55 MCLabel752 53, 12 @@ -1461,7 +1351,7 @@ 总时间 Transparent ButtonHighlight - 375, 55 + 394, 55 MCLabel753 41, 12 @@ -1649,28 +1539,6 @@ MCLabel859 11, 12 - - - - Red - DarkGray - GHTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 297 - MCLabel860 - 11, 12 - @@ -1689,7 +1557,7 @@ 0 Transparent ButtonHighlight - 433, 297 + 469, 296 MCLabel861 11, 12 @@ -1711,7 +1579,7 @@ 0 Transparent ButtonHighlight - 378, 297 + 398, 297 MCLabel862 11, 12 @@ -1847,28 +1715,6 @@ MCLabel868 11, 12 - - - - Red - DarkGray - GGTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 267 - MCLabel869 - 11, 12 - @@ -1887,7 +1733,7 @@ 0 Transparent ButtonHighlight - 433, 267 + 469, 266 MCLabel870 11, 12 @@ -1909,7 +1755,7 @@ 0 Transparent ButtonHighlight - 378, 267 + 398, 267 MCLabel871 11, 12 @@ -2045,28 +1891,6 @@ MCLabel877 11, 12 - - - - Red - DarkGray - GFTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 237 - MCLabel878 - 11, 12 - @@ -2085,7 +1909,7 @@ 0 Transparent ButtonHighlight - 433, 237 + 469, 236 MCLabel879 11, 12 @@ -2107,7 +1931,7 @@ 0 Transparent ButtonHighlight - 378, 237 + 398, 237 MCLabel880 11, 12 @@ -2243,28 +2067,6 @@ MCLabel886 11, 12 - - - - Red - DarkGray - GETemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 207 - MCLabel887 - 11, 12 - @@ -2283,7 +2085,7 @@ 0 Transparent ButtonHighlight - 433, 207 + 469, 206 MCLabel888 11, 12 @@ -2305,7 +2107,7 @@ 0 Transparent ButtonHighlight - 378, 207 + 398, 207 MCLabel889 11, 12 @@ -2441,28 +2243,6 @@ MCLabel895 11, 12 - - - - Red - DarkGray - GDTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 177 - MCLabel896 - 11, 12 - @@ -2481,7 +2261,7 @@ 0 Transparent ButtonHighlight - 433, 177 + 469, 176 MCLabel897 11, 12 @@ -2503,7 +2283,7 @@ 0 Transparent ButtonHighlight - 378, 177 + 398, 177 MCLabel898 11, 12 @@ -2639,28 +2419,6 @@ MCLabel904 11, 12 - - - - Red - DarkGray - GCTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 147 - MCLabel905 - 11, 12 - @@ -2679,7 +2437,7 @@ 0 Transparent ButtonHighlight - 433, 147 + 469, 146 MCLabel906 11, 12 @@ -2701,7 +2459,7 @@ 0 Transparent ButtonHighlight - 378, 147 + 398, 147 MCLabel907 11, 12 @@ -2837,28 +2595,6 @@ MCLabel913 11, 12 - - - - Red - DarkGray - GBTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 117 - MCLabel914 - 11, 12 - @@ -2877,7 +2613,7 @@ 0 Transparent ButtonHighlight - 433, 117 + 469, 116 MCLabel915 11, 12 @@ -2899,7 +2635,7 @@ 0 Transparent ButtonHighlight - 378, 117 + 398, 117 MCLabel916 11, 12 @@ -3035,28 +2771,6 @@ MCLabel922 11, 12 - - - - Red - DarkGray - GATemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 491, 87 - MCLabel923 - 11, 12 - @@ -3075,7 +2789,7 @@ 0 Transparent ButtonHighlight - 433, 87 + 469, 86 MCLabel924 11, 12 @@ -3097,7 +2811,7 @@ 0 Transparent ButtonHighlight - 378, 87 + 398, 87 MCLabel925 11, 12 @@ -3408,28 +3122,6 @@ MCLabel659 29, 12 - - - - Red - DarkGray - - - False - - - - None - True - True - MiddleRight - 温度 - Transparent - ButtonHighlight - 489, 55 - MCLabel660 - 29, 12 - @@ -3448,7 +3140,7 @@ 分步时间 Transparent ButtonHighlight - 430, 55 + 466, 54 MCLabel661 53, 12 @@ -3470,7 +3162,7 @@ 总时间 Transparent ButtonHighlight - 375, 55 + 395, 55 MCLabel662 41, 12 @@ -3654,7 +3346,7 @@ 0 Transparent ButtonHighlight - 519, 297 + 508, 297 MCLabel936 11, 12 @@ -3698,7 +3390,7 @@ 0 Transparent ButtonHighlight - 519, 267 + 508, 267 MCLabel938 11, 12 @@ -3742,7 +3434,7 @@ 0 Transparent ButtonHighlight - 519, 237 + 508, 237 MCLabel940 11, 12 @@ -3786,7 +3478,7 @@ 0 Transparent ButtonHighlight - 519, 207 + 508, 207 MCLabel942 11, 12 @@ -3830,7 +3522,7 @@ 0 Transparent ButtonHighlight - 519, 177 + 508, 177 MCLabel944 11, 12 @@ -3874,7 +3566,7 @@ 0 Transparent ButtonHighlight - 519, 147 + 508, 147 MCLabel946 11, 12 @@ -3918,7 +3610,7 @@ 0 Transparent ButtonHighlight - 519, 117 + 508, 117 MCLabel948 11, 12 @@ -3962,7 +3654,7 @@ 0 Transparent ButtonHighlight - 519, 87 + 508, 87 MCLabel950 11, 12 @@ -4006,7 +3698,7 @@ 重量 Transparent ButtonHighlight - 516, 55 + 505, 55 MCLabel934 29, 12 @@ -4050,32 +3742,10 @@ 0 Transparent ButtonHighlight - 488, 297 + 461, 297 MCLabel823 11, 12 - - - - Red - DarkGray - WHTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 297 - MCLabel824 - 11, 12 - @@ -4248,32 +3918,10 @@ 0 Transparent ButtonHighlight - 488, 267 + 461, 267 MCLabel832 11, 12 - - - - Red - DarkGray - WGTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 267 - MCLabel833 - 11, 12 - @@ -4446,32 +4094,10 @@ 0 Transparent ButtonHighlight - 488, 237 + 461, 237 MCLabel841 11, 12 - - - - Red - DarkGray - WFTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 237 - MCLabel842 - 11, 12 - @@ -4644,32 +4270,10 @@ 0 Transparent ButtonHighlight - 488, 207 + 461, 207 MCLabel850 11, 12 - - - - Red - DarkGray - WETemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 207 - MCLabel851 - 11, 12 - @@ -4842,32 +4446,10 @@ 0 Transparent ButtonHighlight - 488, 177 + 461, 177 MCLabel787 11, 12 - - - - Red - DarkGray - WDTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 177 - MCLabel788 - 11, 12 - @@ -5040,32 +4622,10 @@ 0 Transparent ButtonHighlight - 488, 147 + 461, 147 MCLabel796 11, 12 - - - - Red - DarkGray - WCTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 147 - MCLabel797 - 11, 12 - @@ -5238,32 +4798,10 @@ 0 Transparent ButtonHighlight - 488, 117 + 461, 117 MCLabel805 11, 12 - - - - Red - DarkGray - WBTemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 117 - MCLabel806 - 11, 12 - @@ -5436,32 +4974,10 @@ 0 Transparent ButtonHighlight - 488, 87 + 461, 87 MCLabel814 11, 12 - - - - Red - DarkGray - WATemperature - - False - - - - InitData - True - True - MiddleRight - 0 - Transparent - ButtonHighlight - 455, 87 - MCLabel815 - 11, 12 - @@ -5809,32 +5325,10 @@ 速度 Transparent ButtonHighlight - 486, 55 + 459, 55 MCLabel220 29, 12 - - - - Red - DarkGray - - - False - - - - None - True - True - MiddleRight - 温度 - Transparent - ButtonHighlight - 455, 55 - MCLabel221 - 29, 12 - @@ -6569,7 +6063,7 @@ - None + QueryAndModify True True 0 @@ -12379,7 +11873,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDk3MDFENDk3MkEyOTQ2RjI4QTM5OTMzMUVCNDA2Mzc5BgYAAAAP55WM6Z2i5Yid5aeL5YyWBgcAAAAP55WM6Z2i5Yid5aeL5YyWCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhjZGQyYmNhYjgyYjRmODFhYjgyZmZiNWU1MTJmOTBmBgYAAAAP56qX5L2T5Yid5aeL5YyWBgcAAAAP56qX5L2T5Yid5aeL5YyWCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=