From f926545355935b4ada26c71ffba2162eff90d298 Mon Sep 17 00:00:00 2001 From: wangsr Date: Fri, 15 Sep 2023 14:04:15 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9nodedevice=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7=E5=9B=BE?= =?UTF-8?q?=20=E5=8F=91=E7=89=88=E5=89=8D=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceDetail2ReportAction.cs | 217 +++-- .../Entity/DeviceDetail2Entity.cs | 381 ++++---- Main/MCEdit/Data/MCProject/nodeDevice.xml | 528 ++++++----- .../MCProject/nodeForm/FormDeviceDetail2.xml | 844 ++++++++++++++++-- 4 files changed, 1417 insertions(+), 553 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs index 2b6359c..141f328 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/DeviceDetail2ReportAction.cs @@ -11,6 +11,7 @@ using Mesnac.Codd.Session; using Mesnac.Action.ChemicalWeighing.LjMaterial; using System.Data; using Mesnac.Action.ChemicalWeighing; +using Mesnac.Controls.Default; namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report { @@ -28,9 +29,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report this.AlarmForm = McControllist.FirstOrDefault(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == "AlarmForm"); - //this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "AlarmForm").FirstOrDefault(); //获取物料数据控件 + //this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "AlarmForm").FirstOrDefault(); //获取物料数据控件 - DeviceDetailForm.DAMode = StringToLable("DAMode"); + #region 实体类对应前端控件 + + DeviceDetailForm.DAMode = StringToLable("DAMode"); DeviceDetailForm.DAStatus = StringToLable("DAStatus"); DeviceDetailForm.DABatch = StringToLable("DABatch"); DeviceDetailForm.DAStep = StringToLable("DAStep"); @@ -81,8 +84,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WAStepTime = StringToLable("WAStepTime"); DeviceDetailForm.WATemperature = StringToLable("WATemperature"); DeviceDetailForm.WASpeed = StringToLable("WASpeed"); + DeviceDetailForm.WACurrent = StringToLable("WACurrent"); + DeviceDetailForm.WAPressure = StringToLable("WAPressure"); - DeviceDetailForm.WBMode = StringToLable("WBMode"); + DeviceDetailForm.WBMode = StringToLable("WBMode"); DeviceDetailForm.WBStatus = StringToLable("WBStatus"); DeviceDetailForm.WBBatch = StringToLable("WBBatch"); DeviceDetailForm.WBStep = StringToLable("WBStep"); @@ -91,8 +96,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WBStepTime = StringToLable("WBStepTime"); DeviceDetailForm.WBTemperature = StringToLable("WBTemperature"); DeviceDetailForm.WBSpeed = StringToLable("WBSpeed"); + DeviceDetailForm.WBCurrent = StringToLable("WBCurrent"); + DeviceDetailForm.WBPressure = StringToLable("WBPressure"); - DeviceDetailForm.WCMode = StringToLable("WCMode"); + DeviceDetailForm.WCMode = StringToLable("WCMode"); DeviceDetailForm.WCStatus = StringToLable("WCStatus"); DeviceDetailForm.WCBatch = StringToLable("WCBatch"); DeviceDetailForm.WCStep = StringToLable("WCStep"); @@ -101,8 +108,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WCStepTime = StringToLable("WCStepTime"); DeviceDetailForm.WCTemperature = StringToLable("WCTemperature"); DeviceDetailForm.WCSpeed = StringToLable("WCSpeed"); + DeviceDetailForm.WCCurrent = StringToLable("WCCurrent"); + DeviceDetailForm.WCPressure = StringToLable("WCPressure"); - DeviceDetailForm.WDMode = StringToLable("WDMode"); + DeviceDetailForm.WDMode = StringToLable("WDMode"); DeviceDetailForm.WDStatus = StringToLable("WDStatus"); DeviceDetailForm.WDBatch = StringToLable("WDBatch"); DeviceDetailForm.WDStep = StringToLable("WDStep"); @@ -111,8 +120,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WDStepTime = StringToLable("WDStepTime"); DeviceDetailForm.WDTemperature = StringToLable("WDTemperature"); DeviceDetailForm.WDSpeed = StringToLable("WDSpeed"); + DeviceDetailForm.WDCurrent = StringToLable("WDCurrent"); + DeviceDetailForm.WDPressure = StringToLable("WDPressure"); - DeviceDetailForm.WEMode = StringToLable("WEMode"); + DeviceDetailForm.WEMode = StringToLable("WEMode"); DeviceDetailForm.WEStatus = StringToLable("WEStatus"); DeviceDetailForm.WEBatch = StringToLable("WEBatch"); DeviceDetailForm.WEStep = StringToLable("WEStep"); @@ -121,8 +132,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WEStepTime = StringToLable("WEStepTime"); DeviceDetailForm.WETemperature = StringToLable("WETemperature"); DeviceDetailForm.WESpeed = StringToLable("WESpeed"); + DeviceDetailForm.WECurrent = StringToLable("WECurrent"); + DeviceDetailForm.WEPressure = StringToLable("WEPressure"); - DeviceDetailForm.WFMode = StringToLable("WFMode"); + DeviceDetailForm.WFMode = StringToLable("WFMode"); DeviceDetailForm.WFStatus = StringToLable("WFStatus"); DeviceDetailForm.WFBatch = StringToLable("WFBatch"); DeviceDetailForm.WFStep = StringToLable("WFStep"); @@ -131,8 +144,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WFStepTime = StringToLable("WFStepTime"); DeviceDetailForm.WFTemperature = StringToLable("WFTemperature"); DeviceDetailForm.WFSpeed = StringToLable("WFSpeed"); + DeviceDetailForm.WFCurrent = StringToLable("WFCurrent"); + DeviceDetailForm.WFPressure = StringToLable("WFPressure"); - DeviceDetailForm.WGMode = StringToLable("WGMode"); + DeviceDetailForm.WGMode = StringToLable("WGMode"); DeviceDetailForm.WGStatus = StringToLable("WGStatus"); DeviceDetailForm.WGBatch = StringToLable("WGBatch"); DeviceDetailForm.WGStep = StringToLable("WGStep"); @@ -141,8 +156,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WGStepTime = StringToLable("WGStepTime"); DeviceDetailForm.WGTemperature = StringToLable("WGTemperature"); DeviceDetailForm.WGSpeed = StringToLable("WGSpeed"); + DeviceDetailForm.WGCurrent = StringToLable("WGCurrent"); + DeviceDetailForm.WGPressure = StringToLable("WGPressure"); - DeviceDetailForm.WHMode = StringToLable("WHMode"); + DeviceDetailForm.WHMode = StringToLable("WHMode"); DeviceDetailForm.WHStatus = StringToLable("WHStatus"); DeviceDetailForm.WHBatch = StringToLable("WHBatch"); DeviceDetailForm.WHStep = StringToLable("WHStep"); @@ -151,6 +168,8 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.WHStepTime = StringToLable("WHStepTime"); DeviceDetailForm.WHTemperature = StringToLable("WHTemperature"); DeviceDetailForm.WHSpeed = StringToLable("WHSpeed"); + DeviceDetailForm.WHCurrent = StringToLable("WHCurrent"); + DeviceDetailForm.WHPressure = StringToLable("WHPressure"); @@ -233,13 +252,9 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report DeviceDetailForm.GHStepTime = StringToLable("GHStepTime"); DeviceDetailForm.GHTemperature = StringToLable("GHTemperature"); DeviceDetailForm.GHSpeed = StringToLable("GHSpeed"); + #endregion - - - - - - Timer timer1 = new Timer(); + Timer timer1 = new Timer(); timer1.Interval = 2000; timer1.Enabled = true; timer1.Tick += new EventHandler(GetDataFromPLCToForm);//添加事件 @@ -252,7 +267,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report /// public void GetDataFromPLCToForm(object source, EventArgs e) { - DataTable parametersWithPCTable = DBHelp.GetTable("select Id, mode, status, batch, step, stepName, totalTime, stepTime, temperature, speed from ParametersWithPC"); + DataTable AlarmTable = DBHelp.GetTable(@"select t2.Alarm_ID, t2.Alarm_Other_Info,t2.Alarm_Block,t2.Alarm_Word,t2.Alarm_Bit,t1.Alarm_OccurTime from LR_Alarmlog t1 left join Pmt_Alarm t2 on t1.Alarm_ID=t2.Alarm_ID where t1.Alarm_Status=1"); @@ -264,7 +279,9 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report //DBLog("成功!"); } - foreach (DataRow row in parametersWithPCTable.Rows) + DataTable parametersWithPCTable = DBHelp.GetTable("select Id, mode, status, batch, step, stepName, totalTime, stepTime, temperature, speed, currnet, pressure from ParametersWithPC"); + + foreach (DataRow row in parametersWithPCTable.Rows) { string id = row["Id"].ToString(); System.Drawing.Color modeColor = System.Drawing.Color.White; @@ -298,15 +315,18 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report 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"]); - switch (id) + #region 控件赋值 + switch (id) { case "Dryer0": this.DeviceDetailForm.DAMode.MCValue = mode; - var DAModeLabel = this.DeviceDetailForm.DAMode as Label; - DAModeLabel.ForeColor = modeColor; + this.DeviceDetailForm.DAMode.ForeColor = modeColor; this.DeviceDetailForm.DAStatus.MCValue = status; - this.DeviceDetailForm.DABatch.MCValue = batch; + this.DeviceDetailForm.DAStatus.ForeColor = statusColor; + this.DeviceDetailForm.DABatch.MCValue = batch; this.DeviceDetailForm.DAStep.MCValue = step; this.DeviceDetailForm.DAStepCode.MCValue = stepName; this.DeviceDetailForm.DATotalTime.MCValue = totalTime; @@ -316,8 +336,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Dryer1": this.DeviceDetailForm.DBMode.MCValue = mode; - this.DeviceDetailForm.DBStatus.MCValue = status; - this.DeviceDetailForm.DBBatch.MCValue = batch; + this.DeviceDetailForm.DBMode.ForeColor = modeColor; + this.DeviceDetailForm.DBStatus.MCValue = status; + this.DeviceDetailForm.DBStatus.ForeColor = statusColor; + this.DeviceDetailForm.DBBatch.MCValue = batch; this.DeviceDetailForm.DBStep.MCValue = step; this.DeviceDetailForm.DBStepCode.MCValue = stepName; this.DeviceDetailForm.DBTotalTime.MCValue = totalTime; @@ -327,8 +349,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Dryer2": this.DeviceDetailForm.DCMode.MCValue = mode; - this.DeviceDetailForm.DCStatus.MCValue = status; - this.DeviceDetailForm.DCBatch.MCValue = batch; + this.DeviceDetailForm.DCMode.ForeColor = modeColor; + this.DeviceDetailForm.DCStatus.MCValue = status; + this.DeviceDetailForm.DCStatus.ForeColor = statusColor; + this.DeviceDetailForm.DCBatch.MCValue = batch; this.DeviceDetailForm.DCStep.MCValue = step; this.DeviceDetailForm.DCStepCode.MCValue = stepName; this.DeviceDetailForm.DCTotalTime.MCValue = totalTime; @@ -338,8 +362,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Dryer3": this.DeviceDetailForm.DDMode.MCValue = mode; - this.DeviceDetailForm.DDStatus.MCValue = status; - this.DeviceDetailForm.DDBatch.MCValue = batch; + this.DeviceDetailForm.DDMode.ForeColor = modeColor; + this.DeviceDetailForm.DDStatus.MCValue = status; + this.DeviceDetailForm.DDStatus.ForeColor = statusColor; + this.DeviceDetailForm.DDBatch.MCValue = batch; this.DeviceDetailForm.DDStep.MCValue = step; this.DeviceDetailForm.DDStepCode.MCValue = stepName; this.DeviceDetailForm.DDTotalTime.MCValue = totalTime; @@ -349,96 +375,130 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Weter0": this.DeviceDetailForm.WAMode.MCValue = mode; - this.DeviceDetailForm.WAStatus.MCValue = status; - this.DeviceDetailForm.WABatch.MCValue = batch; + this.DeviceDetailForm.WAMode.ForeColor = modeColor; + this.DeviceDetailForm.WAStatus.MCValue = status; + this.DeviceDetailForm.WAStatus.ForeColor = statusColor; + this.DeviceDetailForm.WABatch.MCValue = batch; this.DeviceDetailForm.WAStep.MCValue = step; 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; break; case "Weter1": this.DeviceDetailForm.WBMode.MCValue = mode; - this.DeviceDetailForm.WBStatus.MCValue = status; - this.DeviceDetailForm.WBBatch.MCValue = batch; + this.DeviceDetailForm.WBMode.ForeColor = modeColor; + this.DeviceDetailForm.WBStatus.MCValue = status; + this.DeviceDetailForm.WBStatus.ForeColor = statusColor; + this.DeviceDetailForm.WBBatch.MCValue = batch; this.DeviceDetailForm.WBStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WBCurrent.MCValue = current; + this.DeviceDetailForm.WBPressure.MCValue = pressure; + break; case "Weter2": this.DeviceDetailForm.WCMode.MCValue = mode; - this.DeviceDetailForm.WCStatus.MCValue = status; - this.DeviceDetailForm.WCBatch.MCValue = batch; + this.DeviceDetailForm.WCMode.ForeColor = modeColor; + this.DeviceDetailForm.WCStatus.MCValue = status; + this.DeviceDetailForm.WCStatus.ForeColor = statusColor; + this.DeviceDetailForm.WCBatch.MCValue = batch; this.DeviceDetailForm.WCStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WCCurrent.MCValue = current; + this.DeviceDetailForm.WCPressure.MCValue = pressure; + break; case "Weter3": this.DeviceDetailForm.WDMode.MCValue = mode; - this.DeviceDetailForm.WDStatus.MCValue = status; - this.DeviceDetailForm.WDBatch.MCValue = batch; + this.DeviceDetailForm.WDMode.ForeColor = modeColor; + this.DeviceDetailForm.WDStatus.MCValue = status; + this.DeviceDetailForm.WDStatus.ForeColor = statusColor; + this.DeviceDetailForm.WDBatch.MCValue = batch; this.DeviceDetailForm.WDStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WDCurrent.MCValue = current; + this.DeviceDetailForm.WDPressure.MCValue = pressure; + break; case "Weter4": this.DeviceDetailForm.WEMode.MCValue = mode; - this.DeviceDetailForm.WEStatus.MCValue = status; - this.DeviceDetailForm.WEBatch.MCValue = batch; + this.DeviceDetailForm.WEMode.ForeColor = modeColor; + this.DeviceDetailForm.WEStatus.MCValue = status; + this.DeviceDetailForm.WEStatus.ForeColor = statusColor; + this.DeviceDetailForm.WEBatch.MCValue = batch; this.DeviceDetailForm.WEStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WECurrent.MCValue = current; + this.DeviceDetailForm.WEPressure.MCValue = pressure; + break; case "Weter5": this.DeviceDetailForm.WFMode.MCValue = mode; - this.DeviceDetailForm.WFStatus.MCValue = status; - this.DeviceDetailForm.WFBatch.MCValue = batch; + this.DeviceDetailForm.WFMode.ForeColor = modeColor; + this.DeviceDetailForm.WFStatus.MCValue = status; + this.DeviceDetailForm.WFStatus.ForeColor = statusColor; + this.DeviceDetailForm.WFBatch.MCValue = batch; this.DeviceDetailForm.WFStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WFCurrent.MCValue = current; + this.DeviceDetailForm.WFPressure.MCValue = pressure; + break; case "Weter6": this.DeviceDetailForm.WGMode.MCValue = mode; - this.DeviceDetailForm.WGStatus.MCValue = status; - this.DeviceDetailForm.WGBatch.MCValue = batch; + this.DeviceDetailForm.WGMode.ForeColor = modeColor; + this.DeviceDetailForm.WGStatus.MCValue = status; + this.DeviceDetailForm.WGStatus.ForeColor = statusColor; + this.DeviceDetailForm.WGBatch.MCValue = batch; this.DeviceDetailForm.WGStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WGCurrent.MCValue = current; + this.DeviceDetailForm.WGPressure.MCValue = pressure; + break; case "Weter7": this.DeviceDetailForm.WHMode.MCValue = mode; - this.DeviceDetailForm.WHStatus.MCValue = status; - this.DeviceDetailForm.WHBatch.MCValue = batch; + this.DeviceDetailForm.WHMode.ForeColor = modeColor; + this.DeviceDetailForm.WHStatus.MCValue = status; + this.DeviceDetailForm.WHStatus.ForeColor = statusColor; + this.DeviceDetailForm.WHBatch.MCValue = batch; this.DeviceDetailForm.WHStep.MCValue = step; 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; - break; + this.DeviceDetailForm.WHCurrent.MCValue = current; + this.DeviceDetailForm.WHPressure.MCValue = pressure; + break; case "Gelater0": this.DeviceDetailForm.GAMode.MCValue = mode; - this.DeviceDetailForm.GAStatus.MCValue = status; - this.DeviceDetailForm.GABatch.MCValue = batch; + this.DeviceDetailForm.GAMode.ForeColor = modeColor; + this.DeviceDetailForm.GAStatus.MCValue = status; + this.DeviceDetailForm.GAStatus.ForeColor = statusColor; + this.DeviceDetailForm.GABatch.MCValue = batch; this.DeviceDetailForm.GAStep.MCValue = step; this.DeviceDetailForm.GAStepCode.MCValue = stepName; this.DeviceDetailForm.GATotalTime.MCValue = totalTime; @@ -448,8 +508,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater1": this.DeviceDetailForm.GBMode.MCValue = mode; - this.DeviceDetailForm.GBStatus.MCValue = status; - this.DeviceDetailForm.GBBatch.MCValue = batch; + this.DeviceDetailForm.GBMode.ForeColor = modeColor; + this.DeviceDetailForm.GBStatus.MCValue = status; + this.DeviceDetailForm.GBStatus.ForeColor = statusColor; + this.DeviceDetailForm.GBBatch.MCValue = batch; this.DeviceDetailForm.GBStep.MCValue = step; this.DeviceDetailForm.GBStepCode.MCValue = stepName; this.DeviceDetailForm.GBTotalTime.MCValue = totalTime; @@ -459,8 +521,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater2": this.DeviceDetailForm.GCMode.MCValue = mode; - this.DeviceDetailForm.GCStatus.MCValue = status; - this.DeviceDetailForm.GCBatch.MCValue = batch; + this.DeviceDetailForm.GCMode.ForeColor = modeColor; + this.DeviceDetailForm.GCStatus.MCValue = status; + this.DeviceDetailForm.GCStatus.ForeColor = statusColor; + this.DeviceDetailForm.GCBatch.MCValue = batch; this.DeviceDetailForm.GCStep.MCValue = step; this.DeviceDetailForm.GCStepCode.MCValue = stepName; this.DeviceDetailForm.GCTotalTime.MCValue = totalTime; @@ -470,8 +534,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater3": this.DeviceDetailForm.GDMode.MCValue = mode; - this.DeviceDetailForm.GDStatus.MCValue = status; - this.DeviceDetailForm.GDBatch.MCValue = batch; + this.DeviceDetailForm.GDMode.ForeColor = modeColor; + this.DeviceDetailForm.GDStatus.MCValue = status; + this.DeviceDetailForm.GDStatus.ForeColor = statusColor; + this.DeviceDetailForm.GDBatch.MCValue = batch; this.DeviceDetailForm.GDStep.MCValue = step; this.DeviceDetailForm.GDStepCode.MCValue = stepName; this.DeviceDetailForm.GDTotalTime.MCValue = totalTime; @@ -481,8 +547,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater4": this.DeviceDetailForm.GEMode.MCValue = mode; - this.DeviceDetailForm.GEStatus.MCValue = status; - this.DeviceDetailForm.GEBatch.MCValue = batch; + this.DeviceDetailForm.GEMode.ForeColor = modeColor; + this.DeviceDetailForm.GEStatus.MCValue = status; + this.DeviceDetailForm.GEStatus.ForeColor = statusColor; + this.DeviceDetailForm.GEBatch.MCValue = batch; this.DeviceDetailForm.GEStep.MCValue = step; this.DeviceDetailForm.GEStepCode.MCValue = stepName; this.DeviceDetailForm.GETotalTime.MCValue = totalTime; @@ -492,8 +560,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater5": this.DeviceDetailForm.GFMode.MCValue = mode; - this.DeviceDetailForm.GFStatus.MCValue = status; - this.DeviceDetailForm.GFBatch.MCValue = batch; + this.DeviceDetailForm.GFMode.ForeColor = modeColor; + this.DeviceDetailForm.GFStatus.MCValue = status; + this.DeviceDetailForm.GFStatus.ForeColor = statusColor; + this.DeviceDetailForm.GFBatch.MCValue = batch; this.DeviceDetailForm.GFStep.MCValue = step; this.DeviceDetailForm.GFStepCode.MCValue = stepName; this.DeviceDetailForm.GFTotalTime.MCValue = totalTime; @@ -503,8 +573,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater6": this.DeviceDetailForm.GGMode.MCValue = mode; - this.DeviceDetailForm.GGStatus.MCValue = status; - this.DeviceDetailForm.GGBatch.MCValue = batch; + this.DeviceDetailForm.GGMode.ForeColor = modeColor; + this.DeviceDetailForm.GGStatus.MCValue = status; + this.DeviceDetailForm.GGStatus.ForeColor = statusColor; + this.DeviceDetailForm.GGBatch.MCValue = batch; this.DeviceDetailForm.GGStep.MCValue = step; this.DeviceDetailForm.GGStepCode.MCValue = stepName; this.DeviceDetailForm.GGTotalTime.MCValue = totalTime; @@ -514,8 +586,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; case "Gelater7": this.DeviceDetailForm.GHMode.MCValue = mode; - this.DeviceDetailForm.GHStatus.MCValue = status; - this.DeviceDetailForm.GHBatch.MCValue = batch; + this.DeviceDetailForm.GHMode.ForeColor = modeColor; + this.DeviceDetailForm.GHStatus.MCValue = status; + this.DeviceDetailForm.GHStatus.ForeColor = statusColor; + this.DeviceDetailForm.GHBatch.MCValue = batch; this.DeviceDetailForm.GHStep.MCValue = step; this.DeviceDetailForm.GHStepCode.MCValue = stepName; this.DeviceDetailForm.GHTotalTime.MCValue = totalTime; @@ -525,12 +599,15 @@ namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report break; default: break; } - } - } + #endregion + } + + + } - public IBaseControl StringToLable(string lableName) + public MCLabel StringToLable(string lableName) { - return McControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == lableName).FirstOrDefault().BaseControl; + return McControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == lableName).FirstOrDefault().BaseControl as MCLabel; } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/Entity/DeviceDetail2Entity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/Entity/DeviceDetail2Entity.cs index 84eb969..028e91d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/Entity/DeviceDetail2Entity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/DeviceDetail2Report/Entity/DeviceDetail2Entity.cs @@ -4,192 +4,213 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Mesnac.Controls.Default; + namespace Mesnac.Action.ChemicalWeighing.Report.DeviceDetail2Report.Entity { public class DeviceDetail2Entity { - public IBaseControl DAMode { get; set; } - public IBaseControl DAStatus { get; set; } - public IBaseControl DABatch { get; set; } - public IBaseControl DAStep { get; set; } - public IBaseControl DAStepCode { get; set; } - public IBaseControl DATotalTime { get; set; } - public IBaseControl DAStepTime { get; set; } - public IBaseControl DATemperature { get; set; } - public IBaseControl DASpeed { get; set; } - public IBaseControl DBMode { get; set; } - public IBaseControl DBStatus { get; set; } - public IBaseControl DBBatch { get; set; } - public IBaseControl DBStep { get; set; } - public IBaseControl DBStepCode { get; set; } - public IBaseControl DBTotalTime { get; set; } - public IBaseControl DBStepTime { get; set; } - public IBaseControl DBTemperature { get; set; } - public IBaseControl DBSpeed { get; set; } - public IBaseControl DCMode { get; set; } - public IBaseControl DCStatus { get; set; } - public IBaseControl DCBatch { get; set; } - public IBaseControl DCStep { get; set; } - public IBaseControl DCStepCode { get; set; } - public IBaseControl DCTotalTime { get; set; } - public IBaseControl DCStepTime { get; set; } - public IBaseControl DCTemperature { get; set; } - public IBaseControl DCSpeed { get; set; } - public IBaseControl DDMode { get; set; } - public IBaseControl DDStatus { get; set; } - public IBaseControl DDBatch { get; set; } - public IBaseControl DDStep { get; set; } - public IBaseControl DDStepCode { get; set; } - public IBaseControl DDTotalTime { get; set; } - public IBaseControl DDStepTime { get; set; } - public IBaseControl DDTemperature { get; set; } - public IBaseControl DDSpeed { get; set; } + public MCLabel DAMode { get; set; } + public MCLabel DAStatus { get; set; } + public MCLabel DABatch { get; set; } + public MCLabel DAStep { get; set; } + public MCLabel DAStepCode { get; set; } + public MCLabel DATotalTime { get; set; } + public MCLabel DAStepTime { get; set; } + public MCLabel DATemperature { get; set; } + public MCLabel DASpeed { get; set; } + public MCLabel DBMode { get; set; } + public MCLabel DBStatus { get; set; } + public MCLabel DBBatch { get; set; } + public MCLabel DBStep { get; set; } + public MCLabel DBStepCode { get; set; } + public MCLabel DBTotalTime { get; set; } + public MCLabel DBStepTime { get; set; } + public MCLabel DBTemperature { get; set; } + public MCLabel DBSpeed { get; set; } + public MCLabel DCMode { get; set; } + public MCLabel DCStatus { get; set; } + public MCLabel DCBatch { get; set; } + public MCLabel DCStep { get; set; } + public MCLabel DCStepCode { get; set; } + public MCLabel DCTotalTime { get; set; } + public MCLabel DCStepTime { get; set; } + public MCLabel DCTemperature { get; set; } + public MCLabel DCSpeed { get; set; } + public MCLabel DDMode { get; set; } + public MCLabel DDStatus { get; set; } + public MCLabel DDBatch { get; set; } + public MCLabel DDStep { get; set; } + public MCLabel DDStepCode { get; set; } + public MCLabel DDTotalTime { get; set; } + public MCLabel DDStepTime { get; set; } + public MCLabel DDTemperature { get; set; } + public MCLabel DDSpeed { get; set; } + + public MCLabel WAMode { get; set; } + public MCLabel WAStatus { get; set; } + public MCLabel WABatch { get; set; } + public MCLabel WAStep { get; set; } + public MCLabel WAStepCode { get; set; } + public MCLabel WATotalTime { get; set; } + public MCLabel WAStepTime { get; set; } + public MCLabel WATemperature { get; set; } + public MCLabel WASpeed { get; set; } + public MCLabel WBMode { get; set; } + public MCLabel WBStatus { get; set; } + public MCLabel WBBatch { get; set; } + public MCLabel WBStep { get; set; } + public MCLabel WBStepCode { get; set; } + public MCLabel WBTotalTime { get; set; } + public MCLabel WBStepTime { get; set; } + public MCLabel WBTemperature { get; set; } + public MCLabel WBSpeed { get; set; } + public MCLabel WCMode { get; set; } + public MCLabel WCStatus { get; set; } + public MCLabel WCBatch { get; set; } + public MCLabel WCStep { get; set; } + public MCLabel WCStepCode { get; set; } + public MCLabel WCTotalTime { get; set; } + public MCLabel WCStepTime { get; set; } + public MCLabel WCTemperature { get; set; } + public MCLabel WCSpeed { get; set; } + public MCLabel WDMode { get; set; } + public MCLabel WDStatus { get; set; } + public MCLabel WDBatch { get; set; } + public MCLabel WDStep { get; set; } + public MCLabel WDStepCode { get; set; } + public MCLabel WDTotalTime { get; set; } + public MCLabel WDStepTime { get; set; } + public MCLabel WDTemperature { get; set; } + public MCLabel WDSpeed { get; set; } + public MCLabel WEMode { get; set; } + public MCLabel WEStatus { get; set; } + public MCLabel WEBatch { get; set; } + public MCLabel WEStep { get; set; } + public MCLabel WEStepCode { get; set; } + public MCLabel WETotalTime { get; set; } + public MCLabel WEStepTime { get; set; } + public MCLabel WETemperature { get; set; } + public MCLabel WESpeed { get; set; } + public MCLabel WFMode { get; set; } + public MCLabel WFStatus { get; set; } + public MCLabel WFBatch { get; set; } + public MCLabel WFStep { get; set; } + public MCLabel WFStepCode { get; set; } + public MCLabel WFTotalTime { get; set; } + public MCLabel WFStepTime { get; set; } + public MCLabel WFTemperature { get; set; } + public MCLabel WFSpeed { get; set; } + public MCLabel WGMode { get; set; } + public MCLabel WGStatus { get; set; } + public MCLabel WGBatch { get; set; } + public MCLabel WGStep { get; set; } + public MCLabel WGStepCode { get; set; } + public MCLabel WGTotalTime { get; set; } + public MCLabel WGStepTime { get; set; } + public MCLabel WGTemperature { get; set; } + public MCLabel WGSpeed { get; set; } + public MCLabel WHMode { get; set; } + public MCLabel WHStatus { get; set; } + public MCLabel WHBatch { get; set; } + public MCLabel WHStep { get; set; } + public MCLabel WHStepCode { get; set; } + public MCLabel WHTotalTime { get; set; } + public MCLabel WHStepTime { get; set; } + public MCLabel WHTemperature { get; set; } + public MCLabel WHSpeed { get; set; } + + public MCLabel WACurrent { get; set; } + public MCLabel WAPressure { get; set; } + public MCLabel WBCurrent { get; set; } + public MCLabel WBPressure { get; set; } + public MCLabel WCCurrent { get; set; } + public MCLabel WCPressure { get; set; } + public MCLabel WDCurrent { get; set; } + public MCLabel WDPressure { get; set; } + public MCLabel WECurrent { get; set; } + public MCLabel WEPressure { get; set; } + public MCLabel WFCurrent { get; set; } + public MCLabel WFPressure { get; set; } + public MCLabel WGCurrent { get; set; } + public MCLabel WGPressure { get; set; } + public MCLabel WHCurrent { get; set; } + public MCLabel WHPressure { get; set; } + - public IBaseControl WAMode { get; set; } - public IBaseControl WAStatus { get; set; } - public IBaseControl WABatch { get; set; } - public IBaseControl WAStep { get; set; } - public IBaseControl WAStepCode { get; set; } - public IBaseControl WATotalTime { get; set; } - public IBaseControl WAStepTime { get; set; } - public IBaseControl WATemperature { get; set; } - public IBaseControl WASpeed { get; set; } - public IBaseControl WBMode { get; set; } - public IBaseControl WBStatus { get; set; } - public IBaseControl WBBatch { get; set; } - public IBaseControl WBStep { get; set; } - public IBaseControl WBStepCode { get; set; } - public IBaseControl WBTotalTime { get; set; } - public IBaseControl WBStepTime { get; set; } - public IBaseControl WBTemperature { get; set; } - public IBaseControl WBSpeed { get; set; } - public IBaseControl WCMode { get; set; } - public IBaseControl WCStatus { get; set; } - public IBaseControl WCBatch { get; set; } - public IBaseControl WCStep { get; set; } - public IBaseControl WCStepCode { get; set; } - public IBaseControl WCTotalTime { get; set; } - public IBaseControl WCStepTime { get; set; } - public IBaseControl WCTemperature { get; set; } - public IBaseControl WCSpeed { get; set; } - public IBaseControl WDMode { get; set; } - public IBaseControl WDStatus { get; set; } - public IBaseControl WDBatch { get; set; } - public IBaseControl WDStep { get; set; } - public IBaseControl WDStepCode { get; set; } - public IBaseControl WDTotalTime { get; set; } - public IBaseControl WDStepTime { get; set; } - public IBaseControl WDTemperature { get; set; } - public IBaseControl WDSpeed { get; set; } - public IBaseControl WEMode { get; set; } - public IBaseControl WEStatus { get; set; } - public IBaseControl WEBatch { get; set; } - public IBaseControl WEStep { get; set; } - public IBaseControl WEStepCode { get; set; } - public IBaseControl WETotalTime { get; set; } - public IBaseControl WEStepTime { get; set; } - public IBaseControl WETemperature { get; set; } - public IBaseControl WESpeed { get; set; } - public IBaseControl WFMode { get; set; } - public IBaseControl WFStatus { get; set; } - public IBaseControl WFBatch { get; set; } - public IBaseControl WFStep { get; set; } - public IBaseControl WFStepCode { get; set; } - public IBaseControl WFTotalTime { get; set; } - public IBaseControl WFStepTime { get; set; } - public IBaseControl WFTemperature { get; set; } - public IBaseControl WFSpeed { get; set; } - public IBaseControl WGMode { get; set; } - public IBaseControl WGStatus { get; set; } - public IBaseControl WGBatch { get; set; } - public IBaseControl WGStep { get; set; } - public IBaseControl WGStepCode { get; set; } - public IBaseControl WGTotalTime { get; set; } - public IBaseControl WGStepTime { get; set; } - public IBaseControl WGTemperature { get; set; } - public IBaseControl WGSpeed { get; set; } - public IBaseControl WHMode { get; set; } - public IBaseControl WHStatus { get; set; } - public IBaseControl WHBatch { get; set; } - public IBaseControl WHStep { get; set; } - public IBaseControl WHStepCode { get; set; } - public IBaseControl WHTotalTime { get; set; } - public IBaseControl WHStepTime { get; set; } - public IBaseControl WHTemperature { get; set; } - public IBaseControl WHSpeed { get; set; } - public IBaseControl GAMode { get; set; } - public IBaseControl GAStatus { get; set; } - public IBaseControl GABatch { get; set; } - public IBaseControl GAStep { get; set; } - public IBaseControl GAStepCode { get; set; } - public IBaseControl GATotalTime { get; set; } - public IBaseControl GAStepTime { get; set; } - public IBaseControl GATemperature { get; set; } - public IBaseControl GASpeed { get; set; } - public IBaseControl GBMode { get; set; } - public IBaseControl GBStatus { get; set; } - public IBaseControl GBBatch { get; set; } - public IBaseControl GBStep { get; set; } - public IBaseControl GBStepCode { get; set; } - public IBaseControl GBTotalTime { get; set; } - public IBaseControl GBStepTime { get; set; } - public IBaseControl GBTemperature { get; set; } - public IBaseControl GBSpeed { get; set; } - public IBaseControl GCMode { get; set; } - public IBaseControl GCStatus { get; set; } - public IBaseControl GCBatch { get; set; } - public IBaseControl GCStep { get; set; } - public IBaseControl GCStepCode { get; set; } - public IBaseControl GCTotalTime { get; set; } - public IBaseControl GCStepTime { get; set; } - public IBaseControl GCTemperature { get; set; } - public IBaseControl GCSpeed { get; set; } - public IBaseControl GDMode { get; set; } - public IBaseControl GDStatus { get; set; } - public IBaseControl GDBatch { get; set; } - public IBaseControl GDStep { get; set; } - public IBaseControl GDStepCode { get; set; } - public IBaseControl GDTotalTime { get; set; } - public IBaseControl GDStepTime { get; set; } - public IBaseControl GDTemperature { get; set; } - public IBaseControl GDSpeed { get; set; } - public IBaseControl GEMode { get; set; } - public IBaseControl GEStatus { get; set; } - public IBaseControl GEBatch { get; set; } - public IBaseControl GEStep { get; set; } - public IBaseControl GEStepCode { get; set; } - public IBaseControl GETotalTime { get; set; } - public IBaseControl GEStepTime { get; set; } - public IBaseControl GETemperature { get; set; } - public IBaseControl GESpeed { get; set; } - public IBaseControl GFMode { get; set; } - public IBaseControl GFStatus { get; set; } - public IBaseControl GFBatch { get; set; } - public IBaseControl GFStep { get; set; } - public IBaseControl GFStepCode { get; set; } - public IBaseControl GFTotalTime { get; set; } - public IBaseControl GFStepTime { get; set; } - public IBaseControl GFTemperature { get; set; } - public IBaseControl GFSpeed { get; set; } - public IBaseControl GGMode { get; set; } - public IBaseControl GGStatus { get; set; } - public IBaseControl GGBatch { get; set; } - public IBaseControl GGStep { get; set; } - public IBaseControl GGStepCode { get; set; } - public IBaseControl GGTotalTime { get; set; } - public IBaseControl GGStepTime { get; set; } - public IBaseControl GGTemperature { get; set; } - public IBaseControl GGSpeed { get; set; } - public IBaseControl GHMode { get; set; } - public IBaseControl GHStatus { get; set; } - public IBaseControl GHBatch { get; set; } - public IBaseControl GHStep { get; set; } - public IBaseControl GHStepCode { get; set; } - public IBaseControl GHTotalTime { get; set; } - public IBaseControl GHStepTime { get; set; } - public IBaseControl GHTemperature { get; set; } - public IBaseControl GHSpeed { get; set; } + public MCLabel GAMode { get; set; } + public MCLabel GAStatus { get; set; } + public MCLabel GABatch { get; set; } + public MCLabel GAStep { get; set; } + public MCLabel GAStepCode { get; set; } + public MCLabel GATotalTime { get; set; } + public MCLabel GAStepTime { get; set; } + public MCLabel GATemperature { get; set; } + public MCLabel GASpeed { get; set; } + public MCLabel GBMode { get; set; } + public MCLabel GBStatus { get; set; } + public MCLabel GBBatch { get; set; } + public MCLabel GBStep { get; set; } + public MCLabel GBStepCode { get; set; } + public MCLabel GBTotalTime { get; set; } + public MCLabel GBStepTime { get; set; } + public MCLabel GBTemperature { get; set; } + public MCLabel GBSpeed { get; set; } + public MCLabel GCMode { get; set; } + public MCLabel GCStatus { get; set; } + public MCLabel GCBatch { get; set; } + public MCLabel GCStep { get; set; } + public MCLabel GCStepCode { get; set; } + public MCLabel GCTotalTime { get; set; } + public MCLabel GCStepTime { get; set; } + public MCLabel GCTemperature { get; set; } + public MCLabel GCSpeed { get; set; } + public MCLabel GDMode { get; set; } + public MCLabel GDStatus { get; set; } + public MCLabel GDBatch { get; set; } + public MCLabel GDStep { get; set; } + public MCLabel GDStepCode { get; set; } + public MCLabel GDTotalTime { get; set; } + public MCLabel GDStepTime { get; set; } + public MCLabel GDTemperature { get; set; } + public MCLabel GDSpeed { get; set; } + public MCLabel GEMode { get; set; } + public MCLabel GEStatus { get; set; } + public MCLabel GEBatch { get; set; } + public MCLabel GEStep { get; set; } + public MCLabel GEStepCode { get; set; } + public MCLabel GETotalTime { get; set; } + public MCLabel GEStepTime { get; set; } + public MCLabel GETemperature { get; set; } + public MCLabel GESpeed { get; set; } + public MCLabel GFMode { get; set; } + public MCLabel GFStatus { get; set; } + public MCLabel GFBatch { get; set; } + public MCLabel GFStep { get; set; } + public MCLabel GFStepCode { get; set; } + public MCLabel GFTotalTime { get; set; } + public MCLabel GFStepTime { get; set; } + public MCLabel GFTemperature { get; set; } + public MCLabel GFSpeed { get; set; } + public MCLabel GGMode { get; set; } + public MCLabel GGStatus { get; set; } + public MCLabel GGBatch { get; set; } + public MCLabel GGStep { get; set; } + public MCLabel GGStepCode { get; set; } + public MCLabel GGTotalTime { get; set; } + public MCLabel GGStepTime { get; set; } + public MCLabel GGTemperature { get; set; } + public MCLabel GGSpeed { get; set; } + public MCLabel GHMode { get; set; } + public MCLabel GHStatus { get; set; } + public MCLabel GHBatch { get; set; } + public MCLabel GHStep { get; set; } + public MCLabel GHStepCode { get; set; } + public MCLabel GHTotalTime { get; set; } + public MCLabel GHStepTime { get; set; } + public MCLabel GHTemperature { get; set; } + public MCLabel GHSpeed { get; set; } } } diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index 6417dfa..c8e36d3 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -3958,7 +3958,7 @@ - + @@ -5289,6 +5289,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5835,336 +5941,336 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml index d5faccc..dbc202b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml @@ -1,6 +1,270 @@ + + + 1790, 494 + SwitchLight65 + 12, 12 + + + + 1816, 494 + SwitchLight66 + 12, 12 + + + + 1707, 494 + SwitchLight63 + 12, 12 + + + + 1733, 494 + SwitchLight64 + 12, 12 + + + + 1477, 494 + SwitchLight61 + 12, 12 + + + + 1503, 494 + SwitchLight62 + 12, 12 + + + + 1394, 494 + SwitchLight59 + 12, 12 + + + + 1420, 494 + SwitchLight60 + 12, 12 + + + + 1236, 496 + SwitchLight57 + 12, 12 + + + + 1262, 496 + SwitchLight58 + 12, 12 + + + + 1152, 496 + SwitchLight55 + 12, 12 + + + + 1178, 496 + SwitchLight56 + 12, 12 + + + + 930, 496 + SwitchLight53 + 12, 12 + + + + 956, 496 + SwitchLight54 + 12, 12 + + + + 846, 496 + SwitchLight52 + 12, 12 + + + + 872, 496 + SwitchLight51 + 12, 12 + + + ParametersWithPc.DB2102-valveInitDB.BU2GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU2GEB02_Set + 996, 394 + LjSwith216 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU3GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU3GEB02_Set + 1117, 394 + LjSwith217 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU4GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU4GEB02_Set + 1306, 394 + LjSwith218 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU5GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU5GEB02_Set + 1358, 394 + LjSwith219 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU6GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU6GEB02_Set + 1547, 395 + LjSwith220 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU7GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU7GEB02_Set + 1671, 394 + LjSwith221 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU8GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU8GEB02_Set + 1860, 394 + LjSwith222 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU1GEB02_Alarm + ParametersWithPc.DB2102-valveInitDB.BU1GEB02_Set + 807, 394 + LjSwith223 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter2_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter2_Alarm + 939, 559 + LjSwith224 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter3_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter3_Alarm + 1170, 559 + LjSwith225 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter4_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter4_Alarm + 1246, 559 + LjSwith226 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter5_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter5_Alarm + 1411, 559 + LjSwith227 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter6_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter6_Alarm + 1485, 559 + LjSwith228 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter7_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter7_Alarm + 1724, 559 + LjSwith229 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter8_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter8_Alarm + 1801, 559 + LjSwith230 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Alarm + 838, 455 + LjSwith231 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Alarm + 967, 455 + LjSwith232 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Alarm + 1514, 455 + LjSwith233 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Alarm + 1703, 455 + LjSwith234 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Alarm + 1827, 455 + LjSwith235 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BUWeter1_Set + ParametersWithPc.DB2102-valveInitDB.BUWeter1_Alarm + 861, 559 + LjSwith236 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Alarm + 1393, 455 + LjSwith237 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Alarm + 1269, 455 + LjSwith238 + 14, 13 + + + ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Set + ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Alarm + 1148, 455 + LjSwith239 + 14, 13 + False @@ -3183,6 +3447,402 @@ 611, 334 + + + + Red + DarkGray + WHPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 297 + MCLabel935 + 11, 12 + + + + + Red + DarkGray + WHCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 297 + MCLabel936 + 11, 12 + + + + + Red + DarkGray + WGPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 267 + MCLabel937 + 11, 12 + + + + + Red + DarkGray + WGCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 267 + MCLabel938 + 11, 12 + + + + + Red + DarkGray + WFPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 237 + MCLabel939 + 11, 12 + + + + + Red + DarkGray + WFCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 237 + MCLabel940 + 11, 12 + + + + + Red + DarkGray + WEPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 207 + MCLabel941 + 11, 12 + + + + + Red + DarkGray + WECurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 207 + MCLabel942 + 11, 12 + + + + + Red + DarkGray + WDPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 177 + MCLabel943 + 11, 12 + + + + + Red + DarkGray + WDCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 177 + MCLabel944 + 11, 12 + + + + + Red + DarkGray + WCPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 147 + MCLabel945 + 11, 12 + + + + + Red + DarkGray + WCCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 147 + MCLabel946 + 11, 12 + + + + + Red + DarkGray + WBPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 117 + MCLabel947 + 11, 12 + + + + + Red + DarkGray + WBCurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 117 + MCLabel948 + 11, 12 + + + + + Red + DarkGray + WAPressure + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 552, 87 + MCLabel949 + 11, 12 + + + + + Red + DarkGray + WACurrent + + False + + + + InitData + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 519, 87 + MCLabel950 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 545, 55 + MCLabel933 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 重量 + Transparent + ButtonHighlight + 516, 55 + MCLabel934 + 29, 12 + @@ -3223,7 +3883,7 @@ 0 Transparent ButtonHighlight - 543, 297 + 488, 297 MCLabel823 11, 12 @@ -3245,7 +3905,7 @@ 0 Transparent ButtonHighlight - 488, 297 + 455, 297 MCLabel824 11, 12 @@ -3267,7 +3927,7 @@ 0 Transparent ButtonHighlight - 430, 297 + 403, 297 MCLabel825 11, 12 @@ -3289,7 +3949,7 @@ 0 Transparent ButtonHighlight - 375, 297 + 355, 297 MCLabel826 11, 12 @@ -3311,7 +3971,7 @@ 0 Transparent ButtonHighlight - 317, 297 + 297, 297 MCLabel827 11, 12 @@ -3333,7 +3993,7 @@ 0 Transparent ButtonHighlight - 261, 297 + 241, 297 MCLabel828 11, 12 @@ -3355,7 +4015,7 @@ 0 Transparent ButtonHighlight - 206, 297 + 186, 297 MCLabel829 11, 12 @@ -3421,7 +4081,7 @@ 0 Transparent ButtonHighlight - 543, 267 + 488, 267 MCLabel832 11, 12 @@ -3443,7 +4103,7 @@ 0 Transparent ButtonHighlight - 488, 267 + 455, 267 MCLabel833 11, 12 @@ -3465,7 +4125,7 @@ 0 Transparent ButtonHighlight - 430, 267 + 403, 267 MCLabel834 11, 12 @@ -3487,7 +4147,7 @@ 0 Transparent ButtonHighlight - 375, 267 + 355, 267 MCLabel835 11, 12 @@ -3509,7 +4169,7 @@ 0 Transparent ButtonHighlight - 317, 267 + 297, 267 MCLabel836 11, 12 @@ -3531,7 +4191,7 @@ 0 Transparent ButtonHighlight - 261, 267 + 241, 267 MCLabel837 11, 12 @@ -3553,7 +4213,7 @@ 0 Transparent ButtonHighlight - 206, 267 + 186, 267 MCLabel838 11, 12 @@ -3619,7 +4279,7 @@ 0 Transparent ButtonHighlight - 543, 237 + 488, 237 MCLabel841 11, 12 @@ -3641,7 +4301,7 @@ 0 Transparent ButtonHighlight - 488, 237 + 455, 237 MCLabel842 11, 12 @@ -3663,7 +4323,7 @@ 0 Transparent ButtonHighlight - 430, 237 + 403, 237 MCLabel843 11, 12 @@ -3685,7 +4345,7 @@ 0 Transparent ButtonHighlight - 375, 237 + 355, 237 MCLabel844 11, 12 @@ -3707,7 +4367,7 @@ 0 Transparent ButtonHighlight - 317, 237 + 297, 237 MCLabel845 11, 12 @@ -3729,7 +4389,7 @@ 0 Transparent ButtonHighlight - 261, 237 + 241, 237 MCLabel846 11, 12 @@ -3751,7 +4411,7 @@ 0 Transparent ButtonHighlight - 206, 237 + 186, 237 MCLabel847 11, 12 @@ -3817,7 +4477,7 @@ 0 Transparent ButtonHighlight - 543, 207 + 488, 207 MCLabel850 11, 12 @@ -3839,7 +4499,7 @@ 0 Transparent ButtonHighlight - 488, 207 + 455, 207 MCLabel851 11, 12 @@ -3861,7 +4521,7 @@ 0 Transparent ButtonHighlight - 430, 207 + 403, 207 MCLabel852 11, 12 @@ -3883,7 +4543,7 @@ 0 Transparent ButtonHighlight - 375, 207 + 355, 207 MCLabel853 11, 12 @@ -3905,7 +4565,7 @@ 0 Transparent ButtonHighlight - 317, 207 + 297, 207 MCLabel854 11, 12 @@ -3927,7 +4587,7 @@ 0 Transparent ButtonHighlight - 261, 207 + 241, 207 MCLabel855 11, 12 @@ -3949,7 +4609,7 @@ 0 Transparent ButtonHighlight - 206, 207 + 186, 207 MCLabel856 11, 12 @@ -4015,7 +4675,7 @@ 0 Transparent ButtonHighlight - 543, 177 + 488, 177 MCLabel787 11, 12 @@ -4037,7 +4697,7 @@ 0 Transparent ButtonHighlight - 488, 177 + 455, 177 MCLabel788 11, 12 @@ -4059,7 +4719,7 @@ 0 Transparent ButtonHighlight - 430, 177 + 403, 177 MCLabel789 11, 12 @@ -4081,7 +4741,7 @@ 0 Transparent ButtonHighlight - 375, 177 + 355, 177 MCLabel790 11, 12 @@ -4103,7 +4763,7 @@ 0 Transparent ButtonHighlight - 317, 177 + 297, 177 MCLabel791 11, 12 @@ -4125,7 +4785,7 @@ 0 Transparent ButtonHighlight - 261, 177 + 241, 177 MCLabel792 11, 12 @@ -4147,7 +4807,7 @@ 0 Transparent ButtonHighlight - 206, 177 + 186, 177 MCLabel793 11, 12 @@ -4213,7 +4873,7 @@ 0 Transparent ButtonHighlight - 543, 147 + 488, 147 MCLabel796 11, 12 @@ -4235,7 +4895,7 @@ 0 Transparent ButtonHighlight - 488, 147 + 455, 147 MCLabel797 11, 12 @@ -4257,7 +4917,7 @@ 0 Transparent ButtonHighlight - 430, 147 + 403, 147 MCLabel798 11, 12 @@ -4279,7 +4939,7 @@ 0 Transparent ButtonHighlight - 375, 147 + 355, 147 MCLabel799 11, 12 @@ -4301,7 +4961,7 @@ 0 Transparent ButtonHighlight - 317, 147 + 297, 147 MCLabel800 11, 12 @@ -4323,7 +4983,7 @@ 0 Transparent ButtonHighlight - 261, 147 + 241, 147 MCLabel801 11, 12 @@ -4345,7 +5005,7 @@ 0 Transparent ButtonHighlight - 206, 147 + 186, 147 MCLabel802 11, 12 @@ -4411,7 +5071,7 @@ 0 Transparent ButtonHighlight - 543, 117 + 488, 117 MCLabel805 11, 12 @@ -4433,7 +5093,7 @@ 0 Transparent ButtonHighlight - 488, 117 + 455, 117 MCLabel806 11, 12 @@ -4455,7 +5115,7 @@ 0 Transparent ButtonHighlight - 430, 117 + 403, 117 MCLabel807 11, 12 @@ -4477,7 +5137,7 @@ 0 Transparent ButtonHighlight - 375, 117 + 355, 117 MCLabel808 11, 12 @@ -4499,7 +5159,7 @@ 0 Transparent ButtonHighlight - 317, 117 + 297, 117 MCLabel809 11, 12 @@ -4521,7 +5181,7 @@ 0 Transparent ButtonHighlight - 261, 117 + 241, 117 MCLabel810 11, 12 @@ -4543,7 +5203,7 @@ 0 Transparent ButtonHighlight - 206, 117 + 186, 117 MCLabel811 11, 12 @@ -4609,7 +5269,7 @@ 0 Transparent ButtonHighlight - 543, 87 + 488, 87 MCLabel814 11, 12 @@ -4631,7 +5291,7 @@ 0 Transparent ButtonHighlight - 488, 87 + 455, 87 MCLabel815 11, 12 @@ -4653,7 +5313,7 @@ 0 Transparent ButtonHighlight - 430, 87 + 403, 87 MCLabel816 11, 12 @@ -4675,7 +5335,7 @@ 0 Transparent ButtonHighlight - 375, 87 + 355, 87 MCLabel817 11, 12 @@ -4697,7 +5357,7 @@ 0 Transparent ButtonHighlight - 317, 87 + 297, 87 MCLabel818 11, 12 @@ -4719,7 +5379,7 @@ 0 Transparent ButtonHighlight - 261, 87 + 241, 87 MCLabel819 11, 12 @@ -4741,7 +5401,7 @@ 0 Transparent ButtonHighlight - 206, 87 + 186, 87 MCLabel820 11, 12 @@ -4982,7 +5642,7 @@ 速度 Transparent ButtonHighlight - 541, 55 + 486, 55 MCLabel220 29, 12 @@ -5004,7 +5664,7 @@ 温度 Transparent ButtonHighlight - 489, 55 + 455, 55 MCLabel221 29, 12 @@ -5026,7 +5686,7 @@ 分步时间 Transparent ButtonHighlight - 430, 55 + 400, 55 MCLabel222 53, 12 @@ -5048,7 +5708,7 @@ 总时间 Transparent ButtonHighlight - 375, 55 + 358, 55 MCLabel223 41, 12 @@ -5070,7 +5730,7 @@ 动作名称 Transparent ButtonHighlight - 318, 55 + 301, 55 MCLabel224 53, 12 @@ -5092,7 +5752,7 @@ 当前步序 Transparent ButtonHighlight - 259, 55 + 242, 55 MCLabel225 53, 12 @@ -5161,7 +5821,7 @@ 当前批次 Transparent ButtonHighlight - 200, 55 + 183, 55 MCLabel228 53, 12 @@ -5193,7 +5853,7 @@ - ParametersWithPc.B1.SpeedG2 + ParametersWithPc.DB2103-motorInitDB.DM2GEM_ACT_Speed Red DarkGray @@ -5213,7 +5873,7 @@ - ParametersWithPc.B1.SpeedG3 + ParametersWithPc.DB2103-motorInitDB.DM3GEM_ACT_Speed Red DarkGray @@ -5233,7 +5893,7 @@ - ParametersWithPc.B1.SpeedG4 + ParametersWithPc.DB2103-motorInitDB.DM4GEM_ACT_Speed Red DarkGray @@ -5253,7 +5913,7 @@ - ParametersWithPc.B1.SpeedG5 + ParametersWithPc.DB2103-motorInitDB.DM5GEM_ACT_Speed Red DarkGray @@ -5273,7 +5933,7 @@ - ParametersWithPc.B1.SpeedG6 + ParametersWithPc.DB2103-motorInitDB.DM6GEM_ACT_Speed Red DarkGray @@ -5293,7 +5953,7 @@ - ParametersWithPc.B1.SpeedG7 + ParametersWithPc.DB2103-motorInitDB.DM7GEM_ACT_Speed Red DarkGray @@ -5313,7 +5973,7 @@ - ParametersWithPc.B1.SpeedG8 + ParametersWithPc.DB2103-motorInitDB.DM8GEM_ACT_Speed Red DarkGray @@ -5333,7 +5993,7 @@ - ParametersWithPc.B1.SpeedG1 + ParametersWithPc.DB2103-motorInitDB.DM1GEM_ACT_Speed Red DarkGray @@ -5653,7 +6313,7 @@ - ParametersWithPc.B1.SpeedD1 + ParametersWithPc.DB2103-motorInitDB.DM1DRY1_ACT_Speed Red DarkGray @@ -5673,7 +6333,7 @@ - ParametersWithPc.B1.SpeedD2 + ParametersWithPc.DB2103-motorInitDB.DM1DRY2_ACT_Speed Red DarkGray @@ -5693,7 +6353,7 @@ - ParametersWithPc.B1.SpeedD3 + ParametersWithPc.DB2103-motorInitDB.DM1DRY3_ACT_Speed Red DarkGray @@ -5713,7 +6373,7 @@ - ParametersWithPc.B1.SpeedD4 + ParametersWithPc.DB2103-motorInitDB.DM1DRY4_ACT_Speed Red DarkGray @@ -5900,7 +6560,7 @@ ParametersWithPc.DB2103-motorInitDB.DM2BSF01_Running - ylMove + ylNormal 1183, 447 LSCREWBIG11 31, 15 @@ -5914,7 +6574,7 @@ ParametersWithPc.DB2103-motorInitDB.DM2CSF01_Running - ylMove + ylNormal 1423, 447 LSCREWBIG10 31, 15 @@ -5928,7 +6588,7 @@ ParametersWithPc.DB2103-motorInitDB.DM2DSF01_Running - ylMove + ylNormal 1737, 447 LSCREWBIG9 31, 15 @@ -5942,14 +6602,14 @@ ParametersWithPc.DB2103-motorInitDB.DM2ASF01_Running - ylMove + ylNormal 876, 447 LSCREWBIG8 31, 15 - ParametersWithPc.DB2103-motorInitDB.DM1DRM01_Run + ParametersWithPc.DB2103-motorInitDB.DM1DRY1_Running zsTurnOff 933, 322 Fan29 @@ -5957,7 +6617,7 @@ - ParametersWithPc.DB2103-motorInitDB.DM2DRM01_Run + ParametersWithPc.DB2103-motorInitDB.DM1DRY2_Running zsTurnOff 1243, 325 Fan28 @@ -5965,7 +6625,7 @@ - ParametersWithPc.DB2103-motorInitDB.DM3DRM01_Run + ParametersWithPc.DB2103-motorInitDB.DM1DRY3_Running zsTurnOff 1485, 322 Fan27 @@ -5973,7 +6633,7 @@ - ParametersWithPc.DB2103-motorInitDB.DM4DRM01_Run + ParametersWithPc.DB2103-motorInitDB.DM1DRY4_Running zsTurnOff 1798, 321 Fan26 @@ -7390,7 +8050,7 @@ ParametersWithPc.B1.AS4GET02 TurnOff - 1281, 381 + 1270, 381 Jzf113 13, 11 @@ -7439,14 +8099,14 @@ ParametersWithPc.B1.AS8GET01 TurnOff - 1823, 380 + 1836, 380 Jzf106 13, 11 ParametersWithPc.B1.AS8GET02 TurnOff - 1836, 380 + 1824, 380 Jzf105 13, 11 @@ -7495,7 +8155,7 @@ ParametersWithPc.B1.AS4GET01 TurnOff - 1269, 381 + 1284, 381 Jzf98 13, 11 @@ -7941,7 +8601,7 @@ True MiddleCenter Lime - 1833, 358 + 1840, 357 SpecialLabelBlue357 1, 50 @@ -7977,7 +8637,7 @@ True MiddleCenter Yellow - 1840, 368 + 1833, 368 SpecialLabelBlue355 1, 40 @@ -8822,7 +9482,7 @@ 13, 11 - ParametersWithPc.B1.AS3OIS03 + ParametersWithPc.B1.AS1OIS03 TurnOff 1087, 220 Jzf53 @@ -10164,7 +10824,7 @@ Yellow 1393, 368 SpecialLabelBlue506 - 448, 1 + 441, 1 0 @@ -10245,7 +10905,7 @@ Lime 1384, 357 SpecialLabelBlue502 - 450, 1 + 457, 1