diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs index f78ff25..62255c9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs @@ -4,6 +4,7 @@ using System.Data; using System.Linq; using System.Windows.Forms; using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; using Mesnac.Action.ChemicalWeighing.LjPressure; namespace Mesnac.Action.ChemicalWeighing.LjMetage @@ -67,6 +68,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage } MetagePlc.DownToPlc(lsView); + + + foreach (var v in lsView) + { + string sql = $"update MetageSetting set HighSpeed={v.HighSpeed},LowSpeed={v.LowSpeed},WeightSlow={v.WeightSlow},Precut={v.Precut},JogTime={v.JogTime} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); + } + + //string sql = + + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs index f10f751..dde4c35 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs @@ -43,36 +43,36 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage this.WeightSlow = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.Precut = new System.Windows.Forms.TextBox(); - this.JogTime = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); + this.dong = new System.Windows.Forms.Label(); + this.JogTime = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // HighSpeed // - this.HighSpeed.Location = new System.Drawing.Point(129, 32); - this.HighSpeed.Margin = new System.Windows.Forms.Padding(5); + this.HighSpeed.Location = new System.Drawing.Point(194, 48); + this.HighSpeed.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.HighSpeed.MaxLength = 100; this.HighSpeed.Name = "HighSpeed"; - this.HighSpeed.Size = new System.Drawing.Size(148, 21); + this.HighSpeed.Size = new System.Drawing.Size(220, 28); this.HighSpeed.TabIndex = 58; // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(179, 205); - this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Location = new System.Drawing.Point(268, 308); + this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.Size = new System.Drawing.Size(147, 68); this.btnCancel.TabIndex = 56; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(38, 205); - this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Location = new System.Drawing.Point(57, 308); + this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.Size = new System.Drawing.Size(147, 68); this.btnOK.TabIndex = 55; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -81,98 +81,98 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(36, 35); - this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Location = new System.Drawing.Point(54, 52); + this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(83, 12); + this.label3.Size = new System.Drawing.Size(125, 18); this.label3.TabIndex = 54; this.label3.Text = "高速称量速度:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(36, 66); - this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Location = new System.Drawing.Point(54, 99); + this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(83, 12); + this.label1.Size = new System.Drawing.Size(125, 18); this.label1.TabIndex = 54; this.label1.Text = "慢速称量速度:"; // // LowSpeed // - this.LowSpeed.Location = new System.Drawing.Point(129, 63); - this.LowSpeed.Margin = new System.Windows.Forms.Padding(5); + this.LowSpeed.Location = new System.Drawing.Point(194, 94); + this.LowSpeed.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.LowSpeed.MaxLength = 100; this.LowSpeed.Name = "LowSpeed"; - this.LowSpeed.Size = new System.Drawing.Size(148, 21); + this.LowSpeed.Size = new System.Drawing.Size(220, 28); this.LowSpeed.TabIndex = 58; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(72, 97); - this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label2.Location = new System.Drawing.Point(108, 146); + this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 12); + this.label2.Size = new System.Drawing.Size(71, 18); this.label2.TabIndex = 54; this.label2.Text = "慢称值:"; // // WeightSlow // - this.WeightSlow.Location = new System.Drawing.Point(129, 94); - this.WeightSlow.Margin = new System.Windows.Forms.Padding(5); + this.WeightSlow.Location = new System.Drawing.Point(194, 141); + this.WeightSlow.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.WeightSlow.MaxLength = 100; this.WeightSlow.Name = "WeightSlow"; - this.WeightSlow.Size = new System.Drawing.Size(148, 21); + this.WeightSlow.Size = new System.Drawing.Size(220, 28); this.WeightSlow.TabIndex = 58; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(72, 128); - this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Location = new System.Drawing.Point(108, 192); + this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(47, 12); + this.label4.Size = new System.Drawing.Size(71, 18); this.label4.TabIndex = 54; this.label4.Text = "提前量:"; // // Precut // - this.Precut.Location = new System.Drawing.Point(129, 125); - this.Precut.Margin = new System.Windows.Forms.Padding(5); + this.Precut.Location = new System.Drawing.Point(194, 188); + this.Precut.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.Precut.MaxLength = 100; this.Precut.Name = "Precut"; - this.Precut.Size = new System.Drawing.Size(148, 21); + this.Precut.Size = new System.Drawing.Size(220, 28); this.Precut.TabIndex = 58; // - // JogTime + // dong // - this.JogTime.AutoSize = true; - this.JogTime.Location = new System.Drawing.Point(72, 159); - this.JogTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.JogTime.Name = "JogTime"; - this.JogTime.Size = new System.Drawing.Size(47, 12); - this.JogTime.TabIndex = 54; - this.JogTime.Text = "点动值:"; + this.dong.AutoSize = true; + this.dong.Location = new System.Drawing.Point(108, 238); + this.dong.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.dong.Name = "dong"; + this.dong.Size = new System.Drawing.Size(71, 18); + this.dong.TabIndex = 54; + this.dong.Text = "点动值:"; // - // textBox4 + // JogTime // - this.textBox4.Location = new System.Drawing.Point(129, 156); - this.textBox4.Margin = new System.Windows.Forms.Padding(5); - this.textBox4.MaxLength = 100; - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(148, 21); - this.textBox4.TabIndex = 58; + this.JogTime.Location = new System.Drawing.Point(194, 234); + this.JogTime.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.JogTime.MaxLength = 100; + this.JogTime.Name = "JogTime"; + this.JogTime.Size = new System.Drawing.Size(220, 28); + this.JogTime.TabIndex = 58; // // FrmMetage // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(319, 280); - this.Controls.Add(this.textBox4); + this.ClientSize = new System.Drawing.Size(478, 420); + this.Controls.Add(this.JogTime); this.Controls.Add(this.Precut); this.Controls.Add(this.WeightSlow); - this.Controls.Add(this.JogTime); + this.Controls.Add(this.dong); this.Controls.Add(this.LowSpeed); this.Controls.Add(this.label4); this.Controls.Add(this.HighSpeed); @@ -181,6 +181,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage this.Controls.Add(this.label1); this.Controls.Add(this.btnOK); this.Controls.Add(this.label3); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmMetage"; this.Text = "FrmMetage"; this.ResumeLayout(false); @@ -194,8 +195,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage private System.Windows.Forms.TextBox WeightSlow; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox Precut; - private System.Windows.Forms.Label JogTime; - private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label dong; + private System.Windows.Forms.TextBox JogTime; private System.Windows.Forms.TextBox HighSpeed; private System.Windows.Forms.Button btnCancel; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs index b5023c0..e2375ba 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs @@ -1,4 +1,6 @@ -using System; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +using System; using System.Collections.Generic; using System.Windows.Forms; @@ -92,6 +94,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage }; MetagePlc.DownToPlc(new List() { view }); + + string sql = $"update MetageSetting set HighSpeed={view.HighSpeed},LowSpeed={view.LowSpeed},WeightSlow={view.WeightSlow},Precut={view.Precut},JogTime={view.JogTime} where Id={view.Id}"; + DBHelp.ExecuteNonQuery(sql); + this.DialogResult = System.Windows.Forms.DialogResult.OK; } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.cs index 8abece2..af9089e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/FrmMixC.cs @@ -67,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager LjMixManagerDb.UpdateMixC(_view); List recipeSteps = new List(); - recipeSteps=LjMixManagerDb.GetMixStep( _view.MixBId); + // 第一台干混机 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs index 2971cd9..bda372a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs @@ -310,33 +310,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager } - public static List GetMixStep(string metageId) - { - string sql = - $" select Id, MixId, ActionId, ActionName, SecondTime, Temperature, Speed, Weight, Difference, Remark " - + $" from lj_mix_detail where MixId='{metageId}'"; - - var table = GetTable(sql); - - List list = new List(); - foreach (DataRow tableRow in table.Rows) - { - MixStep step = new MixStep(); - //代码 - step.MixCode = Convert.ToInt32(tableRow["ActionId"]); - //时间 - step.MixTime = Convert.ToInt32(tableRow["SecondTime"]); - //温度 - step.MixTemp = Convert.ToInt32(tableRow["SecondTime"]); - //速度 - step.MixSpeed = Convert.ToInt32(tableRow["SecondTime"]); - - step.SetValue = Convert.ToSingle(tableRow["Weight"]); - step.Tolerance = Convert.ToSingle(tableRow["Difference"]); - list.Add(step); - } - - return list; - } + } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/RecipePlcView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/RecipePlcView.cs index a7d01aa..032d864 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/RecipePlcView.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/RecipePlcView.cs @@ -26,6 +26,6 @@ /// /// 设定公差 /// - public float Tolerance { get; set; } + public float SetTolerance { get; set; } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs index 7697d04..0032f58 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using DevExpress.Office.Utils; using DevExpress.XtraRichEdit.Import.OpenXml; using Mesnac.Action.Base; @@ -21,6 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private DbMCControl _materialGridControl = null; //物料列表控件 private RuntimeParameter _runtime; + public static event EventHandler OnDown; public void Run(RuntimeParameter runtime) { @@ -47,6 +49,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); var ljPlanningView = LjPlanningDb.GetById(id); + + LoadingHelper.ShowLoadingScreen(); var watchDog = LjHelp.WatchDog; if (watchDog == 0) @@ -59,6 +63,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning if (ljPlanningView != null) { + if (ljPlanningView.Status !="0") + { + + MessageBox.Show("状态不是新建 禁止下发"); + return; + } //List recipePlcViews = new List(); //List recipePlcViews2 = new List(); @@ -71,9 +81,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var plc = BasePlcHelper.Instance; var formulDetail = LjFormulaDb.GetDetail(formulaId); + Clean(unit); //单元 switch (unit) { + + case 1: //单元1 干混1 糊化1 2 湿混 1 2 @@ -81,58 +94,84 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataDry1 = GetUnitDryView(formulDetail); LjPlanningPlcHelp.DownD1Recipe(dataDry1.H1, dataDry1.R1); - if (dataDry1.H1 != null) + if (dataDry1.H1 != null && dataDry1.H1.Count>0) { + + + plc.PlcRead(plc.EnableDryD1, out int[] ss); + WriteEnbale(plc.EnableDryD1); } + else + { + WriteCanel(plc.EnableDryD1); + } var dataSilo1A = GetUnitSiloView(formulDetail, "A"); LjPlanningPlcHelp.DownG1Recipe(dataSilo1A.H1, dataSilo1A.H2, dataSilo1A.R1); - if (dataSilo1A.H1 != null) + if (dataSilo1A.H1 != null && dataSilo1A.H1.Count > 0) { WriteEnbale(plc.EnableDryG1); } + else + { + WriteCanel(plc.EnableDryG1); + } var dataSilo1B = GetUnitSiloView(formulDetail, "B"); LjPlanningPlcHelp.DownG2Recipe(dataSilo1B.H1, dataSilo1B.H2, dataSilo1B.R1); - if (dataSilo1B.H1 != null) + if (dataSilo1B.H1 != null && dataSilo1B.H1.Count > 0) { WriteEnbale(plc.EnableDryG2); } + else + { + WriteCanel(plc.EnableDryG2); + } var dataWeter1A = GetUnitWeterView(formulDetail, "A"); LjPlanningPlcHelp.DownM1Recipe(dataWeter1A.R2); - if (dataWeter1A.R2 != null) + if (dataWeter1A.R2 != null && dataWeter1A.R2.Count>0) { WriteEnbale(plc.EnableDryM1); } + else + { + WriteCanel(plc.EnableDryM1); + } var dataWeter1B = GetUnitWeterView(formulDetail, "B"); - LjPlanningPlcHelp.DownM1Recipe(dataWeter1B.R2); + LjPlanningPlcHelp.DownM2Recipe(dataWeter1B.R2); - if (dataWeter1B.R2 != null) + if (dataWeter1B.R2 != null && dataWeter1B.R2.Count > 0) { WriteEnbale(plc.EnableDryM2); } + else + { + WriteCanel(plc.EnableDryM2); + } plc.PlcWriteByDataKey(plc.Plan0_RecipeCode, new object[] { formulaId }); - plc.PlcWriteByDataKey(plc.Plan0_RecipeCode, new object[] { ljPlanningView.Id }); + plc.PlcWriteByDataKey(plc.Plan0_PlanCode, new object[] { ljPlanningView.Id }); plc.PlcWriteByDataKey(plc.Plan0_Batch, new object[] { ljPlanningView.NumCar }); - plc.PlcWriteByDataKey(plc.Plan0_Start, new object[] { 1 }); + + //把状态变成执行 + LjPlanningDb.UpdateStatus(1, ljPlanningView.Id); break; case 2: @@ -146,6 +185,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { WriteEnbale(plc.EnableDryD2); } + else + { + WriteCanel(plc.EnableDryD2); + } @@ -157,6 +200,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { WriteEnbale(plc.EnableDryG3); } + else + { + WriteCanel(plc.EnableDryG3); + } var dataSilo2B = GetUnitSiloView(formulDetail, "B"); @@ -167,6 +214,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { WriteEnbale(plc.EnableDryG4); } + else + { + WriteCanel(plc.EnableDryG4); + } var dataWeter2A = GetUnitWeterView(formulDetail, "A"); LjPlanningPlcHelp.DownM3Recipe(dataWeter2A.R2); @@ -188,7 +239,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning plc.PlcWriteByDataKey(plc.Plan1_Batch, new object[] { ljPlanningView.NumCar }); plc.PlcWriteByDataKey(plc.Plan1_Start, new object[] { 1 }); - + //把状态变成执行 + LjPlanningDb.UpdateStatus(1, ljPlanningView.Id); break; case 3: @@ -242,7 +294,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning plc.PlcWriteByDataKey(plc.Plan2_Batch, new object[] { ljPlanningView.NumCar }); plc.PlcWriteByDataKey(plc.Plan2_Start, new object[] { 1 }); - + //把状态变成执行 + LjPlanningDb.UpdateStatus(1, ljPlanningView.Id); break; case 4: @@ -301,12 +354,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning plc.PlcWriteByDataKey(plc.Plan3_RecipeCode, new object[] { ljPlanningView.Id }); plc.PlcWriteByDataKey(plc.Plan3_Batch, new object[] { ljPlanningView.NumCar }); plc.PlcWriteByDataKey(plc.Plan3_Start, new object[] { 1 }); - + //把状态变成执行 + LjPlanningDb.UpdateStatus(1, ljPlanningView.Id); break; } - + } else @@ -318,13 +372,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning LoadingHelper.CloseForm(); + MessageBox.Show("数据下发成功"); + if (OnDown != null) + { + OnDown(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } } public void WriteEnbale(DataKeyValue key) { var plc = BasePlcHelper.Instance; - plc.PlcVarWriteByDataKey(key, new object[] { 1 }); + bool b= plc.PlcWriteByDataKey(key, new object[] { 1 }); + } + + + public void WriteCanel(DataKeyValue key) + { + var plc = BasePlcHelper.Instance; + plc.PlcWriteByDataKey(key, new object[] {1}); } public UnitView GetUnitDryView(List formulDetail) @@ -336,7 +402,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataDry1CPlcView = dataDry1C.Select(x => new RecipePlcView() { Bin = x.BinNo, - Set = x.SetValue, + Set = x.Weight, TolErance = x.Tolerance }).ToList(); @@ -366,7 +432,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataSilo1CPlcView = dataSilo1C.Select(x => new RecipePlcView() { Bin = x.BinNo, - Set = x.SetValue, + Set = x.Weight, TolErance = x.Tolerance }).ToList(); @@ -377,7 +443,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataSilo1CWaterPlcView = dataSilo1CWater.Select(x => new RecipePlcView() { Bin = x.BinNo, - Set = x.SetValue, + Set = x.Weight, TolErance = x.Tolerance }).ToList(); @@ -414,7 +480,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning var dataSilo2CPlcView = dataSilo2C.Select(x => new RecipePlcView() { Bin = x.BinNo, - Set = x.SetValue, + Set = x.Weight, TolErance = x.Tolerance }).ToList(); @@ -429,7 +495,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning MixTemp = x.Temp, MixTime = x.TimeInfo, SetValue = x.SetValue, - Tolerance = x.Tolerance + SetTolerance = x.SetTolerance }).ToList(); @@ -437,6 +503,84 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning return unitView; } + + + + + public void Clean(int unit) + { + + + List H1 = new List(); + List< Step > sto = new List< Step >(); + List < MixStep > mixSteps=new List (); + for (int i = 0; i < 12; i++) { + H1.Add(new RecipePlcView() + { + Bin = 0, + Set = 0, + TolErance = 0 + }); + sto.Add(new Step() + { + MixCode = 0, + MixSpeed = 0, + MixTemp = 0, + MixTime = 0 + + }); + + mixSteps.Add(new MixStep() + { + MixCode = 0, + MixSpeed = 0, + MixTemp = 0, + MixTime = 0, + SetTolerance = 0, + SetValue = 0 + }); + } + + + if(unit == 1) + { + LjPlanningPlcHelp.DownD1Recipe(H1, sto); + LjPlanningPlcHelp.DownG1Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownG2Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownM1Recipe(mixSteps); + LjPlanningPlcHelp.DownM2Recipe(mixSteps); + } + + if (unit == 2) + { + LjPlanningPlcHelp.DownD2Recipe(H1, sto); + LjPlanningPlcHelp.DownG3Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownG4Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownM3Recipe(mixSteps); + LjPlanningPlcHelp.DownM4Recipe(mixSteps); + } + + if (unit == 3) + { + LjPlanningPlcHelp.DownD3Recipe(H1, sto); + LjPlanningPlcHelp.DownG5Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownG6Recipe(H1, H1, sto); + + LjPlanningPlcHelp.DownM5Recipe(mixSteps); + LjPlanningPlcHelp.DownM6Recipe(mixSteps); + } + + if (unit == 4) + { + LjPlanningPlcHelp.DownD4Recipe(H1, sto); + LjPlanningPlcHelp.DownG7Recipe(H1, H1, sto); + LjPlanningPlcHelp.DownG8Recipe(H1, H1, sto); + + LjPlanningPlcHelp.DownM7Recipe(mixSteps); + LjPlanningPlcHelp.DownM8Recipe(mixSteps); + } + + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs index e3c8641..6f2a31f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs @@ -137,7 +137,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning if (!check) { var dataB = detail.Where(x => x.MachineType == "Silo" && x.FormulaType == 1 && x.Machine == "B").ToList(); - dataGridSilo2.DataSource = new BindingList(data);//DataGridView的行可以添加删除（只有允许添加行、删除行） + dataGridSilo2.DataSource = new BindingList(dataB);//DataGridView的行可以添加删除（只有允许添加行、删除行） var data2Water = detail.Where(x => x.MachineType == "Silo_Water" && x.FormulaType == 1 @@ -225,7 +225,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning DataGridViewComboBoxColumn combox = this.dataGridDryer1Action.Columns["ComBoxDryer1Code"] as DataGridViewComboBoxColumn; - var list = GetAction(2); + var list = GetAction(1); + + combox.DataSource = list; combox.DisplayMember = "Name"; combox.ValueMember = "Id"; @@ -240,14 +242,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning DataGridViewComboBoxColumn combox1 = this.dataGridSiloH1.Columns["ComBoxSilo1Code"] as DataGridViewComboBoxColumn; - var list1 = GetAction(1); + var list1 = GetAction(2); combox1.DataSource = list1; combox1.DisplayMember = "Name"; combox1.ValueMember = "Id"; combox1.DataPropertyName = "ActionId"; DataGridViewComboBoxColumn combox2 = this.dataGridSiloH2.Columns["ComBoxSilo2Code"] as DataGridViewComboBoxColumn; - var list2 = GetAction(1); + var list2 = GetAction(2); combox2.DataSource = list2; combox2.DisplayMember = "Name"; combox2.ValueMember = "Id"; @@ -334,7 +336,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning if(deviceUnitId > 0) { - sql += " where DeviceUnitId=" + deviceUnitId; + sql += " where DeviceUnitId=" + deviceUnitId ; + + sql += " order by code"; } var dataTable = DBHelp.GetTable(sql); @@ -370,6 +374,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning DataGridViewComboBoxColumn combox = dataGridDryer.Columns["ComBoxDryer1Bin"] as DataGridViewComboBoxColumn; var list = GetStockMaterrial(1); + list=list.Where(x => x.Id==5 || x.Id==6).ToList(); combox.DataSource = list; combox.DisplayMember = "Name"; combox.ValueMember = "Id"; @@ -384,6 +389,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { DataGridViewComboBoxColumn combox1 = dataGridSilo1.Columns["ComBoxSilo1Bin"] as DataGridViewComboBoxColumn; var list1 = GetStockMaterrial(1); + + list1.RemoveAll(x => x.Id == 5); + list1.RemoveAll(x => x.Id == 6); + + combox1.DataSource = list1; combox1.DisplayMember = "Name"; combox1.ValueMember = "Id"; @@ -391,6 +401,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning DataGridViewComboBoxColumn combox2 = dataGridSilo2.Columns["ComBoxSilo2Bin"] as DataGridViewComboBoxColumn; var list2 = GetStockMaterrial(1); + + list2.RemoveAll(x => x.Id == 5); + list2.RemoveAll(x => x.Id == 6); + combox2.DataSource = list2; combox2.DisplayMember = "Name"; combox2.ValueMember = "Id"; @@ -406,7 +420,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private void FillSiloWater() { DataGridViewComboBoxColumn comboxWater1 = dataGridWater1.Columns["ComBoxSilo1BinWater"] as DataGridViewComboBoxColumn; - var comboxWater1List = GetStockMaterrial(1); + var comboxWater1List = GetStockMaterrial(4); comboxWater1.DataSource = comboxWater1List; comboxWater1.DisplayMember = "Name"; comboxWater1.ValueMember = "Id"; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs index cabcd94..c52f686 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/InItDbAction.cs @@ -21,7 +21,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning UpdateAction.OnUpdate -= Process_Event; UpdateAction.OnUpdate += Process_Event; - + + + DownloadAction.OnDown -= Process_Event; + DownloadAction.OnDown += Process_Event; + DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_planning") .FirstOrDefault(); //获取物料数据控件 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs index 4cdcd7c..54abe63 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs @@ -2396,7 +2396,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -2410,7 +2410,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step1_Tolerance, view.SetTolerance); } if (i == 2) @@ -2425,7 +2425,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step2_Tolerance, view.SetTolerance); } if (i == 3) @@ -2440,7 +2440,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step3_Tolerance, view.SetTolerance); } if (i == 4) @@ -2455,7 +2455,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step4_Tolerance, view.SetTolerance); } if (i == 5) @@ -2470,7 +2470,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step5_Tolerance, view.SetTolerance); } if (i == 6) @@ -2486,7 +2486,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step6_Tolerance, view.SetTolerance); } if (i == 7) @@ -2501,7 +2501,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step7_Tolerance, view.SetTolerance); } if (i == 8) @@ -2516,7 +2516,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -2530,7 +2530,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM1Step9_Tolerance, view.SetTolerance); } @@ -2557,7 +2557,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step0_Tolerance, view.SetTolerance); } if (i == 1) @@ -2572,7 +2572,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step1_Tolerance, view.SetTolerance); } if (i == 2) @@ -2587,7 +2587,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step2_Tolerance, view.SetTolerance); } if (i == 3) @@ -2602,7 +2602,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step3_Tolerance, view.SetTolerance); } if (i == 4) @@ -2617,7 +2617,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step4_Tolerance, view.SetTolerance); } if (i == 5) @@ -2633,7 +2633,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -2648,7 +2648,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -2661,7 +2661,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step7_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -2675,7 +2675,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step8_Tolerance, view.SetTolerance); } if (i == 9) @@ -2690,7 +2690,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM2Step9_Tolerance, view.SetTolerance); } } } @@ -2711,7 +2711,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step0_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -2724,7 +2724,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step1_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -2737,7 +2737,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step2_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step2_Tolerance, view.SetTolerance); } if (i == 3) @@ -2752,7 +2752,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -2765,7 +2765,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step4_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -2778,7 +2778,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -2792,7 +2792,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step6_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -2806,7 +2806,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -2819,7 +2819,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step8_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -2833,7 +2833,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM3Step9_Tolerance, view.SetTolerance); } } @@ -2857,7 +2857,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -2871,7 +2871,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -2885,7 +2885,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step2_Tolerance, view.SetTolerance); } if (i == 3) { @@ -2898,7 +2898,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step3_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -2912,7 +2912,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -2925,7 +2925,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -2939,7 +2939,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step6_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -2953,7 +2953,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -2967,7 +2967,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -2981,7 +2981,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM4Step9_Tolerance, view.SetTolerance); } } @@ -3004,7 +3004,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -3017,7 +3017,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step1_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -3030,7 +3030,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step2_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step2_Tolerance, view.SetTolerance); } if (i == 3) { @@ -3044,7 +3044,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -3057,7 +3057,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step4_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -3070,7 +3070,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -3085,7 +3085,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -3098,7 +3098,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step7_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -3111,7 +3111,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step8_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -3124,7 +3124,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step9_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM5Step9_Tolerance, view.SetTolerance); } } @@ -3148,7 +3148,7 @@ if (i == 0) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -3161,7 +3161,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step1_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -3175,7 +3175,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step2_Tolerance, view.SetTolerance); } if (i == 3) { @@ -3189,7 +3189,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -3202,7 +3202,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step4_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -3215,7 +3215,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -3228,7 +3228,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step6_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step6_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -3242,7 +3242,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -3255,7 +3255,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step8_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -3269,7 +3269,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM6Step9_Tolerance, view.SetTolerance); } @@ -3292,7 +3292,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step0_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step0_Tolerance, view.SetTolerance); } if (i == 1) { @@ -3306,7 +3306,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -3320,7 +3320,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step2_Tolerance, view.SetTolerance); } if (i == 3) { @@ -3333,7 +3333,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step3_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -3346,7 +3346,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step4_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -3359,7 +3359,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -3372,7 +3372,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step6_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step6_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -3385,7 +3385,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step7_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -3398,7 +3398,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step8_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -3412,7 +3412,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM7Step9_Tolerance, view.SetTolerance); } } } @@ -3434,7 +3434,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step0_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step0_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step0_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step0_Tolerance, view.SetTolerance); return; } if (i == 1) @@ -3448,7 +3448,7 @@ if (i == 1) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step1_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step1_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step1_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step1_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step1_Tolerance, view.SetTolerance); } if (i == 2) { @@ -3462,7 +3462,7 @@ if (i == 2) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step2_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step2_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step2_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step2_Tolerance, view.SetTolerance); } if (i == 3) { @@ -3475,7 +3475,7 @@ if (i == 3) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step3_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step3_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step3_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step3_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step3_Tolerance, view.SetTolerance); } if (i == 4) { @@ -3488,7 +3488,7 @@ if (i == 4) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step4_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step4_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step4_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step4_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step4_Tolerance, view.SetTolerance); } if (i == 5) { @@ -3501,7 +3501,7 @@ if (i == 5) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step5_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step5_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step5_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step5_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step5_Tolerance, view.SetTolerance); } if (i == 6) { @@ -3514,7 +3514,7 @@ if (i == 6) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step6_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step6_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step6_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step6_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step6_Tolerance, view.SetTolerance); } if (i == 7) { @@ -3527,7 +3527,7 @@ if (i == 7) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step7_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step7_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step7_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step7_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step7_Tolerance, view.SetTolerance); } if (i == 8) { @@ -3540,7 +3540,7 @@ if (i == 8) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step8_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step8_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step8_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step8_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step8_Tolerance, view.SetTolerance); } if (i == 9) { @@ -3553,7 +3553,7 @@ if (i == 9) basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step9_MixTemp, view.MixTemp); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step9_MixSpeed, view.MixSpeed); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step9_SetValue, view.SetValue); - basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step9_Tolerance, view.Tolerance); + basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.WeterM8Step9_Tolerance, view.SetTolerance); } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs index 0312aeb..96dd6e5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs @@ -23,18 +23,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { - LoadingHelper.ShowLoadingScreen(); - var i = LjHelp.WatchDog; - if (i == 0) - { - LoadingHelper.CloseForm(); - MessageBox.Show("PLC通讯失败"); - ICSharpCode.Core.LoggingService.Warn("PLC通讯失败"); - return; - } DoWord(); }; - LoadingHelper.CloseForm(); + } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/DelAction.cs index 76586c1..b8d76be 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/DelAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjRecipeData/DelAction.cs @@ -3,6 +3,7 @@ using Mesnac.Action.ChemicalWeighing.LjPlanning; using System.Windows.Forms; using System; using System.Linq; +using Mesnac.Action.ChemicalWeighing.LjMaterial; namespace Mesnac.Action.ChemicalWeighing.LjRecipeData { @@ -44,7 +45,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjRecipeData string sql = " update Lj_Formula set IsEnable=0 where id=" + id; - + DBHelp.ExecuteNonQuery(sql); this._runtime.BaseControl.MCEnabled = false; if (OnDel != null) { diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index e39bb07..a7cade5 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -199,7 +199,8 @@ - + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml index b357a38..32a5b84 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml @@ -59,7 +59,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAH0AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAApBY3Rpb25OYW1lBgkAAAAM5Yqo5L2c5ZCN56ewAQUAAAAEAAAABgoAAAAIVGltZUluZm8GCwAAAAbml7bpl7QBBgAAAAQAAAAGDAAAAARUZW1wBg0AAAAG5rip5bqmAQcAAAAEAAAABg4AAAAFU3BlZWQGDwAAAAbpgJ/luqYL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAAJEAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANAgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAAKQWN0aW9uTmFtZQYLAAAADOWKqOS9nOWQjeensAEFAAAABAAAAAYMAAAACFRpbWVJbmZvBg0AAAAG5pe26Ze0AQYAAAAEAAAABg4AAAAEVGVtcAYPAAAABua4qeW6pgEHAAAABAAAAAYQAAAABVNwZWVkBhEAAAAG6YCf5bqmAQgAAAAEAAAABhIAAAAIU2V0VmFsdWUGEwAAAAzorr7lrprph43ph48BCQAAAAQAAAAGFAAAAAxTZXRUb2xlcmFuY2UGFQAAAAzorr7lrprlhazlt64L AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -86,7 +86,7 @@ Fill 0, 0 MCDataGridView16 - 372, 74 + 543, 74 13 湿混机(#A) @@ -96,7 +96,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAH0AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAApBY3Rpb25OYW1lBgkAAAAM5Yqo5L2c5ZCN56ewAQUAAAAEAAAABgoAAAAIVGltZUluZm8GCwAAAAbml7bpl7QBBgAAAAQAAAAGDAAAAARUZW1wBg0AAAAG5rip5bqmAQcAAAAEAAAABg4AAAAFU3BlZWQGDwAAAAbpgJ/luqYL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAAJEAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANAgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAAKQWN0aW9uTmFtZQYLAAAADOWKqOS9nOWQjeensAEFAAAABAAAAAYMAAAACFRpbWVJbmZvBg0AAAAG5pe26Ze0AQYAAAAEAAAABg4AAAAEVGVtcAYPAAAABua4qeW6pgEHAAAABAAAAAYQAAAABVNwZWVkBhEAAAAG6YCf5bqmAQgAAAAEAAAABhIAAAAIU2V0VmFsdWUGEwAAAAzorr7lrprph43ph48BCQAAAAQAAAAGFAAAAAxTZXRUb2xlcmFuY2UGFQAAAAzorr7lrprlhazlt64L AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -123,7 +123,7 @@ Fill 0, 0 MCDataGridView17 - 372, 74 + 543, 74 16 湿混机(#B) @@ -131,7 +131,7 @@ 515, 345 TabControl4 - 380, 100 + 551, 100