From fb8f844d46b13ffc36911d5db5a753cdd3010181 Mon Sep 17 00:00:00 2001 From: nodyang Date: Mon, 17 Jul 2023 10:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjDevice/DeviceHelp.cs | 9 ++ .../LjDevice/DeviceModel.cs | 9 ++ .../LjDevice/FrmDevice.Designer.cs | 105 +++++++++++++++ .../LjDevice/FrmDevice.cs | 46 +++++++ .../LjDevice/FrmDevice.resx | 120 ++++++++++++++++++ .../LjDevice/InitDbAction.cs | 61 +++++++++ .../LjDevice/UpdateAction.cs | 81 ++++++++++++ .../Mesnac.Action.ChemicalWeighing.csproj | 13 ++ Main/MCEdit/Data/ComponentAction.xml | 2 - .../小料称量/榄菊设备管理.xml | 38 ++++++ Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 4 +- .../Data/MCProject/nodeForm/FormDevice.xml | 116 ++++++++++------- Main/MCEdit/MCEdit.csproj | 4 + 13 files changed, 560 insertions(+), 48 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceHelp.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceModel.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.resx create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/InitDbAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/UpdateAction.cs create mode 100644 Main/MCEdit/Data/EventConfig/小料称量/榄菊设备管理.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceHelp.cs new file mode 100644 index 0000000..1b0f1b2 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceHelp.cs @@ -0,0 +1,9 @@ +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + public class DeviceHelp:DBHelp + { + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceModel.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceModel.cs new file mode 100644 index 0000000..e15f01a --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/DeviceModel.cs @@ -0,0 +1,9 @@ +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + public class DeviceModel + { + public int ID { get; set; } + public string Name { get; set; } + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs new file mode 100644 index 0000000..74408da --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs @@ -0,0 +1,105 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + partial class FrmDevice + { + /// + /// 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.txtDeviceName = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // txtDeviceName + // + this.txtDeviceName.Location = new System.Drawing.Point(200, 54); + this.txtDeviceName.Margin = new System.Windows.Forms.Padding(5); + this.txtDeviceName.Name = "txtDeviceName"; + this.txtDeviceName.Size = new System.Drawing.Size(175, 21); + this.txtDeviceName.TabIndex = 14; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(277, 145); + 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 = 13; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(80, 145); + 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 = 12; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(80, 57); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.TabIndex = 11; + this.label1.Text = "物料名称:"; + // + // FrmDevice + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(473, 450); + this.Controls.Add(this.txtDeviceName); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label1); + this.Name = "FrmDevice"; + this.Text = "设备管理"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.TextBox txtDeviceName; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label1; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.cs new file mode 100644 index 0000000..6339c89 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.cs @@ -0,0 +1,46 @@ +using System; +using System.Windows.Forms; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + public partial class FrmDevice : Form + { + public FrmDevice() + { + InitializeComponent(); + } + + private DeviceModel _deviceModel; + public FrmDevice(DeviceModel deviceModel):this() + { + _deviceModel = deviceModel; + this.txtDeviceName.Text = _deviceModel.Name; + this.txtDeviceName.MaxLength = 12; + } + + + + private void btnOK_Click(object sender, EventArgs e) + { + string name = this.txtDeviceName.Text.Trim(); + if (string.IsNullOrEmpty(name)) + { + this.txtDeviceName.Focus(); + MessageBox.Show("设备名称不能为空"); + return; + } + + string sql = $"update Device set [name]='{name}' where id={_deviceModel.ID}"; + DBHelp.ExecuteNonQuery(sql); + + this.DialogResult = DialogResult.OK; + + } + + private void btnCancel_Click_1(object sender, EventArgs e) + { + this.Close(); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.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/LjDevice/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/InitDbAction.cs new file mode 100644 index 0000000..57bd2eb --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/InitDbAction.cs @@ -0,0 +1,61 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + public class InitDbAction:ChemicalWeighingAction,IAction + { + + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + UpdateAction.OnUpdateHandler -= Process_Event; + UpdateAction.OnUpdateHandler += Process_Event; + + DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Device").FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + DataTable table = DeviceHelp.GetTable(@"select a.ID,a.Name,a.Coding,b.Name as BName from Device a +left join DeviceUnit b on a.deviceUnitId=b.Id"); + + 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/LjDevice/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/UpdateAction.cs new file mode 100644 index 0000000..379d0a7 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/UpdateAction.cs @@ -0,0 +1,81 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjDevice +{ + public class UpdateAction : ChemicalWeighingAction, IAction + { + private DbMCControl _clientGridControl = null; //用户列表控件 + + /// + /// 新增物料事件定义 + /// + public static event EventHandler OnUpdateHandler; + + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + DoWork(); + } + + private void DoWork() + { + + + + DbMCControl clientGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "Device").FirstOrDefault(); + + if (clientGridControl == null) + { + ICSharpCode.Core.LoggingService.Error("缺少物料信息列表控件..."); + return; + } + + this._clientGridControl = clientGridControl; + DataGridView clientGridView = this._clientGridControl.BaseControl as DataGridView; + + + //验证是否选中某物料 + if (clientGridView.SelectedRows.Count != 1) + { + string msg1 = "请选择一项要修改的设备!"; //请选择一项要修改的物料! + MessageBox.Show(msg1, Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, + MessageBoxIcon.Information); + this._runtime.IsReturn = true; + return; + } + + int id = (int)clientGridView.SelectedRows[0].Cells[0].Value; + var name = clientGridView.SelectedRows[0].Cells["name"].Value as string; + + this._runtime.BaseControl.MCEnabled = false; + FrmDevice frmInsertMaterial = new FrmDevice(new DeviceModel() + { + ID = id, + Name = name + }); + frmInsertMaterial.ShowDialog(this._runtime.BaseControl.MCRoot as Control); + if (frmInsertMaterial.DialogResult == DialogResult.OK) + { + if (OnUpdateHandler != null) + { + OnUpdateHandler(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frmInsertMaterial.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 13ddea5..1b52883 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -215,6 +215,16 @@ + + + + Form + + + FrmDevice.cs + + + Form @@ -474,6 +484,9 @@ FrmBin.cs + + FrmDevice.cs + FrmMaterial.cs diff --git a/Main/MCEdit/Data/ComponentAction.xml b/Main/MCEdit/Data/ComponentAction.xml index a975f7e..3714948 100644 --- a/Main/MCEdit/Data/ComponentAction.xml +++ b/Main/MCEdit/Data/ComponentAction.xml @@ -441,6 +441,4 @@ - - diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备管理.xml new file mode 100644 index 0000000..88695f9 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊设备管理.xml @@ -0,0 +1,38 @@ + + + + + + + + 初始化设备 + 初始化设备 + + + 修改设备 + 修改设备 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 1cce276..3c2620b 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -20,10 +20,7 @@ - - - @@ -31,6 +28,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDevice.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDevice.xml index 9e4753b..ab2c0c3 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDevice.xml @@ -1,18 +1,45 @@ - - - CWSS_PLC.DB100.PLC_ConnectState - sssStop - 16, 3 - StateButton1 - 50, 54 - - - - - Red - DarkGray + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAGoAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAJJZAYJAAAADOiuvuWkh+e8luWPtwEFAAAABAAAAAYKAAAABE5hbWUGCwAAAAzorr7lpIflkI3np7ABBgAAAAQAAAAGDAAAAAZDb2RpbmcGDQAAAAzorr7lpIfnvJbnoIEBBwAAAAQAAAAGDgAAAAVCTmFtZQYPAAAADOiuvuWkh+exu+WIqws= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[Device] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 824, 552 + 5 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDA2QkEwNDVGRjE4OEQyMjlGRDlERDEwOEM4NzE4RUUxBgYAAAAP5Yid5aeL5YyW6K6+5aSHBgcAAAAP5Yid5aeL5YyW6K6+5aSHCw== + False @@ -22,18 +49,22 @@ None True True - 系统急停 - 黑体, 9.75pt - ControlLightLight - 16, 149 - MCLabel171 - 63, 13 - - + True Red DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEY3ODFCOEZGOTM5MjY4ODIzRTkyMEQ1OUQwRTNENDU1BgYAAAAM5L+u5pS56K6+5aSHBgcAAAAM5L+u5pS56K6+5aSHCw== + False @@ -43,43 +74,42 @@ None True True - PLC连接状态 - 黑体, 9.75pt - ControlLightLight - 6, 62 - MCLabel154 - 84, 13 - - - ParametersWithPc.B1.EMStop - sssStop - 16, 92 - SystemStateShow1 - 55, 54 + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 5, 3 + MCButton2 + 70, 40 + 1 - 12, 63 - Panel2 - 93, 174 + Top + 0, 0 + Panel1 + 824, 48 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDA2QkEwNDVGRjE4OEQyMjlGRDlERDEwOEM4NzE4RUUxBgYAAAAP5Yid5aeL5YyW6K6+5aSHBgcAAAAP5Yid5aeL5YyW6K6+5aSHCw== - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL False False False Control - 1624, 1075 + 840, 639 WindowsDefaultLocation - 干混机湿混机糊化机 + 榄菊设备管理 Normal Tile diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index 44acbc6..412c947 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -207,6 +207,10 @@ Designer PreserveNewest + + Designer + PreserveNewest + PreserveNewest