diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs new file mode 100644 index 0000000..a528e34 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/DownAction.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMetage; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + public class DownAction:ChemicalWeighingAction, IAction + { + + + public static event EventHandler OnHandler; + + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + + if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + private void DoWord() + { + DataGridView gridView=_materialGridControl.BaseControl as DataGridView; + var gridViewDataSource = gridView.DataSource as DataTable; + + List lsView = new List(); + + var dataRowCollection = gridViewDataSource.Rows; + foreach (DataRow o in dataRowCollection) + { + ElectricalView view =new ElectricalView(); + view.Id = (int)o["Id"]; + view.Name = o["Name"].ToString(); + view.Speed =Convert.ToSingle(o["Speed"]);; + lsView.Add(view); + } + + ElectricalPlc.DownToPlc(lsView); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs new file mode 100644 index 0000000..6c145d6 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs @@ -0,0 +1,104 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + partial class FrmElectrical + { + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.Speed = new System.Windows.Forms.TextBox(); + this.JogTime = new System.Windows.Forms.Label(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // Speed + // + this.Speed.Location = new System.Drawing.Point(192, 72); + this.Speed.Margin = new System.Windows.Forms.Padding(5); + this.Speed.Name = "Speed"; + this.Speed.Size = new System.Drawing.Size(148, 21); + this.Speed.TabIndex = 62; + // + // JogTime + // + this.JogTime.AutoSize = true; + this.JogTime.Location = new System.Drawing.Point(89, 81); + this.JogTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.JogTime.Name = "JogTime"; + this.JogTime.Size = new System.Drawing.Size(35, 12); + this.JogTime.TabIndex = 59; + this.JogTime.Text = "速度:"; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(262, 275); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.TabIndex = 61; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(89, 275); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.TabIndex = 60; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // FrmElectrical + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(583, 450); + this.Controls.Add(this.Speed); + this.Controls.Add(this.JogTime); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Name = "FrmElectrical"; + this.Text = "变频电机手动速度"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.TextBox Speed; + private System.Windows.Forms.Label JogTime; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs new file mode 100644 index 0000000..f1b2895 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + public partial class FrmElectrical : Form + { + public FrmElectrical() + { + InitializeComponent(); + } + + private int _id; + + public FrmElectrical(int id) : this() + { + this._id = id; + ElectricalView view = new ElectricalView(); + view = ElectricalPlc.UpFromPlc(id); + if (null != view) + { + this.Speed.Text = view.Speed.ToString(); + this.Speed.Enabled = false; + } + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + var speed = Speed.Text.Trim(); + if (!float.TryParse(speed, out var sp)) + { + Speed.Focus(); + MessageBox.Show("请输入正确的值"); + return; + } + ElectricalView view = new ElectricalView(); + view.Id = _id; + view.Speed = Convert.ToSingle(speed); + ElectricalPlc.DownToPlc(new List() + { + view + }); + + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs new file mode 100644 index 0000000..a7c9742 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/InitDbAction.cs @@ -0,0 +1,69 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + public class InitDbAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + // UpdateAction.OnUpdate -= Process_Event; + // UpdateAction.OnUpdate += Process_Event; + // + // UpAction.OnHandler -= Process_Event; + // UpAction.OnHandler += Process_Event; + // + // + // DownAction.OnHandler -= Process_Event; + // DownAction.OnHandler += Process_Event; + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id, Name, Speed from ElectricalSetting"); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) + { + this._materialGridControl.BaseControl.BindDataSource = null; + this._materialGridControl.BaseControl.BindDataSource = table; + //DBLog("成功!"); + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + } + } + + + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs new file mode 100644 index 0000000..dd4c4a0 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpAction.cs @@ -0,0 +1,50 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; +using Mesnac.Action.ChemicalWeighing.LjMetage; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + public class UpAction:ChemicalWeighingAction, IAction + { + + private RuntimeParameter _runtime; + + public static event EventHandler OnHandler; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") + .FirstOrDefault(); //获取物料数据控件 + + + if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + + private void DoWord() + { + var view = ElectricalPlc.UpFromPlc(); + foreach (var v in view) + { + string sql = + $"update ElectricalSetting set Speed={v.Speed} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); + } + + + if (OnHandler != null) + { + OnHandler(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpdateAction.cs new file mode 100644 index 0000000..59ad2af --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/UpdateAction.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMetage; + +namespace Mesnac.Action.ChemicalWeighing.LjElectrical +{ + public class UpdateAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + + public static event EventHandler OnUpdate; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + + + + FrmElectrical frm = new FrmElectrical(id); + DialogResult result = frm.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdate != null) + { + OnUpdate(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frm.Dispose(); + + } + + this._runtime.BaseControl.MCEnabled = true; + + } + + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs new file mode 100644 index 0000000..9483f35 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/DownAction.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjPressure; + +namespace Mesnac.Action.ChemicalWeighing.LjMetage +{ + public class DownAction:ChemicalWeighingAction, IAction + { + + + public static event EventHandler OnHandler; + + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MetageSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + + if (MessageBox.Show("确定下发到PLC?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + private void DoWord() + { + DataGridView gridView=_materialGridControl.BaseControl as DataGridView; + var gridViewDataSource = gridView.DataSource as DataTable; + + List lsView = new List(); + + var dataRowCollection = gridViewDataSource.Rows; + foreach (DataRow o in dataRowCollection) + { + MetageView view = new MetageView(); + view.Id = (int)o["Id"]; + view.Name = o["Name"].ToString(); + view.HighSpeed =Convert.ToSingle(o["HighSpeed"]);; + view.LowSpeed = Convert.ToSingle(o["LowSpeed"]); + view.WeightSlow = Convert.ToSingle(o["WeightSlow"]); + view.Precut = Convert.ToInt32(o["Precut"]); + view.JogTime = Convert.ToInt32(o["JogTime"]); + + lsView.Add(view); + } + + MetagePlc.DownToPlc(lsView); + } + } +} \ 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 new file mode 100644 index 0000000..e82d9cb --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs @@ -0,0 +1,201 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjMetage +{ + partial class FrmMetage + { + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.HighSpeed = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.LowSpeed = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + 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.SuspendLayout(); + // + // HighSpeed + // + this.HighSpeed.Location = new System.Drawing.Point(157, 38); + this.HighSpeed.Margin = new System.Windows.Forms.Padding(5); + this.HighSpeed.Name = "HighSpeed"; + this.HighSpeed.Size = new System.Drawing.Size(148, 21); + this.HighSpeed.TabIndex = 58; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(227, 365); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.TabIndex = 56; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(54, 365); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.TabIndex = 55; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(54, 47); + this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(83, 12); + this.label3.TabIndex = 54; + this.label3.Text = "高速称量速度:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(54, 78); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(83, 12); + this.label1.TabIndex = 54; + this.label1.Text = "慢速称量速度:"; + // + // LowSpeed + // + this.LowSpeed.Location = new System.Drawing.Point(157, 69); + this.LowSpeed.Margin = new System.Windows.Forms.Padding(5); + this.LowSpeed.Name = "LowSpeed"; + this.LowSpeed.Size = new System.Drawing.Size(148, 21); + this.LowSpeed.TabIndex = 58; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(54, 109); + this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(47, 12); + this.label2.TabIndex = 54; + this.label2.Text = "慢称值:"; + // + // WeightSlow + // + this.WeightSlow.Location = new System.Drawing.Point(157, 100); + this.WeightSlow.Margin = new System.Windows.Forms.Padding(5); + this.WeightSlow.Name = "WeightSlow"; + this.WeightSlow.Size = new System.Drawing.Size(148, 21); + this.WeightSlow.TabIndex = 58; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(54, 140); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(47, 12); + this.label4.TabIndex = 54; + this.label4.Text = "提前量:"; + // + // Precut + // + this.Precut.Location = new System.Drawing.Point(157, 131); + this.Precut.Margin = new System.Windows.Forms.Padding(5); + this.Precut.Name = "Precut"; + this.Precut.Size = new System.Drawing.Size(148, 21); + this.Precut.TabIndex = 58; + // + // JogTime + // + this.JogTime.AutoSize = true; + this.JogTime.Location = new System.Drawing.Point(54, 171); + 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 = "点动值:"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(157, 162); + this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(148, 21); + this.textBox4.TabIndex = 58; + // + // FrmMetage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(555, 450); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.Precut); + this.Controls.Add(this.WeightSlow); + this.Controls.Add(this.JogTime); + this.Controls.Add(this.LowSpeed); + this.Controls.Add(this.label4); + this.Controls.Add(this.HighSpeed); + this.Controls.Add(this.label2); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.label1); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label3); + this.Name = "FrmMetage"; + this.Text = "FrmMetage"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox LowSpeed; + private System.Windows.Forms.Label label2; + 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.TextBox HighSpeed; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label3; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs new file mode 100644 index 0000000..b5023c0 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections.Generic; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjMetage +{ + public partial class FrmMetage : Form + { + public FrmMetage() + { + InitializeComponent(); + } + + private int _id = 0; + + public FrmMetage(int id) : this() + { + this._id = id; + var upFromPlc = MetagePlc.UpFromPlc(id); + if (null != upFromPlc) + { + this.HighSpeed.Text = upFromPlc.HighSpeed.ToString(); + this.LowSpeed.Text = upFromPlc.LowSpeed.ToString(); + this.WeightSlow.Text = upFromPlc.WeightSlow.ToString(); + this.Precut.Text = upFromPlc.Precut.ToString(); + this.JogTime.Text = upFromPlc.JogTime.ToString(); + } + } + + private void FrmMetage_Load(object sender, EventArgs e) + { + + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + var highSpeed = HighSpeed.Text.Trim(); + var lowSpeed = LowSpeed.Text.Trim(); + var weightSlow = WeightSlow.Text.Trim(); + var precut = Precut.Text.Trim(); + var jobTime = JogTime.Text.Trim(); + + if (!float.TryParse(highSpeed, out var h)) + { + HighSpeed.Focus(); + MessageBox.Show("请输入正确的高速称量速度"); + return; + } + + if (!float.TryParse(lowSpeed, out var l)) + { + HighSpeed.Focus(); + MessageBox.Show("请输入正确的慢速称量速度"); + return; + } + + if (!float.TryParse(weightSlow, out var w)) + { + WeightSlow.Focus(); + MessageBox.Show("请输入正确的慢称值"); + return; + } + + if (!float.TryParse(precut, out var p)) + { + WeightSlow.Focus(); + MessageBox.Show("请输入正确的提前量"); + return; + } + + if (!int.TryParse(jobTime, out var j)) + { + WeightSlow.Focus(); + MessageBox.Show("请输入正确的点动值"); + return; + } + + MetageView view = new MetageView() + { + Id = _id, + HighSpeed = h, + LowSpeed = l, + WeightSlow = w, + Precut = p, + JogTime = j + + }; + + MetagePlc.DownToPlc(new List() { view }); + this.DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/InitDbAction.cs new file mode 100644 index 0000000..1e1db9e --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/InitDbAction.cs @@ -0,0 +1,69 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMetage +{ + public class InitDbAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + UpAction.OnHandler -= Process_Event; + UpAction.OnHandler += Process_Event; + + + DownAction.OnHandler -= Process_Event; + DownAction.OnHandler += Process_Event; + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MetageSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id, Name, HighSpeed, LowSpeed, WeightSlow, Precut, JogTime from MetageSetting"); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) + { + this._materialGridControl.BaseControl.BindDataSource = null; + this._materialGridControl.BaseControl.BindDataSource = table; + //DBLog("成功!"); + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + } + } + + + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs index 6b0715d..992260b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs @@ -1109,7 +1109,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage - public static MetageView DownToPlc(int id) + public static MetageView UpFromPlc(int id) { MetageView view = new MetageView(); switch (id) @@ -1227,7 +1227,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage return view; } - public static IList DownToPlc() + public static IList UpFromPlc() { IList ls = new List(); ls.Add(Up694()); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs new file mode 100644 index 0000000..95ef807 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpAction.cs @@ -0,0 +1,49 @@ +using System; +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 +{ + public class UpAction:ChemicalWeighingAction, IAction + { + + private RuntimeParameter _runtime; + + public static event EventHandler OnHandler; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MetageSetting") + .FirstOrDefault(); //获取物料数据控件 + + + if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + private void DoWord() + { + var view = MetagePlc.UpFromPlc(); + foreach (var v in view) + { + 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); + } + + + if (OnHandler != null) + { + OnHandler(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpdateAction.cs new file mode 100644 index 0000000..fdc845a --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/UpdateAction.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjPressure; + +namespace Mesnac.Action.ChemicalWeighing.LjMetage +{ + public class UpdateAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + + public static event EventHandler OnUpdate; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "MetageSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + + + + FrmMetage frm = new FrmMetage(id); + DialogResult result = frm.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdate != null) + { + OnUpdate(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frm.Dispose(); + + } + + this._runtime.BaseControl.MCEnabled = true; + + } + + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs index 4e49be8..4ce89f8 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/FrmPressureUpdate.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Runtime.CompilerServices; using System.Windows.Forms; @@ -33,19 +34,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure this.Alarm.DataSource = ls; Alarm.ValueMember = "Id"; Alarm.DisplayMember = "Name"; - - var pressureSettingViews = PressurePLC.UpdateFromPlc(id); - if (pressureSettingViews.Count == 1) + + var v = PressurePLC.UpdateFromPlc(id); + if (null!=v) { - var v = pressureSettingViews.First(); - this.LowLimit.Text = v.LowLimit.ToString(); - this.HighLimit.Text = v.HighLimit.ToString(); + this.LowLimit.Text = v.LowLimit.ToString(CultureInfo.InvariantCulture); + this.HighLimit.Text = v.HighLimit.ToString(CultureInfo.InvariantCulture); foreach (MyNameValue combo in Alarm.Items) { if (combo.Id == v.Alarm) { Alarm.SelectedItem = combo; + Alarm.Enabled = false; break; } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/InitDbAction.cs index 357df90..e525b88 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/InitDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/InitDbAction.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Data; using System.Linq; using Mesnac.Action.Base; @@ -33,7 +34,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure private void FileControl() { DataTable table = - DBHelp.GetTable(@"select Id,Name,ActualValue,LowLimit,HighLimit,Alarm from pressureSetting"); + DBHelp.GetTable(@"select Id,Name,ActualValue,LowLimit,HighLimit,Alarm, + case Alarm when 1 then '超压' else '正常' end as AlarmValue from pressureSetting;"); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs index 26e6625..972b877 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressurePLC.cs @@ -19,8 +19,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V1_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V1_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V1_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V1_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -45,8 +45,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V1_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V1_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V1_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V1_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -69,8 +69,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V1_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V1_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V1_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V1_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -117,8 +117,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V2_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V2_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V2_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V2_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -164,8 +164,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V3_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V3_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V3_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V3_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -188,8 +188,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V3_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V3_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V3_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V3_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -211,8 +211,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V3_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V3_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V3_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V3_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -237,8 +237,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V4_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V4_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V4_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V4_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } private static PressureSettingView UpDbw138() @@ -262,8 +262,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V4_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V4_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V4_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V4_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -287,8 +287,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V4_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V4_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V4_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V4_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -313,8 +313,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V5_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.mainPress_V5_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V5_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.mainPress_V5_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -339,8 +339,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V5_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.topPres_V5_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V5_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.topPres_V5_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -364,8 +364,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V5_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.linePres_V5_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V5_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.linePres_V5_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -391,8 +391,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B1_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B1_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B1_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B1_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -416,8 +416,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B2_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B2_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B2_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B2_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -441,8 +441,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B3_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B3_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B3_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B3_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -466,8 +466,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B4_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B4_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B4_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B4_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -491,8 +491,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B5_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B5_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B5_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B5_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -516,8 +516,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B6_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B6_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B6_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B6_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } private static PressureSettingView UpDbw292() @@ -540,8 +540,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B7_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B7_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B7_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B7_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -565,8 +565,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B8_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B8_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B8_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B8_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -590,8 +590,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B9_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B9_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B9_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B9_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -615,8 +615,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B10_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B10_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B10_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B10_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -640,8 +640,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B11_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B11_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B11_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B11_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -665,8 +665,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B12_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.presDay_B12_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B12_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.presDay_B12_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -691,8 +691,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP01_B12_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP01_B12_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP01_B12_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP01_B12_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -717,8 +717,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP02_B12_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP02_B12_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP02_B12_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP02_B12_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -743,8 +743,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure var basePlcHelper = GetPlcHelper; basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP03_B12_LowLimit, view.LowLimit); basePlcHelper.PlcWriteFloatByDataKey(basePlcHelper.PR2PCP03_B12_HighLimit, view.HighLimit); - basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP03_B12_Alarm, - new object[] { Convert.ToBoolean(view.Alarm) }); + // basePlcHelper.PlcWriteByDataKey(basePlcHelper.PR2PCP03_B12_Alarm, + // new object[] { Convert.ToBoolean(view.Alarm) }); } } @@ -896,7 +896,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure /// 下发到plc /// /// - public static List UpdateFromPlc(int id=0) + public static List UpdateFromPlc() { List ls = new List @@ -933,15 +933,112 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure UpDbw418() }; - //如果影响效率 单独去一个 - if (id > 0) - { - var pressureSettingView = ls.FirstOrDefault(x => x.Id == id); - return new List() { pressureSettingView }; - } + return ls; } + + + public static PressureSettingView UpdateFromPlc(int id) + { + PressureSettingView view = new PressureSettingView(); + switch (id) + { + case 1: + view= UpDbw12(); + break; + case 2: + view= UpDbw26(); + break; + case 3: + view= UpDbw40(); + break; + case 4: + view= UpDbw54(); + break; + case 5: + view= UpDbw68(); + break; + case 6: + view= UpDbw82(); + break; + case 7: + view= UpDbw96(); + break; + case 8: + view= UpDbw110(); + break; + case 9: + view= UpDbw124(); + break; + case 10: + view= UpDbw138(); + break; + case 11: + view= UpDbw152(); + break; + case 12: + view= UpDbw166(); + break; + case 13: + view= UpDbw180(); + break; + case 14: + view= UpDbw194(); + break; + case 15: + view= UpDbw208(); + break; + case 16: + view= UpDbw222(); + break; + case 17: + view= UpDbw236(); + break; + case 18: + view= UpDbw250(); + break; + case 19: + view= UpDbw264(); + break; + case 20: + view= UpDbw278(); + break; + case 21: + view= UpDbw292(); + break; + case 22: + view= UpDbw306(); + break; + case 23: + view= UpDbw320(); + break; + case 24: + view= UpDbw334(); + break; + case 25: + view= UpDbw348(); + break; + case 26: + view= UpDbw362(); + break; + case 27: + view= UpDbw376(); + break; + case 28: + view= UpDbw390(); + break; + case 29: + view= UpDbw404(); + break; + case 30: + view= UpDbw418(); + break; + + } + + return view; + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressureSettingView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressureSettingView.cs index f60c8d0..5bc046c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressureSettingView.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/PressureSettingView.cs @@ -79,4 +79,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure #endregion Model } + + + + public class PressureSettingListView : PressureSettingView + { + + public string AlarmValue { get; set; } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs index de88621..0a12ae8 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpAction.cs @@ -8,7 +8,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure { public class UpAction:ChemicalWeighingAction, IAction { - private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; public static event EventHandler OnHandler; @@ -19,8 +19,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "pressureSetting") .FirstOrDefault(); //获取物料数据控件 - this._materialGridControl = materialGridControl; - + if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpdateAction.cs index 841627f..4af25fc 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpdateAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPressure/UpdateAction.cs @@ -35,7 +35,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPressure } var dataGridViewRow = clientGridView.SelectedRows[0]; - var id = Convert.ToInt32(dataGridViewRow.Cells["Id"]); + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs new file mode 100644 index 0000000..f5596c7 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/DownAction.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjWeight; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + public class DownAction : ChemicalWeighingAction, IAction + { + public static event EventHandler OnHandler; + + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ProportionalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + + if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + DialogResult.OK) + { + DoWord(); + } + + } + + private void DoWord() + { + DataGridView gridView = _materialGridControl.BaseControl as DataGridView; + var gridViewDataSource = gridView.DataSource as DataTable; + + List lsView = new List(); + + var dataRowCollection = gridViewDataSource.Rows; + foreach (DataRow o in dataRowCollection) + { + ProportionalSettingView view = new ProportionalSettingView(); + view.Id = (int)o["Id"]; + view.Name = o["Name"].ToString(); + view.SV = Convert.ToSingle(o["SV"]); + lsView.Add(view); + } + + ProportionalPlc.DownToPlc(lsView); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs new file mode 100644 index 0000000..4ad0f4b --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.Designer.cs @@ -0,0 +1,106 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + partial class FrmProportional + { + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SV = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // SV + // + this.SV.Location = new System.Drawing.Point(152, 60); + this.SV.Margin = new System.Windows.Forms.Padding(5); + this.SV.Name = "SV"; + this.SV.Size = new System.Drawing.Size(129, 21); + this.SV.TabIndex = 64; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(217, 138); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.TabIndex = 62; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(44, 138); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.TabIndex = 61; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(71, 60); + this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(71, 12); + this.label3.TabIndex = 60; + this.label3.Text = "底料位重量:"; + // + // FrmProportional + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(397, 450); + this.Controls.Add(this.SV); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label3); + this.Name = "FrmProportional"; + this.RightToLeftLayout = true; + this.Text = "比例阀参数设定"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.TextBox SV; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label3; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs new file mode 100644 index 0000000..857983b --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.cs @@ -0,0 +1,53 @@ +using System; +using System.Globalization; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + public partial class FrmProportional : Form + { + public FrmProportional() + { + InitializeComponent(); + } + + private int _id = 0; + + public FrmProportional(int id):this() + { + this._id = id; + SV.MaxLength = 5; + SV.Enabled = true; + var view = ProportionalPlc.UpFromPlc(id); + if (view != null) + { + SV.Text = view.SV.ToString(CultureInfo.InvariantCulture); + } + + } + + + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + string sv = SV.Text.Trim(); + if(!float.TryParse(sv,out var rs)) + { + SV.Focus(); + MessageBox.Show("请输入正确的值"); + return; + } + + ProportionalSettingView view = new ProportionalSettingView(); + view.Id = _id; + view.SV = Convert.ToSingle(sv); + ProportionalPlc.DownToPlc(new []{view}); + + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/FrmProportional.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/InitDbAction.cs new file mode 100644 index 0000000..5f81760 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/InitDbAction.cs @@ -0,0 +1,70 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + public class InitDbAction : ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + UpAction.OnHandler -= Process_Event; + UpAction.OnHandler += Process_Event; + + + DownAction.OnHandler -= Process_Event; + DownAction.OnHandler += Process_Event; + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ProportionalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id, Name, PV, SV from ProportionalSetting"); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) + { + this._materialGridControl.BaseControl.BindDataSource = null; + this._materialGridControl.BaseControl.BindDataSource = table; + //DBLog("成功!"); + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + } + } + + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs new file mode 100644 index 0000000..91077c9 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpAction.cs @@ -0,0 +1,49 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; +using Mesnac.Action.ChemicalWeighing.LjWeight; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + public class UpAction:ChemicalWeighingAction, IAction + { + + private RuntimeParameter _runtime; + + public static event EventHandler OnHandler; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ProportionalSetting") + .FirstOrDefault(); //获取物料数据控件 + + + if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + private void DoWord() + { + var views = ProportionalPlc.UpFromPlc(); + foreach (var v in views) + { + string sql = + $"update ProportionalSetting set SV={v.SV} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); + } + + + if (OnHandler != null) + { + OnHandler(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpdateAction.cs new file mode 100644 index 0000000..5ad6dfd --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProportional/UpdateAction.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjWeight; + +namespace Mesnac.Action.ChemicalWeighing.LjProportional +{ + public class UpdateAction : ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + + public static event EventHandler OnUpdate; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "ElectricalSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + + + + FrmProportional frm = new FrmProportional(id); + DialogResult result = frm.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdate != null) + { + OnUpdate(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frm.Dispose(); + + } + + this._runtime.BaseControl.MCEnabled = true; + + } + + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs new file mode 100644 index 0000000..6bb6af8 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/DownAction.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjPressure; + +namespace Mesnac.Action.ChemicalWeighing.LjWeight +{ + public class DownAction : ChemicalWeighingAction, IAction + { + public static event EventHandler OnHandler; + + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "WeightSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + + if (MessageBox.Show("确定下发到PLC?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == + DialogResult.OK) + { + DoWord(); + } + + } + + private void DoWord() + { + DataGridView gridView = _materialGridControl.BaseControl as DataGridView; + var gridViewDataSource = gridView.DataSource as DataTable; + + List lsView = new List(); + + var dataRowCollection = gridViewDataSource.Rows; + foreach (DataRow o in dataRowCollection) + { + WeightSettingView view = new WeightSettingView(); + view.Id = (int)o["Id"]; + view.Name = o["Name"].ToString(); + view.HighWeight = Convert.ToSingle(o["HighWeight"]); + view.LowWeight = Convert.ToSingle(o["LowWeight"]); + lsView.Add(view); + } + + WeightSettingPlc.DownToPlc(lsView); + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs new file mode 100644 index 0000000..8b1f832 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs @@ -0,0 +1,130 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjWeight +{ + partial class FrmWeight + { + /// + /// Required designer variable. + /// + private IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.HighWeight = new System.Windows.Forms.TextBox(); + this.LowWeight = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // HighWeight + // + this.HighWeight.Enabled = false; + this.HighWeight.Location = new System.Drawing.Point(211, 117); + this.HighWeight.Margin = new System.Windows.Forms.Padding(5); + this.HighWeight.Name = "HighWeight"; + this.HighWeight.Size = new System.Drawing.Size(129, 21); + this.HighWeight.TabIndex = 57; + // + // LowWeight + // + this.LowWeight.Enabled = false; + this.LowWeight.Location = new System.Drawing.Point(211, 66); + this.LowWeight.Margin = new System.Windows.Forms.Padding(5); + this.LowWeight.Name = "LowWeight"; + this.LowWeight.Size = new System.Drawing.Size(129, 21); + this.LowWeight.TabIndex = 58; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(288, 253); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.TabIndex = 56; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(115, 253); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.TabIndex = 55; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(130, 117); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(71, 12); + this.label4.TabIndex = 52; + this.label4.Text = "高料位重量:\r\n"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(130, 66); + this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(71, 12); + this.label3.TabIndex = 54; + this.label3.Text = "底料位重量:"; + // + // FrmWeight + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(564, 532); + this.Controls.Add(this.HighWeight); + this.Controls.Add(this.LowWeight); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Name = "FrmWeight"; + this.Text = "FrmWeight"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.TextBox HighWeight; + private System.Windows.Forms.TextBox LowWeight; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs new file mode 100644 index 0000000..838e038 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.cs @@ -0,0 +1,64 @@ +using System; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjWeight +{ + public partial class FrmWeight : Form + { + public FrmWeight() + { + InitializeComponent(); + } + + private int _id = 0; + + public FrmWeight(int id) : this() + { + this._id = id; + SetUpdateFromPlc(); + LowWeight.MaxLength = 5; + HighWeight.MaxLength = 5; + } + + private void SetUpdateFromPlc() + { + WeightSettingView view = WeightSettingPlc.UpFromPlc(_id); + this.HighWeight.Text = view.HighWeight.ToString(); + this.LowWeight.Text = view.LowWeight.ToString(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + string lowWeight = LowWeight.Text.Trim(); + string highWeight = HighWeight.Text.Trim(); + + if (!float.TryParse(lowWeight, out var low)) + { + LowWeight.Focus(); + MessageBox.Show("请输入正确的低料位重量"); + return; + } + + if (!float.TryParse(highWeight, out var high)) + { + HighWeight.Focus(); + MessageBox.Show("请输入正确的高料位重量"); + return; + } + + WeightSettingView view = new WeightSettingView() + { + Id = _id, + HighWeight = high, + LowWeight = low + }; + + WeightSettingPlc.DownToPlc(new []{view}); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/InitDbAction.cs index 662b3e4..57b1f9f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/InitDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/InitDbAction.cs @@ -17,11 +17,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight this._runtime = runtime; - // UpAction.OnHandler -= Process_Event; - // UpAction.OnHandler += Process_Event; - // - // UpdateAction.OnUpdate -= Process_Event; - // UpdateAction.OnUpdate += Process_Event; + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + UpAction.OnHandler -= Process_Event; + UpAction.OnHandler += Process_Event; + + + DownAction.OnHandler -= Process_Event; + DownAction.OnHandler += Process_Event; DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "WeightSetting") diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs new file mode 100644 index 0000000..acf472b --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpAction.cs @@ -0,0 +1,49 @@ +using System; +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.LjWeight +{ + public class UpAction:ChemicalWeighingAction, IAction + { + + private RuntimeParameter _runtime; + + public static event EventHandler OnHandler; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "WeightSetting") + .FirstOrDefault(); //获取物料数据控件 + + + if (MessageBox.Show("确定上传到数据库?","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Information) == DialogResult.OK) + { + DoWord(); + }; + + } + + private void DoWord() + { + var views = WeightSettingPlc.UpFromPlc(); + foreach (var v in views) + { + string sql = + $"update WeightSetting set LowWeight={v.LowWeight},HighWeight={v.HighWeight} where Id={v.Id}"; + DBHelp.ExecuteNonQuery(sql); + } + + + if (OnHandler != null) + { + OnHandler(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpdateAction.cs new file mode 100644 index 0000000..462e793 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/UpdateAction.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjPressure; + +namespace Mesnac.Action.ChemicalWeighing.LjWeight +{ + public class UpdateAction : ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + + public static event EventHandler OnUpdate; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "WeightSetting") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + + DataGridView clientGridView = this._materialGridControl.BaseControl as DataGridView; + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + + MessageBox.Show("请选择要修改的数据", Mesnac.Basic.LanguageHelper.Caption, + MessageBoxButtons.OK, MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + var dataGridViewRow = clientGridView.SelectedRows[0]; + var id = Convert.ToInt32(dataGridViewRow.Cells["Id"].Value); + + + + FrmWeight frm = new FrmWeight(id); + DialogResult result = frm.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdate != null) + { + OnUpdate(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frm.Dispose(); + + } + + this._runtime.BaseControl.MCEnabled = true; + + } + + + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index dd15d2f..18748fb 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -227,8 +227,18 @@ + + + Form + + + FrmElectrical.cs + + + + Form @@ -241,8 +251,18 @@ + + + Form + + + FrmMetage.cs + + + + Form @@ -255,8 +275,18 @@ + + + Form + + + FrmProportional.cs + + + + Form @@ -277,7 +307,16 @@ + + + Form + + + FrmWeight.cs + + + @@ -510,18 +549,30 @@ FrmDevice.cs + + FrmElectrical.cs + FrmMaterial.cs + + FrmMetage.cs + FrmPressureUpdate.cs + + FrmProportional.cs + FrmStock.cs FrmTankNum.cs + + FrmWeight.cs + BarcodeReport.cs diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊变频电机手动参数管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊变频电机手动参数管理.xml new file mode 100644 index 0000000..f839d68 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊变频电机手动参数管理.xml @@ -0,0 +1,57 @@ + + + + + + + 初始榄菊变频电机手动参数 + 初始榄菊变频电机手动参数 + + + + 修改变频电机参数 + 修改变频电机参数 + + + + + 数据上传 + 数据上传 + + + + 数据下达 + 数据下达 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊干混机参数管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊干混机参数管理.xml new file mode 100644 index 0000000..18f9239 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊干混机参数管理.xml @@ -0,0 +1,57 @@ + + + + + + + 初始干混机参数 + 初始干混机参数 + + + + 修改干混机参数 + 修改干混机参数 + + + + + 数据上传 + 数据上传 + + + + 数据下达 + 数据下达 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊比例阀参数管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊比例阀参数管理.xml new file mode 100644 index 0000000..e910c40 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊比例阀参数管理.xml @@ -0,0 +1,57 @@ + + + + + + + 初始化比例阀参数 + 初始化比例阀参数 + + + + 修改比例阀参数 + 修改比例阀参数 + + + + + 数据上传 + 数据上传 + + + + 数据下达 + 数据下达 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量参数管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量参数管理.xml new file mode 100644 index 0000000..a04fbe5 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量参数管理.xml @@ -0,0 +1,57 @@ + + + + + + + 初始化称量参数 + 初始化称量参数 + + + + 修改称量参数 + 修改称量参数 + + + + + 数据上传 + 数据上传 + + + + 数据下达 + 数据下达 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 57b8c1f..d515e5e 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -31,6 +31,9 @@ + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormElectrical.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormElectrical.xml new file mode 100644 index 0000000..e9cee3c --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormElectrical.xml @@ -0,0 +1,224 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAIMAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAACSWQGCAAAAAbnvJblj7cBBQAAAAQAAAAGCQAAAAROYW1lBgoAAAAG5ZCN56ewAQYAAAAEAAAABgsAAAAFU3BlZWQGDAAAAAbpgJ/luqYL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[ElectricalSetting] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 786, 367 + 13 + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMkVENjI0RUQxMTVCRDkxMENGMjE4MDk0RjUxMDc5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据下发 + 宋体, 14.25pt, style=Bold + 278, 3 + MCButton7 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCMzkxNzBFMjA5RjU5MkNFQ0M0NDk4MjIwNEE0RkMwBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据上传 + 宋体, 14.25pt, style=Bold + 157, 3 + MCButton6 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0NUNDRkQ5QjZBMEI5MzMyRTcwMTcxNzFENkVFMUExBgYAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwBgcAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton1 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAUAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEE2MjkyOEY4MDY5QTNGRkRGNzUyOUFFNzEwMjYyMDc2BgYAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwBgcAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton5 + 70, 40 + 1 + + Top + 0, 0 + Panel2 + 786, 48 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAANAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton2 + 70, 40 + 1 + + Top + 0, 0 + Panel1 + 786, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0QTQ0Mjc4RkE2OTBDM0YxRDA5QjczNjUyMkU1QkNBBgYAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwBgcAAAAk5Yid5aeL5qaE6I+K5Y+Y6aKR55S15py65omL5Yqo5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 802, 454 + WindowsDefaultLocation + 榄菊变频电机手动速度 + Normal + + Tile + 宋体, 9pt + ControlText + FormElectrical + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMetage.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMetage.xml new file mode 100644 index 0000000..8f0de18 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMetage.xml @@ -0,0 +1,225 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABwAAAKEAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAoFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYLAAAAAklkBgwAAAAG57yW5Y+3AQUAAAAEAAAABg0AAAAETmFtZQYOAAAABuWQjeensAEGAAAABAAAAAYPAAAACUhpZ2hTcGVlZAYQAAAAEumrmOmAn+ensOmHj+mAn+W6pgEHAAAABAAAAAYRAAAACExvd1NwZWVkBhIAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQgAAAAEAAAABhMAAAAKV2VpZ2h0U2xvdwYUAAAACeaFouensOWAvAEJAAAABAAAAAYVAAAABlByZWN1dAYWAAAACeaPkOWJjemHjwEKAAAABAAAAAYXAAAAB0pvZ1RpbWUGGAAAAAnngrnliqjlgLwL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[MetageSetting] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 584, 314 + 13 + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMkVENjI0RUQxMTVCRDkxMENGMjE4MDk0RjUxMDc5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据下发 + 宋体, 14.25pt, style=Bold + 278, 3 + MCButton7 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCMzkxNzBFMjA5RjU5MkNFQ0M0NDk4MjIwNEE0RkMwBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据上传 + 宋体, 14.25pt, style=Bold + 157, 3 + MCButton6 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAVAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDc0NkFGM0YzNTQ2REQyQ0ZCRkFCMTIyNDNBNkZFNjFFBgYAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton1 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAWAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMEFFRTM0OUYyRjdGNUE2QURDMEI4RDQ3RDdCOEFBBgYAAAAS5L+u5pS556ew6YeP5Y+C5pWwBgcAAAAS5L+u5pS556ew6YeP5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton5 + 70, 40 + 1 + + Top + 0, 0 + Panel2 + 584, 48 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAANAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton2 + 70, 40 + 1 + + Top + 0, 0 + Panel1 + 584, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDc0NkFGM0YzNTQ2REQyQ0ZCRkFCMTIyNDNBNkZFNjFFBgYAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW56ew6YeP5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 600, 401 + WindowsDefaultLocation + 榄菊称量参数管理 + Normal + + Tile + 宋体, 9pt + ControlText + FormMetage + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormPressureSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormPressureSetting.xml index 7cb44a2..7256059 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormPressureSetting.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormPressureSetting.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAHYAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklkBgoAAAAG57yW5Y+3AQUAAAAEAAAABgsAAAAETmFtZQYMAAAABuWQjeensAEGAAAABAAAAAYNAAAACExvd0xpbWl0Bg4AAAAP5L2O5Y6L6K6+5a6a5YC8AQcAAAAEAAAABg8AAAAJSGlnaExpbWl0BhAAAAAP6auY5Y6L6K6+5a6a5YC8AQgAAAAEAAAABhEAAAAFQWxhcm0GEgAAAAzotoXljovmiqXoraYL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAHwAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklkBgoAAAAG57yW5Y+3AQUAAAAEAAAABgsAAAAETmFtZQYMAAAABuWQjeensAEGAAAABAAAAAYNAAAACExvd0xpbWl0Bg4AAAAP5L2O5Y6L6K6+5a6a5YC8AQcAAAAEAAAABg8AAAAJSGlnaExpbWl0BhAAAAAP6auY5Y6L6K6+5a6a5YC8AQgAAAAEAAAABhEAAAAKQWxhcm1WYWx1ZQYSAAAADOi2heWOi+aKpeitpgs= AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml new file mode 100644 index 0000000..94d2de6 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormProportionalSetting.xml @@ -0,0 +1,224 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAH8AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAACSWQGCAAAAAbnvJblj7cBBQAAAAQAAAAGCQAAAAROYW1lBgoAAAAG5ZCN56ewAQYAAAAEAAAABgsAAAACU1YGDAAAAAnorr7nva7lgLwL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[ProportionalSetting] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 595, 375 + 11 + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDIyMkVENjI0RUQxMTVCRDkxMENGMjE4MDk0RjUxMDc5BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据下发 + 宋体, 14.25pt, style=Bold + 278, 3 + MCButton7 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhCMzkxNzBFMjA5RjU5MkNFQ0M0NDk4MjIwNEE0RkMwBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 数据上传 + 宋体, 14.25pt, style=Bold + 157, 3 + MCButton6 + 115, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAATAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0NUNDRkQ5QjZBMEI5MzMyRTcwMTcxNzFENkVFMUExBgYAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwBgcAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton1 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAUAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEE2MjkyOEY4MDY5QTNGRkRGNzUyOUFFNzEwMjYyMDc2BgYAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwBgcAAAAV5L+u5pS55q+U5L6L6ZiA5Y+C5pWwCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton5 + 70, 40 + 1 + + Top + 0, 0 + Panel2 + 595, 48 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAANAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton2 + 70, 40 + 1 + + Top + 0, 0 + Panel1 + 595, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDU0NUNDRkQ5QjZBMEI5MzMyRTcwMTcxNzFENkVFMUExBgYAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwBgcAAAAY5Yid5aeL5YyW5q+U5L6L6ZiA5Y+C5pWwCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 611, 462 + WindowsDefaultLocation + 榄菊比例阀参数管理 + Normal + + Tile + 宋体, 9pt + ControlText + FormProportionalSetting + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml index 2b88921..5ecb034 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml @@ -32,7 +32,7 @@ Fill 0, 48 MCDataGridView1 - 584, 314 + 696, 418 9 @@ -140,7 +140,7 @@ Top 0, 0 Panel2 - 584, 48 + 696, 48 @@ -195,7 +195,7 @@ Top 0, 0 Panel1 - 584, 48 + 696, 48 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== @@ -213,7 +213,7 @@ False False Control - 600, 401 + 712, 505 WindowsDefaultLocation 榄菊设备参数重量管理 Normal diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index 0c406aa..d99f3ba 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -195,6 +195,14 @@ Designer PreserveNewest + + Designer + PreserveNewest + + + Designer + PreserveNewest + Designer PreserveNewest @@ -203,10 +211,18 @@ Designer PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest