From 65292edda5a02776ea04329c538195da15ee418e Mon Sep 17 00:00:00 2001 From: nodyang Date: Tue, 1 Aug 2023 08:44:25 +0800 Subject: [PATCH] =?UTF-8?q?0801=20=E6=96=B0=E7=9A=84=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjDry/DrySettingDb.cs | 28 +++ .../LjDry/InitDbAction.cs | 15 +- .../LjProdcutLine/AddAction.cs | 35 ++++ .../LjProdcutLine/DelAction.cs | 57 ++++++ .../LjProdcutLine/FrmProductLine.Designer.cs | 118 ++++++++++++ .../LjProdcutLine/FrmProductLine.cs | 110 ++++++++++++ .../LjProdcutLine/FrmProductLine.resx | 120 +++++++++++++ .../LjProdcutLine/InitDbAction.cs | 76 ++++++++ .../LjProdcutLine/ProductLineDb.cs | 59 ++++++ .../LjProdcutLine/ProductLineView.cs | 15 ++ .../LjProdcutLine/UpdateAction.cs | 63 +++++++ .../LjWeight/FrmWeight.Designer.cs | 44 +++-- .../Mesnac.Action.ChemicalWeighing.csproj | 16 ++ .../Test/TestAction.cs | 3 +- .../小料称量/榄菊产线管理.xml | 62 +++++++ Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 1 + .../MCProject/nodeForm/FormProductLine.xml | 169 ++++++++++++++++++ Main/MCEdit/MCEdit.csproj | 4 + 18 files changed, 962 insertions(+), 33 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/DrySettingDb.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/AddAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.resx create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/InitDbAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineView.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/UpdateAction.cs create mode 100644 Main/MCEdit/Data/EventConfig/小料称量/榄菊产线管理.xml create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/FormProductLine.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/DrySettingDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/DrySettingDb.cs new file mode 100644 index 0000000..05dd734 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/DrySettingDb.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Data; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjDry +{ + public class DrySettingDb:DBHelp + { + public static IList GetDry() + { + string sql = "select Id,Name from DrySetting "; + var dt = GetTable(sql); + IList ls = new List(); + foreach (DataRow dr in dt.Rows) + { + ls.Add(new MyNameValue() + { + Id = Convert.ToInt32(dr[0].ToString()), + Name = dr[1].ToString() + }); + + } + + return ls; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/InitDbAction.cs index 4d45028..2aae154 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/InitDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/InitDbAction.cs @@ -15,15 +15,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry 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; + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + UpAction.OnHandler -= Process_Event; + UpAction.OnHandler += Process_Event; + DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "DrySetting") diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/AddAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/AddAction.cs new file mode 100644 index 0000000..894ca68 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/AddAction.cs @@ -0,0 +1,35 @@ +using System; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + public class AddAction:ChemicalWeighingAction, IAction + { + public static event EventHandler OnAdd; + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + FrmProductLine frm = new FrmProductLine(); + DialogResult result = frm.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnAdd != null) + { + OnAdd(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/LjProdcutLine/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs new file mode 100644 index 0000000..6e0089a --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/DelAction.cs @@ -0,0 +1,57 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMixFormula; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + public class DelAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + public static event EventHandler OnDel; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_product_line") + .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 = dataGridViewRow.Cells["Id"].Value.ToString(); + this._runtime.BaseControl.MCEnabled = false; + if (MessageBox.Show("确定删除配方", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + ProductLineDb.Del(Convert.ToInt32(id)); + if (OnDel != null) + { + OnDel(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + } + this._runtime.BaseControl.MCEnabled = true; + + + + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs new file mode 100644 index 0000000..4dbc06f --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.Designer.cs @@ -0,0 +1,118 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + partial class FrmProductLine + { + /// + /// 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.btnOK = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.TxtName = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); + this.SuspendLayout(); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(136, 538); + this.btnOK.Margin = new System.Windows.Forms.Padding(8); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(147, 68); + this.btnOK.TabIndex = 66; + 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(123, 86); + this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(89, 18); + this.label3.TabIndex = 65; + this.label3.Text = "产线名称:"; + // + // TxtName + // + this.TxtName.Location = new System.Drawing.Point(245, 86); + this.TxtName.Margin = new System.Windows.Forms.Padding(8); + this.TxtName.Name = "TxtName"; + this.TxtName.Size = new System.Drawing.Size(192, 28); + this.TxtName.TabIndex = 68; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(396, 538); + this.btnCancel.Margin = new System.Windows.Forms.Padding(8); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(147, 68); + this.btnCancel.TabIndex = 67; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); + // + // checkedListBox1 + // + this.checkedListBox1.FormattingEnabled = true; + this.checkedListBox1.Location = new System.Drawing.Point(136, 196); + this.checkedListBox1.Name = "checkedListBox1"; + this.checkedListBox1.Size = new System.Drawing.Size(607, 303); + this.checkedListBox1.TabIndex = 69; + // + // FrmProductLine + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 781); + this.Controls.Add(this.checkedListBox1); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label3); + this.Controls.Add(this.TxtName); + this.Controls.Add(this.btnCancel); + this.Name = "FrmProductLine"; + this.Text = "产线配置"; + this.Load += new System.EventHandler(this.FrmProductLine_Load); + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox TxtName; + private System.Windows.Forms.Button btnCancel; + + #endregion + + private System.Windows.Forms.CheckedListBox checkedListBox1; + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs new file mode 100644 index 0000000..4834d0b --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using DevExpress.Office.Utils; +using Mesnac.Action.ChemicalWeighing.LjDry; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + public partial class FrmProductLine : Form + { + public FrmProductLine() + { + InitializeComponent(); + Init(); + } + + private int _id = 0; + public FrmProductLine(int id) : this() + { + ProductLineView view = ProductLineDb.GetById(id); + this.TxtName.Text = view.Name; + List checkstrs = view.DryId.Split(',') + .Select(x => Convert.ToInt32(x)).ToList(); + + for (int i = 0; i < checkedListBox1.Items.Count; i++) + { + for (int j = 0; j < checkstrs.Count(); j++) + { + int va = checkstrs[j]; + if (((MyNameValue)checkedListBox1.Items[i]).Id ==va) + { + checkedListBox1.SetItemChecked(i,true); + break; + } + } + } + } + + private void Init() + { + var myNameValues = DrySettingDb.GetDry(); + checkedListBox1.DataSource = myNameValues; + checkedListBox1.ValueMember = "Id"; + checkedListBox1.DisplayMember = "Name"; + + } + + private void FrmProductLine_Load(object sender, EventArgs e) + { + + + } + + + private void btnOK_Click(object sender, EventArgs e) + { + StringBuilder idSb = new StringBuilder(); + StringBuilder valSb = new StringBuilder(); + for (int i = 0, counti = checkedListBox1.Items.Count; i < counti; i++) + { + if (checkedListBox1.GetItemChecked(i)) + { + + valSb.AppendFormat("{0},", checkedListBox1.GetItemText(checkedListBox1.Items[i])); + + MyNameValue dv = ((MyNameValue)checkedListBox1.Items[i]); + idSb.AppendFormat("{0},",dv.Id); + + } + } + + if (idSb.Length == 0) + { + MessageBox.Show("请选择对应的设备"); + return; + } + + string ids = idSb.ToString().Substring(0, idSb.Length - 1); + string names = valSb.ToString().Substring(0, valSb.Length - 1); + + string name = TxtName.Text; + if (string.IsNullOrEmpty(name)) + { + MessageBox.Show("请填写名字"); + return; + } + + ProductLineView view = new ProductLineView() + { + Name = name, + DryName = names, + CreateTime = DateTime.Now, + DryId = ids + }; + + ProductLineDb.Add(view); + + 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/LjProdcutLine/FrmProductLine.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/FrmProductLine.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/LjProdcutLine/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/InitDbAction.cs new file mode 100644 index 0000000..804cd0c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/InitDbAction.cs @@ -0,0 +1,76 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + 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; + // + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + // + // + AddAction.OnAdd -= Process_Event; + AddAction.OnAdd += Process_Event; + + + DelAction.OnDel -= Process_Event; + DelAction.OnDel += Process_Event; + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_product_line") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id, Name, CreateTime, DryId, DryName from lj_product_line"); + + 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 + } +} + + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs new file mode 100644 index 0000000..fe8f35b --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineDb.cs @@ -0,0 +1,59 @@ +using System; +using System.Data; +using System.Runtime.CompilerServices; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + public class ProductLineDb:DBHelp + { + + public static void Add(ProductLineView view) + { + string sql = $"insert lj_product_line values ('{view.Name}',getdate(),'{view.DryId}','{view.DryName}')"; + ExecuteNonQuery(sql); + } + + /// + /// 根据Id去查询设备返回实体 + /// + /// + /// + public static ProductLineView GetById(int id) + { + ProductLineView view = new ProductLineView(); + string sql = $"select Id, Name, CreateTime, DryId, DryName from lj_product_line where Id={id}"; + DataTable dt = GetTable(sql); + if (dt.Rows.Count == 1) + { + var datarow = dt.Rows[0]; + view.Id = Convert.ToInt32(datarow["Id"]); + view.Name = datarow["Name"].ToString(); + view.CreateTime = Convert.ToDateTime(datarow["CreateTime"]); + view.DryId = datarow["DryId"].ToString(); + view.DryName = datarow["DryName"].ToString(); + + } + + return view; + + } + + /// + /// 通过Id去更新设备 + /// + /// + public static void Update(ProductLineView view) + { + string sql = $"update lj_product_line set Name='{view.Name}',DryId='{view.DryId}',DryName='{view.DryName}' from lj_product_line where Id={view.Id}"; + + ExecuteNonQuery(sql); + } + + public static void Del(int id) + { + string sql = string.Format($"delete from lj_product_line where id={id}"); + ExecuteNonQuery(sql); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineView.cs new file mode 100644 index 0000000..e70da53 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/ProductLineView.cs @@ -0,0 +1,15 @@ +using System; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + public class ProductLineView + { + //select Id, Name, CreateTime, DryId, DryName from lj_product_line; + + public int Id { get; set; } + public string Name { get; set; } + public DateTime CreateTime { get; set; } + public string DryId { get; set; } + public string DryName { get; set; } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/UpdateAction.cs new file mode 100644 index 0000000..275f066 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjProdcutLine/UpdateAction.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjProportional; + +namespace Mesnac.Action.ChemicalWeighing.LjProdcutLine +{ + 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, "lj_product_line") + .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); + + + + FrmProductLine frm = new FrmProductLine(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/FrmWeight.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs index 8b1f832..7336a9d 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/FrmWeight.Designer.cs @@ -44,38 +44,38 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight // 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.Location = new System.Drawing.Point(316, 176); + this.HighWeight.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.HighWeight.Name = "HighWeight"; - this.HighWeight.Size = new System.Drawing.Size(129, 21); + this.HighWeight.Size = new System.Drawing.Size(192, 28); 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.Location = new System.Drawing.Point(316, 99); + this.LowWeight.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.LowWeight.Name = "LowWeight"; - this.LowWeight.Size = new System.Drawing.Size(129, 21); + this.LowWeight.Size = new System.Drawing.Size(192, 28); 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.Location = new System.Drawing.Point(432, 380); + this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.Size = new System.Drawing.Size(147, 68); this.btnCancel.TabIndex = 56; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(115, 253); - this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Location = new System.Drawing.Point(172, 380); + this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.Size = new System.Drawing.Size(147, 68); this.btnOK.TabIndex = 55; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -84,36 +84,34 @@ namespace Mesnac.Action.ChemicalWeighing.LjWeight // 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.Location = new System.Drawing.Point(195, 176); + this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(71, 12); + this.label4.Size = new System.Drawing.Size(107, 18); 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.Location = new System.Drawing.Point(195, 99); + this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(71, 12); + this.label3.Size = new System.Drawing.Size(107, 18); this.label3.TabIndex = 54; - this.label3.Text = "底料位重量:"; // // FrmWeight // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(564, 532); + this.ClientSize = new System.Drawing.Size(846, 798); 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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmWeight"; - this.Text = "FrmWeight"; this.ResumeLayout(false); this.PerformLayout(); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 025b3d2..d2302df 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -226,6 +226,7 @@ + Form @@ -314,6 +315,18 @@ + + + + Form + + + FrmProductLine.cs + + + + + Form @@ -610,6 +623,9 @@ FrmPressureUpdate.cs + + FrmProductLine.cs + FrmProportional.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index ea924a5..6ee60e9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -9,6 +9,7 @@ using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.LjMetageFormula; using Mesnac.Action.ChemicalWeighing.LjMixFormula; +using Mesnac.Action.ChemicalWeighing.LjProdcutLine; using Mesnac.Basic; using Mesnac.Codd.Session; using Mesnac.Controls.Base; @@ -35,7 +36,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test // dbHelper.CommandText = sql; - FrmMixFormula frmMetageFormula = new FrmMixFormula(); + FrmProductLine frmMetageFormula = new FrmProductLine(2); frmMetageFormula.Show(); diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊产线管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊产线管理.xml new file mode 100644 index 0000000..cf6c19a --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊产线管理.xml @@ -0,0 +1,62 @@ + + + + + + + + 初始榄菊产线管理 + 榄菊产线管理 + + + 添加榄菊产线管理 + 添加榄菊产线管理 + + + + 修改榄菊产线管理 + 修改榄菊产线管理 + + + + 删除干湿混配方 + 删除干湿混配方 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index 7c001cf..2b603a3 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -38,6 +38,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormProductLine.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormProductLine.xml new file mode 100644 index 0000000..e34e986 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormProductLine.xml @@ -0,0 +1,169 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAGQAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAAETmFtZQYIAAAADOS6p+e6v+WQjeensAEFAAAABAAAAAYJAAAACkNyZWF0ZVRpbWUGCgAAAAbml7bpl7QBBgAAAAQAAAAGCwAAAAdEcnlOYW1lBgwAAAAG5py65Y+wCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[lj_product_line] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 804, 440 + 5 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAKAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg3RjE3OTlDMUNENUM1QjIwRDY0Q0RCRjFFRjVFQzFEBgYAAAAY5Yid5aeL5qaE6I+K5Lqn57q/566h55CGBgcAAAAS5qaE6I+K5Lqn57q/566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 229, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDYxQzg0NEIyMjcyMTQ0NThCOEE2MzIzNUVGRjU5MkM1BgYAAAAG5Yig6ZmkBgcAAAAG5Yig6ZmkCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 删除 + 宋体, 14.25pt, style=Bold + 155, 3 + MCButton3 + 70, 40 + 2 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI4MEFCRDNBMkI3MjQ2NkQ4OThDODBGMEE5ODE3NDUzBgYAAAAG5L+u5pS5BgcAAAAG5L+u5pS5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 宋体, 14.25pt, style=Bold + 81, 3 + MCButton2 + 70, 40 + 1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlBQkMyODQ3NEZDMTQ1NUQ5MEZEMjA3RkU0NEQ5MUQwBgYAAAAG5paw5aKeBgcAAAAG5paw5aKeCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 新增 + 宋体, 14.25pt, style=Bold + 7, 3 + MCButton1 + 70, 40 + 0 + + Top + 0, 0 + Panel1 + 804, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDg3RjE3OTlDMUNENUM1QjIwRDY0Q0RCRjFFRjVFQzFEBgYAAAAY5Yid5aeL5qaE6I+K5Lqn57q/566h55CGBgcAAAAS5qaE6I+K5Lqn57q/566h55CGCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 820, 527 + WindowsDefaultLocation + 榄菊产线管理 + Normal + + Tile + 宋体, 9pt + ControlText + FormProductLine + diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index 39777f5..e676a90 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -191,6 +191,10 @@ PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest