From 8afe01f7524a5f996173723a876bd3062ac4df81 Mon Sep 17 00:00:00 2001 From: nodyang Date: Wed, 26 Jul 2023 16:16:58 +0800 Subject: [PATCH] demo --- .../LjMetageFormula/AddAction.cs | 35 ++ .../LjMetageFormula/DaybinMaterialDb.cs | 32 ++ .../LjMetageFormula/DelAction.cs | 58 +++ .../FrmMetageFormula.Designer.cs | 54 ++- .../LjMetageFormula/FrmMetageFormula.cs | 60 ++- .../LjMetageFormula/InItDbAction.cs | 73 +++ .../LjMetageFormula/SelectRecipe.cs | 47 ++ .../LjMetageFormula/StockMaterialDb.cs | 81 +++- .../LjMetageFormula/UpdateAction.cs | 57 +++ .../LjMetageFormula/WeightFormulaView.cs | 6 +- .../LjMixFormula/AddAction.cs | 35 ++ .../LjMixFormula/DelAction.cs | 57 +++ .../LjMixFormula/FrmMixFormula.Designer.cs | 422 +++++++++++++++++ .../LjMixFormula/FrmMixFormula.cs | 175 ++++++++ .../LjMixFormula/FrmMixFormula.resx | 126 ++++++ .../LjMixFormula/InItDbAction.cs | 71 +++ .../LjMixFormula/LjMixView.cs | 65 +++ .../LjMixFormula/MixDb.cs | 143 ++++++ .../LjMixFormula/SelectRecipe.cs | 48 ++ .../LjMixFormula/UpdateAction.cs | 57 +++ .../Mesnac.Action.ChemicalWeighing.csproj | 22 + .../Test/TestAction.cs | 11 +- .../榄菊干湿混配方管理.xml | 79 ++++ .../小料称量/榄菊称量配方管理.xml | 79 ++++ Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 2 + .../Data/MCProject/nodeForm/FormMix.xml | 257 +++++++++++ .../Data/MCProject/nodeForm/FormWeight.xml | 424 ++++++++++-------- Main/MCEdit/MCEdit.csproj | 8 + 28 files changed, 2357 insertions(+), 227 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/AddAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DaybinMaterialDb.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DelAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/InItDbAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/SelectRecipe.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/UpdateAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/AddAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/DelAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/InItDbAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/LjMixView.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/MixDb.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/SelectRecipe.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/UpdateAction.cs create mode 100644 Main/MCEdit/Data/EventConfig/小料称量/榄菊干湿混配方管理.xml create mode 100644 Main/MCEdit/Data/EventConfig/小料称量/榄菊称量配方管理.xml create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/FormMix.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/AddAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/AddAction.cs new file mode 100644 index 0000000..cbb26b3 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/AddAction.cs @@ -0,0 +1,35 @@ +using System; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + public class AddAction:ChemicalWeighingAction, IAction + { + public static event EventHandler OnAdd; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + FrmMetageFormula frm = new FrmMetageFormula(); + 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/LjMetageFormula/DaybinMaterialDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DaybinMaterialDb.cs new file mode 100644 index 0000000..f7ee08f --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DaybinMaterialDb.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Runtime.CompilerServices; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + public class DaybinMaterialDb : DBHelp + { + public static IList GetStockByMtypIdMId(int mtypeId, int mid) + { + IList myNameValues = new List(); + + string sql = $"select id, daybinname from lj_day_material where MTypeId={mtypeId} and MId={mid}"; + var dataTable = GetTable(sql); + foreach (DataRow dataTableRow in dataTable.Rows) + { + myNameValues.Add(new MyNameValue() + { + Id = Convert.ToInt32(dataTableRow[0]), + Name = dataTableRow[1].ToString() + }); + } + + return myNameValues; + } + + + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DelAction.cs new file mode 100644 index 0000000..eb87138 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/DelAction.cs @@ -0,0 +1,58 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + + + 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_metage") + .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) + { + StockMaterialDb.SoftDel(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/LjMetageFormula/FrmMetageFormula.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs index 09439bc..ec38b14 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs @@ -49,10 +49,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.No = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.MaterialName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DeviceName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Difference = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); @@ -173,7 +176,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.groupBox1.Controls.Add(this.dataGridView1); this.groupBox1.Location = new System.Drawing.Point(12, 276); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(572, 289); + this.groupBox1.Size = new System.Drawing.Size(611, 289); this.groupBox1.TabIndex = 22; this.groupBox1.TabStop = false; this.groupBox1.Text = "称量配方"; @@ -183,13 +186,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.No, this.MaterialName, this.Weight, this.Difference }); + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.No, this.MaterialName, this.DeviceName, this.Weight, this.Difference }); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(3, 17); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowHeadersWidth = 62; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(566, 269); + this.dataGridView1.Size = new System.Drawing.Size(605, 269); this.dataGridView1.TabIndex = 0; // // No @@ -197,6 +201,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.No.DataPropertyName = "No"; this.No.HeaderText = "序号"; this.No.MaxInputLength = 10; + this.No.MinimumWidth = 8; this.No.Name = "No"; this.No.ReadOnly = true; // @@ -205,13 +210,24 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.MaterialName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.MaterialName.DataPropertyName = "MaterialName"; this.MaterialName.HeaderText = "物料"; + this.MaterialName.MinimumWidth = 8; this.MaterialName.Name = "MaterialName"; this.MaterialName.ReadOnly = true; // + // DeviceName + // + this.DeviceName.DataPropertyName = "DeviceName"; + this.DeviceName.HeaderText = "存储设备名称"; + this.DeviceName.MinimumWidth = 8; + this.DeviceName.Name = "DeviceName"; + this.DeviceName.ReadOnly = true; + this.DeviceName.Width = 200; + // // Weight // this.Weight.DataPropertyName = "Weight"; this.Weight.HeaderText = "重量"; + this.Weight.MinimumWidth = 8; this.Weight.Name = "Weight"; this.Weight.ReadOnly = true; // @@ -219,6 +235,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // this.Difference.DataPropertyName = "Difference"; this.Difference.HeaderText = "公差"; + this.Difference.MinimumWidth = 8; this.Difference.Name = "Difference"; this.Difference.ReadOnly = true; // @@ -242,11 +259,36 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(323, 645); + 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 = 48; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(150, 645); + 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 = 47; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // // FrmMetageFormula // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(632, 635); + this.ClientSize = new System.Drawing.Size(632, 764); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Controls.Add(this.groupBox1); @@ -270,6 +312,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.PerformLayout(); } + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox txtName; @@ -295,6 +340,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula private System.Windows.Forms.DataGridView dataGridView1; private DataGridViewTextBoxColumn No; private DataGridViewTextBoxColumn MaterialName; + private DataGridViewTextBoxColumn DeviceName; private DataGridViewTextBoxColumn Weight; private DataGridViewTextBoxColumn Difference; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs index a4e62b8..c57b432 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs @@ -13,6 +13,35 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula public FrmMetageFormula() { InitializeComponent(); + Init(); + } + + /// + /// 14e1f7b1aee24c6cb59168ed0d48bbf9 测试使用 + /// + /// + public FrmMetageFormula(string id) : this() + { + view.Id = id; + view = StockMaterialDb.GetById(id); + this.txtName.Text = view.Name; + + foreach (MyNameValue drpTypeItem in DrpType.Items) + { + if (drpTypeItem.Id == view.MtypeId) + { + DrpType.SelectedItem = drpTypeItem; + break; + } + } + + this.dataGridView1.DataSource = null; + this.dataGridView1.DataSource = view.DataGrid; + + } + + private void Init() + { DrpType.ValueMember = "Id"; DrpType.DisplayMember = "Name"; @@ -22,14 +51,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula comboBox2.ValueMember = "Id"; comboBox2.DisplayMember = "Name"; - - Init(); - this.dataGridView1.AutoGenerateColumns = false; - } - - private void Init() - { var drpMtype = MaterialInfoTypeHelp.GetType(); this.DrpType.DataSource = drpMtype; @@ -125,13 +147,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula MessageBox.Show("请添加相同的物料 请删除后重试"); return; } - + + view.Name = txtNameValue; view.DataGrid.Add(new WeightMaterilaData() { + MId = (int)this.comboBox1.SelectedValue, MaterialName = comboBox1.Text, Difference = deff, - Weight = weigh + Weight = weigh, + DeviceId = (int) this.comboBox2.SelectedValue, + DeviceName = this.comboBox2.Text }); view.SetNo(); @@ -158,5 +184,21 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.dataGridView1.DataSource = view.DataGrid; } } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + if (view.DataGrid.Count == 0) + { + MessageBox.Show("请添加配方"); + return; + } + + StockMaterialDb.AddOrUpdate(view); + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/InItDbAction.cs new file mode 100644 index 0000000..4e1c711 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/InItDbAction.cs @@ -0,0 +1,73 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + public class InItDbAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + AddAction.OnAdd -= Process_Event; + AddAction.OnAdd += Process_Event; + + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + + DelAction.OnDel -= Process_Event; + DelAction.OnDel += Process_Event; + + + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_metage") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + + #endregion + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id,id, name, createtime, updatetime, isenable, remark from lj_metage where IsEnable=1"); + + + + 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..."); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/SelectRecipe.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/SelectRecipe.cs new file mode 100644 index 0000000..62c732c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/SelectRecipe.cs @@ -0,0 +1,47 @@ +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + public class SelectRecipe:ChemicalWeighingAction, IAction + { + private DbMCControl _recipeGridControl = null; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须要调用的 + this._runtime = runtime; + + DbMCControl recipeGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_metage").FirstOrDefault(); + + this._recipeGridControl = recipeGridControl; + DoWork(); + } + + protected void DoWork() + { + + #region 1 判断是否选择了一条配方并显示物料信息 + + DataGridView recipeGridView = this._recipeGridControl.BaseControl as DataGridView; + if (recipeGridView.SelectedRows.Count == 1) + { + string id = recipeGridView.SelectedRows[0].Cells["Id"].Value as string; + + DbMCControl recipeGridControlDetail = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_metage_detail").FirstOrDefault(); + DataGridView recipeGrid = recipeGridControlDetail.BaseControl as DataGridView; + var metageDetailById = StockMaterialDb.GetMetageDetailById(id); + + + // recipeGrid.AutoGenerateColumns = false; + + recipeGridControlDetail.BaseControl.BindDataSource = null; + recipeGridControlDetail.BaseControl.BindDataSource = metageDetailById; + + } + + #endregion + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs index d8410d6..65ec1db 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/StockMaterialDb.cs @@ -2,7 +2,9 @@ using System.Collections.Generic; using System.Data; using System.Runtime.CompilerServices; +using System.Windows.Forms; using DevExpress.DataProcessing; +using DevExpress.XtraEditors.CodedUISupport; using Mesnac.Action.ChemicalWeighing.LjMaterial; namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula @@ -26,27 +28,82 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula return myNameValues; } - } + + + public static int AddOrUpdate(WeightFormulaView view) + { + string sql = $"select count(Id) as a from lj_metage where Id='{view.Id}'"; + var s = Convert.ToInt32(GetTable(sql).Rows[0][0]); + if (s > 0) + { + sql = $"delete from lj_metage_detail where MetageId='{view.Id}'"; + ExecuteNonQuery(sql); + sql = $"update lj_metage set UpdateTime=getdate(),Name='{view.Name}' where Id='{view.Id}'"; + ExecuteNonQuery(sql); + } + else + { + sql = $"insert into lj_metage values ('{view.Id}','{view.Name}',getdate(),getdate(),1,'',{view.MtypeId})"; + ExecuteNonQuery(sql); + } + List listSql = new List(); + foreach (var weightMaterilaData in view.DataGrid) + { + string sqy = + $"insert into lj_metage_detail values ('{view.Id}',{view.MtypeId},{weightMaterilaData.MId}," + + $"'{weightMaterilaData.MaterialName}',{weightMaterilaData.Weight},{weightMaterilaData.Difference},{weightMaterilaData.DeviceId},'{weightMaterilaData.DeviceName}')"; + ExecuteNonQuery(sqy); + } - public class DaybinMaterialDb : DBHelp - { - public static IList GetStockByMtypIdMId(int mtypeId, int mid) + return 1; + + } + + + + public static void SoftDel(string id) { - IList myNameValues = new List(); + string sql = $"delete from lj_metage where IsEnable=0 where id='{id}'"; + ExecuteNonQuery(sql); + } - string sql = $"select id, daybinname from lj_day_material where MTypeId={mtypeId} and MId={mid}"; - var dataTable = GetTable(sql); - foreach (DataRow dataTableRow in dataTable.Rows) + public static WeightFormulaView GetById(string id) + { + WeightFormulaView view = new WeightFormulaView(); + view.Id = id; + DataTable dt = + GetTable( + $"select Id, Name, CreateTime, UpdateTime, IsEnable, Remark, MTypeId from lj_metage where Id='{id}'"); + var o = dt.Rows[0]; + view.Name = o["Name"].ToString(); + view.MtypeId = Convert.ToInt32(o["MTypeId"]); + + dt = GetTable( + $"select Id, MetageId, MTypeId, MId, MName, Weight, Difference, DeviceId, DeviceName from lj_metage_detail where MetageId='{view.Id}'"); + + foreach (DataRow dtRow in dt.Rows) { - myNameValues.Add(new MyNameValue() + view.DataGrid.Add(new WeightMaterilaData() { - Id = Convert.ToInt32(dataTableRow[0]), - Name = dataTableRow[1].ToString() + DeviceId = Convert.ToInt32(dtRow["DeviceId"]), + DeviceName =dtRow["DeviceName"].ToString(), + Difference = Convert.ToSingle(dtRow["Difference"]), + MId = Convert.ToInt32(dtRow["MId"]), + MaterialName = dtRow["MName"].ToString(), + Weight = Convert.ToSingle(dtRow["Weight"]), }); } + view.SetNo(); + return view; - return myNameValues; + } + + + public static DataTable GetMetageDetailById(string id) + { + return GetTable( + $"select Id, MetageId, MTypeId, MId, MName, Weight , Difference , DeviceId, DeviceName from lj_metage_detail where MetageId='{id}'"); } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/UpdateAction.cs new file mode 100644 index 0000000..a6706fb --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/UpdateAction.cs @@ -0,0 +1,57 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula +{ + public class UpdateAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + public static event EventHandler OnUpdate; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_metage") + .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(); + + FrmMetageFormula frm = new FrmMetageFormula(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/LjMetageFormula/WeightFormulaView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/WeightFormulaView.cs index 9abacc7..2eb27e7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/WeightFormulaView.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/WeightFormulaView.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula { - internal class WeightFormulaView + public class WeightFormulaView { public WeightFormulaView() { @@ -45,5 +45,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula public float Weight { get; set; } public float Difference { get; set; } + public int DeviceId { get; set; } + + public string DeviceName { get; set; } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/AddAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/AddAction.cs new file mode 100644 index 0000000..6545a3c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/AddAction.cs @@ -0,0 +1,35 @@ + +using System; +using System.Windows.Forms; +using Mesnac.Action.Base; +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class AddAction:ChemicalWeighingAction, IAction + { + public static event EventHandler OnAdd; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + FrmMixFormula frm = new FrmMixFormula(); + 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/LjMixFormula/DelAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/DelAction.cs new file mode 100644 index 0000000..60e3764 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/DelAction.cs @@ -0,0 +1,57 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMetageFormula; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + 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_metage") + .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) + { + MixDb.SoftDel(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/LjMixFormula/FrmMixFormula.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs new file mode 100644 index 0000000..004b0db --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.Designer.cs @@ -0,0 +1,422 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + partial class FrmMixFormula + { + /// + /// 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.button2 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.txtName = new System.Windows.Forms.TextBox(); + this.txtDifference = new System.Windows.Forms.TextBox(); + this.TxtSendTime = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.DrpDeviceUnit = new System.Windows.Forms.ComboBox(); + this.DrpAction = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txtTemperature = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.txtSpeed = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.txtWeight = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.No = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MaterialName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DeviceName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Temperature = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Speed = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Difference = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(463, 497); + this.button2.Margin = new System.Windows.Forms.Padding(4); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(112, 34); + this.button2.TabIndex = 35; + this.button2.Text = "删除动作"; + this.button2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(143, 497); + this.button1.Margin = new System.Windows.Forms.Padding(4); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(112, 34); + this.button1.TabIndex = 36; + this.button1.Text = "添加动作"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // txtName + // + this.txtName.Location = new System.Drawing.Point(265, 55); + 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 = 32; + // + // txtDifference + // + this.txtDifference.Location = new System.Drawing.Point(267, 419); + this.txtDifference.Margin = new System.Windows.Forms.Padding(8); + this.txtDifference.Name = "txtDifference"; + this.txtDifference.Size = new System.Drawing.Size(192, 28); + this.txtDifference.TabIndex = 33; + // + // TxtSendTime + // + this.TxtSendTime.Location = new System.Drawing.Point(267, 229); + this.TxtSendTime.Margin = new System.Windows.Forms.Padding(8); + this.TxtSendTime.Name = "TxtSendTime"; + this.TxtSendTime.Size = new System.Drawing.Size(192, 28); + this.TxtSendTime.TabIndex = 34; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(143, 55); + this.label6.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(89, 18); + this.label6.TabIndex = 31; + this.label6.Text = "配方名称:"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(145, 419); + this.label5.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 18); + this.label5.TabIndex = 30; + this.label5.Text = "公差:"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(145, 229); + this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 18); + this.label4.TabIndex = 29; + this.label4.Text = "时间:"; + // + // DrpDeviceUnit + // + this.DrpDeviceUnit.FormattingEnabled = true; + this.DrpDeviceUnit.Location = new System.Drawing.Point(265, 110); + this.DrpDeviceUnit.Margin = new System.Windows.Forms.Padding(4); + this.DrpDeviceUnit.Name = "DrpDeviceUnit"; + this.DrpDeviceUnit.Size = new System.Drawing.Size(180, 26); + this.DrpDeviceUnit.TabIndex = 26; + this.DrpDeviceUnit.SelectedIndexChanged += new System.EventHandler(this.DrpDeviceUnit_SelectedIndexChanged); + // + // DrpAction + // + this.DrpAction.FormattingEnabled = true; + this.DrpAction.Location = new System.Drawing.Point(265, 163); + this.DrpAction.Margin = new System.Windows.Forms.Padding(4); + this.DrpAction.Name = "DrpAction"; + this.DrpAction.Size = new System.Drawing.Size(180, 26); + this.DrpAction.TabIndex = 28; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(143, 117); + 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 = 24; + this.label3.Text = "配方类型:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(143, 167); + this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(53, 18); + this.label1.TabIndex = 25; + this.label1.Text = "动作:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(145, 273); + this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 18); + this.label2.TabIndex = 29; + this.label2.Text = "温度:"; + // + // txtTemperature + // + this.txtTemperature.Location = new System.Drawing.Point(267, 273); + this.txtTemperature.Margin = new System.Windows.Forms.Padding(8); + this.txtTemperature.Name = "txtTemperature"; + this.txtTemperature.Size = new System.Drawing.Size(192, 28); + this.txtTemperature.TabIndex = 34; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(145, 317); + this.label7.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(53, 18); + this.label7.TabIndex = 29; + this.label7.Text = "速度:"; + // + // txtSpeed + // + this.txtSpeed.Location = new System.Drawing.Point(267, 317); + this.txtSpeed.Margin = new System.Windows.Forms.Padding(8); + this.txtSpeed.Name = "txtSpeed"; + this.txtSpeed.Size = new System.Drawing.Size(192, 28); + this.txtSpeed.TabIndex = 34; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(145, 361); + this.label8.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(53, 18); + this.label8.TabIndex = 29; + this.label8.Text = "重量:"; + // + // txtWeight + // + this.txtWeight.Location = new System.Drawing.Point(267, 361); + this.txtWeight.Margin = new System.Windows.Forms.Padding(8); + this.txtWeight.Name = "txtWeight"; + this.txtWeight.Size = new System.Drawing.Size(192, 28); + this.txtWeight.TabIndex = 34; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.dataGridView1); + this.groupBox1.Location = new System.Drawing.Point(61, 575); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(1228, 434); + this.groupBox1.TabIndex = 37; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "称量配方"; + // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.No, this.MaterialName, this.DeviceName, this.Temperature, this.Speed, this.Weight, this.Difference }); + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(4, 25); + this.dataGridView1.Margin = new System.Windows.Forms.Padding(4); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowHeadersWidth = 62; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1220, 405); + this.dataGridView1.TabIndex = 0; + // + // No + // + this.No.DataPropertyName = "No"; + this.No.HeaderText = "序号"; + this.No.MaxInputLength = 10; + this.No.MinimumWidth = 8; + this.No.Name = "No"; + this.No.ReadOnly = true; + this.No.Width = 150; + // + // MaterialName + // + this.MaterialName.DataPropertyName = "ActionName"; + this.MaterialName.HeaderText = "动作"; + this.MaterialName.MinimumWidth = 8; + this.MaterialName.Name = "MaterialName"; + this.MaterialName.ReadOnly = true; + this.MaterialName.Width = 200; + // + // DeviceName + // + this.DeviceName.DataPropertyName = "SecondTime"; + this.DeviceName.HeaderText = "时间"; + this.DeviceName.MinimumWidth = 8; + this.DeviceName.Name = "DeviceName"; + this.DeviceName.ReadOnly = true; + this.DeviceName.Width = 200; + // + // Temperature + // + this.Temperature.DataPropertyName = "Temperature"; + this.Temperature.HeaderText = "温度"; + this.Temperature.MinimumWidth = 8; + this.Temperature.Name = "Temperature"; + this.Temperature.ReadOnly = true; + this.Temperature.Width = 150; + // + // Speed + // + this.Speed.DataPropertyName = "Speed"; + this.Speed.HeaderText = "速度"; + this.Speed.MinimumWidth = 8; + this.Speed.Name = "Speed"; + this.Speed.ReadOnly = true; + this.Speed.Width = 150; + // + // Weight + // + this.Weight.DataPropertyName = "Weight"; + this.Weight.HeaderText = "重量"; + this.Weight.MinimumWidth = 8; + this.Weight.Name = "Weight"; + this.Weight.ReadOnly = true; + this.Weight.Width = 150; + // + // Difference + // + this.Difference.DataPropertyName = "Difference"; + this.Difference.HeaderText = "公差"; + this.Difference.MinimumWidth = 8; + this.Difference.Name = "Difference"; + this.Difference.ReadOnly = true; + this.Difference.Width = 150; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(524, 1134); + 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 = 50; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(265, 1134); + 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 = 49; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // FrmMixFormula + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1373, 1328); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.txtName); + this.Controls.Add(this.txtDifference); + this.Controls.Add(this.txtWeight); + this.Controls.Add(this.txtSpeed); + this.Controls.Add(this.txtTemperature); + this.Controls.Add(this.label8); + this.Controls.Add(this.TxtSendTime); + this.Controls.Add(this.label7); + this.Controls.Add(this.label6); + this.Controls.Add(this.label2); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.DrpDeviceUnit); + this.Controls.Add(this.DrpAction); + this.Controls.Add(this.label3); + this.Controls.Add(this.label1); + this.Name = "FrmMixFormula"; + this.Text = "混合配方"; + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + + private System.Windows.Forms.DataGridViewTextBoxColumn Temperature; + private System.Windows.Forms.DataGridViewTextBoxColumn Speed; + + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn No; + private System.Windows.Forms.DataGridViewTextBoxColumn MaterialName; + private System.Windows.Forms.DataGridViewTextBoxColumn DeviceName; + private System.Windows.Forms.DataGridViewTextBoxColumn Weight; + private System.Windows.Forms.DataGridViewTextBoxColumn Difference; + + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtTemperature; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox txtSpeed; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox txtWeight; + + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox txtName; + private System.Windows.Forms.TextBox txtDifference; + private System.Windows.Forms.TextBox TxtSendTime; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox DrpDeviceUnit; + private System.Windows.Forms.ComboBox DrpAction; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label1; + + #endregion + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.cs new file mode 100644 index 0000000..c1d8268 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.cs @@ -0,0 +1,175 @@ +using System; +using System.Collections.Generic; +using System.Windows.Forms; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public partial class FrmMixFormula : Form + { + private LjMixView _view = new LjMixView(); + public FrmMixFormula() + { + InitializeComponent(); + Init(); + } + + public FrmMixFormula(string id) : this() + { + _view = MixDb.GetById(id); + } + + + private void Init() + { + DrpDeviceUnit.ValueMember = "Id"; + DrpDeviceUnit.DisplayMember = "Name"; + + DrpAction.ValueMember = "Id"; + DrpAction.DisplayMember = "Name"; + + IList drpList = MixDb.GetDeviceUnit(); + DrpDeviceUnit.DataSource = drpList; + } + + private void DrpDeviceUnit_SelectedIndexChanged(object sender, EventArgs e) + { + IList drpList = MixDb.GetActionByDeviceUnit(Convert.ToInt32(DrpDeviceUnit.SelectedValue)); + DrpAction.DataSource = drpList; + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void button1_Click(object sender, EventArgs e) + { + bool isShiHun = false; + string name = txtName.Text.Trim(); + if (string.IsNullOrEmpty(name)) + { + txtName.Focus(); + MessageBox.Show("请输入配方名称"); + return; + } + _view.Name = name; + + int deviceUnitId = Convert.ToInt32(DrpDeviceUnit.SelectedValue); + if (deviceUnitId == 3) + { + isShiHun = true; + } + + int actionId = (int)DrpAction.SelectedValue; + string actionName = DrpAction.Text; + + + LjMixDetailView viewDetail = new LjMixDetailView(); + + if (_view.DeviceUnitId == 0) + { + _view.DeviceUnitId = deviceUnitId; + + } + else + { + if (_view.DeviceUnitId != deviceUnitId) + { + MessageBox.Show("请选择相同的设备"); + return; + } + } + + _view.DeviceUnitName = DrpDeviceUnit.Text; + _view.CreateTime=DateTime.Now; + + + + if (!int.TryParse(TxtSendTime.Text.Trim(), out int send)) + { + TxtSendTime.Focus(); + MessageBox.Show("请输入正确的时间"); + return; + } + + viewDetail.ActionId = (int)DrpAction.SelectedValue; + viewDetail.ActionName = DrpAction.Text; + viewDetail.MixId = _view.Id; + viewDetail.SecondTime = send; + + + if (!float.TryParse(txtTemperature.Text.Trim(), out float temperature)) + { + txtTemperature.Focus(); + MessageBox.Show("请输入正确的温度"); + return; + } + + viewDetail.Temperature = temperature; + + if (!float.TryParse(txtSpeed.Text.Trim(), out float speed)) + { + txtSpeed.Focus(); + MessageBox.Show("请输入正确的速度"); + return; + } + viewDetail.Speed = speed; + + viewDetail.Weight = 0; + if (isShiHun) + { + if (!float.TryParse(txtWeight.Text.Trim(), out float weight)) + { + txtWeight.Focus(); + MessageBox.Show("请输入正确的重量"); + return; + } + viewDetail.Weight = 0; + } + + + + viewDetail.Difference = 0; + if (isShiHun) + { + if (!float.TryParse(txtDifference.Text.Trim(), out float difference)) + { + txtDifference.Focus(); + MessageBox.Show("请输入正确的公差"); + return; + } + viewDetail.Difference = difference; + } + + _view.AddData(viewDetail); + this.dataGridView1.AutoGenerateColumns = false; + this.dataGridView1.DataSource = null; + this.dataGridView1.DataSource = _view.Data; + Clean(); + + + } + + private void Clean() + { + txtDifference.Text = string.Empty; + txtWeight.Text = string.Empty; + txtSpeed.Text = string.Empty; + TxtSendTime.Text = string.Empty; + txtTemperature.Text = string.Empty; + + } + + private void btnOK_Click(object sender, EventArgs e) + { + + if (_view.Data.Count == 0) + { + MessageBox.Show("请添加配方动作"); + return; + } + MixDb.Save(_view); + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx new file mode 100644 index 0000000..2ea61cd --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/FrmMixFormula.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/InItDbAction.cs new file mode 100644 index 0000000..77276ad --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/InItDbAction.cs @@ -0,0 +1,71 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class InItDbAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + // + AddAction.OnAdd -= Process_Event; + AddAction.OnAdd += Process_Event; + // + UpdateAction.OnUpdate -= Process_Event; + UpdateAction.OnUpdate += Process_Event; + + + DelAction.OnDel -= Process_Event; + DelAction.OnDel += Process_Event; + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_mix") + .FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + #region 事件处理方法 + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + + #endregion + + private void FileControl() + { + DataTable table = + DBHelp.GetTable(@"select Id, Name, CreateTime, UpdateTime, Remark, DeviceUnitId, DeviceUnitName from lj_mix where IsEnable=1"); + + + + 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..."); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/LjMixView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/LjMixView.cs new file mode 100644 index 0000000..43a9037 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/LjMixView.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class LjMixView + { + + public LjMixView() + { + this.Id = Guid.NewGuid().ToString("N"); + Data = new List(); + } + + public string Id { get; set; } + + public string Name { get; set; } + + public DateTime CreateTime { get; set; } + + public DateTime UpdateTime { get; set; } + + public string Remark { get; set; } + + public int DeviceUnitId { get; set; } + + public string DeviceUnitName { get; set; } + + public void AddData(LjMixDetailView detailView) + { + this.Data.Add(detailView); + } + + + public IList Data { get; set; } + } + + + + public class LjMixDetailView + { + public int Id { get; set; } + + public string MixId { get; set; } + + public int ActionId { get; set; } + + public string ActionName { get; set; } + + public int SecondTime { get; set; } + + public float Temperature { get; set; } + + public float Speed { get; set; } + + public float Weight { get; set; } + + public float Difference { get; set; } + + public string Remark { get; set; } + } + + + +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/MixDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/MixDb.cs new file mode 100644 index 0000000..9cb30fd --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/MixDb.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Runtime.CompilerServices; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class MixDb:DBHelp + { + + + public static IList GetActionByDeviceUnit(int unitId) + { + IList myNameValues = new List(); + + string sql = $"select Id,ActionName from ActionCode where DeviceUnitId={unitId}"; + var dataTable = GetTable(sql); + foreach (DataRow dataTableRow in dataTable.Rows) + { + myNameValues.Add(new MyNameValue() + { + Id = Convert.ToInt32(dataTableRow[0]), + Name = dataTableRow[1].ToString() + }); + } + + return myNameValues; + } + + + public static DataTable GetDetailByMId(string id) + { + string sql = $"select Id, MixId, ActionId, ActionName, SecondTime, Temperature, Speed, Weight, Difference, Remark from lj_mix_detail where MixId='{id}'"; + return GetTable(sql); + } + + // + public static IList GetDeviceUnit() + { + IList myNameValues = new List(); + + string sql = $"select Id,Name from DeviceUnit"; + var dataTable = GetTable(sql); + foreach (DataRow dataTableRow in dataTable.Rows) + { + myNameValues.Add(new MyNameValue() + { + Id = Convert.ToInt32(dataTableRow[0]), + Name = dataTableRow[1].ToString() + }); + } + + return myNameValues; + } + + public static void SoftDel(string id) + { + string sql = $"update lj_mix Set IsEnable=0 where id='{id}'"; + ExecuteNonQuery(sql); + } + + public static LjMixView GetById(string id) + { + string sql = + $"select Id, Name, CreateTime, UpdateTime, Remark, DeviceUnitId, DeviceUnitName from lj_mix where Id='{id}'"; + var dataTable = GetTable(sql); + LjMixView view = new LjMixView(); + view.Data = new List() ; + if (dataTable.Rows.Count == 1) + { + var datarow = dataTable.Rows[0]; + view.Id = id; + view.DeviceUnitId = Convert.ToInt32(datarow["DeviceUnitId"]); + view.DeviceUnitName = datarow["DeviceUnitName"].ToString(); + view.CreateTime = Convert.ToDateTime(datarow["CreateTime"]); + view.UpdateTime = Convert.ToDateTime(datarow["UpdateTime"]); + view.Name = datarow["Name"].ToString(); + + + } + + sql = $"select Id, MixId, ActionId, ActionName, SecondTime, Temperature, Speed, Weight, Difference, Remark from lj_mix_detail where MixId='{id}'"; + dataTable = GetTable(sql); + foreach (DataRow dataTableRow in dataTable.Rows) + { + LjMixDetailView v = new LjMixDetailView() + { + Id = Convert.ToInt32(dataTableRow["Id"]), + MixId = id, + ActionId = Convert.ToInt32(dataTableRow["ActionId"]), + ActionName = dataTableRow["ActionName"].ToString(), + SecondTime = Convert.ToInt32(dataTableRow["SecondTime"]), + Temperature = Convert.ToSingle(dataTableRow["Temperature"]), + Speed = Convert.ToSingle(dataTableRow["Speed"]), + Weight = Convert.ToSingle(dataTableRow["Weight"]), + Difference = Convert.ToSingle(dataTableRow["Difference"]), + Remark = dataTableRow["Remark"].ToString() + }; + view.Data.Add(v); + } + + return view; + + } + + public static void Save(LjMixView view) + { + string mixId = view.Id; + + string sql = $"select count(id) as a from lj_mix where Id='{mixId}'"; + var dataTable = GetTable(sql); + var count = Convert.ToInt32(dataTable.Rows[0][0]); + if (count == 0) + { + //添加 + + sql = "insert into lj_mix (Id, Name, CreateTime, UpdateTime, Remark, DeviceUnitId, DeviceUnitName) " + + $" values ('{mixId}','{view.Name}',getdate(),getdate(),'',{view.DeviceUnitId},'{view.DeviceUnitName}');"; + + ExecuteNonQuery(sql); + } + else + { + sql = $"update lj_mix set Name='{view.Name}',UpdateTime=getdate(),DeviceUnitId={view.DeviceUnitId},DeviceUnitName='{view.DeviceUnitName}' where id='{view.Id}'"; + ExecuteNonQuery(sql); + } + + sql = $"delete from lj_mix_detail where MixId='{mixId}'"; + ExecuteNonQuery(sql); + + foreach (var ljMixDetailView in view.Data) + { + sql = + "insert into lj_mix_detail (MixId, ActionId, ActionName, SecondTime, Temperature, Speed, Weight, Difference, Remark)" + + $" values ('{mixId}',{ljMixDetailView.ActionId},'{ljMixDetailView.ActionName}',{ljMixDetailView.SecondTime},{ljMixDetailView.Temperature},{ljMixDetailView.Speed},{ljMixDetailView.Weight},{ljMixDetailView.Difference},'');"; + + ExecuteNonQuery(sql); + } + } + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/SelectRecipe.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/SelectRecipe.cs new file mode 100644 index 0000000..6f0dd6f --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/SelectRecipe.cs @@ -0,0 +1,48 @@ + +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class SelectRecipe:ChemicalWeighingAction, IAction + { + private DbMCControl _recipeGridControl; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须要调用的 + this._runtime = runtime; + + DbMCControl recipeGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_mix").FirstOrDefault(); + + this._recipeGridControl = recipeGridControl; + DoWork(); + } + + protected void DoWork() + { + + #region 1 判断是否选择了一条配方并显示物料信息 + + DataGridView recipeGridView = this._recipeGridControl.BaseControl as DataGridView; + if (recipeGridView.SelectedRows.Count == 1) + { + string id = recipeGridView.SelectedRows[0].Cells["Id"].Value as string; + + DbMCControl recipeGridControlDetail = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_mix_detail").FirstOrDefault(); + + var metageDetailById = MixDb.GetDetailByMId(id); + + + // recipeGrid.AutoGenerateColumns = false; + + recipeGridControlDetail.BaseControl.BindDataSource = null; + recipeGridControlDetail.BaseControl.BindDataSource = metageDetailById; + + } + + #endregion + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/UpdateAction.cs new file mode 100644 index 0000000..d8adb56 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixFormula/UpdateAction.cs @@ -0,0 +1,57 @@ + +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +namespace Mesnac.Action.ChemicalWeighing.LjMixFormula +{ + public class UpdateAction:ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + public static event EventHandler OnUpdate; + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + DbMCControl materialGridControl = + this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "lj_mix") + .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(); + + FrmMixFormula frm = new FrmMixFormula(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/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 39a10bd..025b3d2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -261,13 +261,19 @@ + + + Form FrmMetageFormula.cs + + + @@ -282,6 +288,19 @@ + + + + Form + + + FrmMixFormula.cs + + + + + + Form @@ -585,6 +604,9 @@ FrmMetage.cs + + FrmMixFormula.cs + FrmPressureUpdate.cs diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs index a6c5227..ea924a5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs @@ -8,6 +8,7 @@ using ICSharpCode.Core; using Mesnac.Action.Base; using Mesnac.Action.ChemicalWeighing.Entity; using Mesnac.Action.ChemicalWeighing.LjMetageFormula; +using Mesnac.Action.ChemicalWeighing.LjMixFormula; using Mesnac.Basic; using Mesnac.Codd.Session; using Mesnac.Controls.Base; @@ -29,12 +30,12 @@ namespace Mesnac.Action.ChemicalWeighing.Test { throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); } - dbHelper.ClearParameter(); - dbHelper.CommandType = CommandType.Text; - dbHelper.CommandText = sql; + // dbHelper.ClearParameter(); + // dbHelper.CommandType = CommandType.Text; + // dbHelper.CommandText = sql; - FrmMetageFormula frmMetageFormula = new FrmMetageFormula(); + FrmMixFormula frmMetageFormula = new FrmMixFormula(); frmMetageFormula.Show(); @@ -158,7 +159,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test - ShowMsg("小料Action1事件测试", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + // ShowMsg("小料Action1事件测试", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊干湿混配方管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊干湿混配方管理.xml new file mode 100644 index 0000000..21cf0cd --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊干湿混配方管理.xml @@ -0,0 +1,79 @@ + + + + + + + + 初始干湿混配方管理 + 初始干湿混配方管理 + + + 修改干湿混配方管理 + 修改干湿混配方管理 + + + + 点击配方名称 + 点击配方名称 + + + + 添加干湿混配方 + 添加干湿混配方 + + + + 修改干湿混配方 + 修改干湿混配方 + + + + 删除干湿混配方 + 删除干湿混配方 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量配方管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量配方管理.xml new file mode 100644 index 0000000..53b3642 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊称量配方管理.xml @@ -0,0 +1,79 @@ + + + + + + + + 初始称量配方管理 + 初始称量配方管理 + + + 修改称量配方管理 + 修改称量配方管理 + + + + 点击配方名称 + 点击配方名称 + + + + 添加称量配方 + 添加称量配方 + + + + 修改称量配方 + 修改称量配方 + + + + 删除称量配方 + 删除称量配方 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index fa84fa0..7c001cf 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -36,6 +36,8 @@ + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMix.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMix.xml new file mode 100644 index 0000000..9c14abc --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMix.xml @@ -0,0 +1,257 @@ + + + + + + + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAAFkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANAgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAACSWQGCwAAAAbnvJblj7cBBQAAAAQAAAAGDAAAAAROYW1lBg0AAAAM6YWN5pa55ZCN56ewAQYAAAAEAAAABg4AAAAKY3JlYXRldGltZQYPAAAADOWIm+W7uuaXtumXtAEHAAAABAAAAAYQAAAACnVwZGF0ZXRpbWUGEQAAAAznvJbovpHml7bpl7QBCAAAAAQAAAAGEgAAAA5EZXZpY2VVbml0TmFtZQYTAAAADOa3t+WQiOexu+WIqwEJAAAABAAAAAYUAAAABnJlbWFyawYVAAAABuWkh+azqAs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAFAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI5Njc5OTRFM0Y0NkIyQjc2NTMyNEY4Q0M5OUVEMUNDBgYAAAAS54K55Ye76YWN5pa55ZCN56ewBgcAAAAS54K55Ye76YWN5pa55ZCN56ewCw== + + [DataSource1].[lj_mix] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + Fill + 3, 17 + MCDataGridView3 + 853, 265 + 1 + + False + 混合配方 + Fill + 0, 0 + GroupBox1 + 859, 285 + 0 + + Fill + 0, 0 + Panel1 + 859, 285 + + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABwAAAIAAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAoFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYLAAAAAklkBgwAAAAG57yW5Y+3AQUAAAAEAAAABg0AAAAKQWN0aW9uTmFtZQYOAAAADOWKqOS9nOWQjeensAEGAAAABAAAAAYPAAAAClNlY29uZFRpbWUGEAAAAAbml7bpl7QBBwAAAAQAAAAGEQAAAAtUZW1wZXJhdHVyZQYSAAAABua4qeW6pgEIAAAABAAAAAYTAAAABVNwZWVkBhQAAAAG6YCf5bqmAQkAAAAEAAAABhUAAAAGV2VpZ2h0BhYAAAAM6K6+5a6a6YeN6YePAQoAAAAEAAAABhcAAAAKRGlmZmVyZW5jZQYYAAAADOiuvuWumuWFrOW3rgs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[lj_mix_detail] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + Fill + 3, 17 + MCDataGridView2 + 853, 480 + 2 + + False + 动作 + Fill + 0, 0 + GroupBox2 + 859, 500 + 0 + + Bottom + 0, 285 + Panel11 + 859, 500 + + Fill + 0, 61 + Panel10 + 859, 785 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDdBQ0ZEREZCN0VFNzNEMUQzQzBCNDIzNTg3OTc1NjZDBgYAAAAb5Yid5aeL5bmy5rm/5re36YWN5pa5566h55CGBgcAAAAb5Yid5aeL5bmy5rm/5re36YWN5pa5566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 367, 12 + MCButton5 + 100, 30 + 15 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDJCQTBENDRCRDc3RTk3MUM5MTNDNkVCOEQ1NzFGN0UxBgYAAAAV5L+u5pS55bmy5rm/5re36YWN5pa5BgcAAAAV5L+u5pS55bmy5rm/5re36YWN5pa5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 修改 + 宋体, 14.25pt, style=Bold + 123, 12 + MCButton1 + 100, 30 + 13 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEUyNUY0OUE0NDdEQzEwQUREMjlCQTVGMzNFNjBBNDVBBgYAAAAV5Yig6Zmk5bmy5rm/5re36YWN5pa5BgcAAAAV5Yig6Zmk5bmy5rm/5re36YWN5pa5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 删除 + 宋体, 14.25pt, style=Bold + 245, 12 + MCButton4 + 100, 30 + 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZGQjc5OEFDRTcwMjhCN0E3REVDNENCN0UzN0UwNDRFBgYAAAAV5re75Yqg5bmy5rm/5re36YWN5pa5BgcAAAAV5re75Yqg5bmy5rm/5re36YWN5pa5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 添加 + 宋体, 14.25pt, style=Bold + 5, 12 + MCButton2 + 100, 30 + 14 + + Top + 0, 0 + Panel9 + 859, 61 + + Fill + 0, 0 + Panel8 + 859, 846 + + Fill + 0, 0 + Panel3 + 859, 846 + + Fill + 0, 0 + Panel2 + 859, 846 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDdBQ0ZEREZCN0VFNzNEMUQzQzBCNDIzNTg3OTc1NjZDBgYAAAAb5Yid5aeL5bmy5rm/5re36YWN5pa5566h55CGBgcAAAAb5Yid5aeL5bmy5rm/5re36YWN5pa5566h55CGCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 875, 885 + WindowsDefaultLocation + 混合配方管理 + Normal + + Tile + 宋体, 9pt + ControlText + FormMix + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml index 5ecb034..ba88066 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormWeight.xml @@ -1,204 +1,236 @@ - - False - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAAHsAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAA0EBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGCAAAAAJJZAYJAAAABue8luWPtwEFAAAABAAAAAYKAAAABE5hbWUGCwAAAAblkI3np7ABBgAAAAQAAAAGDAAAAAlMb3dXZWlnaHQGDQAAAA/kvY7mlpnkvY3ph43ph48BBwAAAAQAAAAGDgAAAApIaWdoV2VpZ2h0Bg8AAAAP6auY5paZ5L2N6YeN6YePCw== - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - [DataSource1].[WeightSetting] - - True - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== - - None - True - True - False - ControlLightLight - 30 - False - Fill - 0, 48 - MCDataGridView1 - 696, 418 - 9 - - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAARAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEYzRkQ1RTIyOTM2N0QzQjc0OTYzQUIyQjYxNjAzRTY2BgYAAAAM5pWw5o2u5LiL6L6+BgcAAAAM5pWw5o2u5LiL6L6+Cw== - - - - False - - - - None - True - True - True - - - Red - DarkGray - 数据下发 - 宋体, 14.25pt, style=Bold - 278, 3 - MCButton7 - 115, 40 - 3 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAARAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDMzQTBCOEJBN0M3NTI3OTY1RUEzRDY4QjI1QTlDQ0ZBBgYAAAAM5pWw5o2u5LiK5LygBgcAAAAM5pWw5o2u5LiK5LygCw== - - - - False - - - - None - True - True - True - - - Red - DarkGray - 数据上传 - 宋体, 14.25pt, style=Bold - 157, 3 - MCButton6 - 115, 40 - 3 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAARAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== - - - - False - - - - None - True - True - True - - - Red - DarkGray - 刷新 - 宋体, 14.25pt, style=Bold - 81, 3 - MCButton1 - 70, 40 - 3 + + + + + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAEsAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklkBgoAAAAG57yW5Y+3AQUAAAAEAAAABgsAAAAETmFtZQYMAAAADOmFjeaWueWQjeensAEGAAAABAAAAAYNAAAACmNyZWF0ZXRpbWUGDgAAAAzliJvlu7rml7bpl7QBBwAAAAQAAAAGDwAAAAp1cGRhdGV0aW1lBhAAAAAM57yW6L6R5pe26Ze0AQgAAAAEAAAABhEAAAAGcmVtYXJrBhIAAAAG5aSH5rOoCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEUyQzE4MDg5QUMxMTRGREFFMzUwMzQzM0Y2NjQ4RjY4BgYAAAAS54K55Ye76YWN5pa55ZCN56ewBgcAAAAS54K55Ye76YWN5pa55ZCN56ewCw== + + [DataSource1].[lj_metage] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + Fill + 3, 17 + MCDataGridView3 + 1132, 577 + 1 + + False + 称量配方 + Fill + 0, 0 + GroupBox1 + 1138, 597 + 0 + + Fill + 0, 0 + Panel1 + 1138, 597 + + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAGkAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAklkBgoAAAAG57yW5Y+3AQUAAAAEAAAABgsAAAAFTU5hbWUGDAAAAAznianmlpnlkI3np7ABBgAAAAQAAAAGDQAAAAZXZWlnaHQGDgAAAAbph43ph48BBwAAAAQAAAAGDwAAAApEaWZmZXJlbmNlBhAAAAAG5q+U6YeNAQgAAAAEAAAABhEAAAAKRGV2aWNlTmFtZQYSAAAADOWtmOWCqOiuvuWkhws= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[lj_metage_detail] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + False + Fill + 3, 17 + MCDataGridView2 + 1132, 480 + 2 + + False + 物料 + Fill + 0, 0 + GroupBox2 + 1138, 500 + 0 + + Bottom + 0, 597 + Panel11 + 1138, 500 + + Fill + 0, 61 + Panel10 + 1138, 1097 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI4NUMwMDc0QzZENDQ0NUU3NDFEMzVGOEM4NUM5MEQ2BgYAAAAY5Yid5aeL56ew6YeP6YWN5pa5566h55CGBgcAAAAY5Yid5aeL56ew6YeP6YWN5pa5566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 宋体, 14.25pt, style=Bold + 367, 12 + MCButton5 + 100, 30 + 15 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDgyRUY2M0ZGN0Q1Mzc5MTE2NEMwMDk2MDdDNDkyNDY3BgYAAAAY5L+u5pS556ew6YeP6YWN5pa5566h55CGBgcAAAAY5L+u5pS556ew6YeP6YWN5pa5566h55CGCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 修改 + 宋体, 14.25pt, style=Bold + 123, 12 + MCButton1 + 100, 30 + 13 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBRUJGODBBRjA4MTkzMjg1RTNCRDlCOEU0MDg5NTMyBgYAAAAS5Yig6Zmk56ew6YeP6YWN5pa5BgcAAAAS5Yig6Zmk56ew6YeP6YWN5pa5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 删除 + 宋体, 14.25pt, style=Bold + 245, 12 + MCButton4 + 100, 30 + 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEMwQzYzNDEyOURCNTVDMDgxQzhCQTk4Mjc2NjA2QjczBgYAAAAS5re75Yqg56ew6YeP6YWN5pa5BgcAAAAS5re75Yqg56ew6YeP6YWN5pa5Cw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + Transparent + 添加 + 宋体, 14.25pt, style=Bold + 5, 12 + MCButton2 + 100, 30 + 14 + + Top + 0, 0 + Panel9 + 1138, 61 + + Fill + 0, 0 + Panel8 + 1138, 1158 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAASAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEVDNEEyNjEzRkE0NzY1MjlBRTZDQzdEQ0I1MDMyRDk2BgYAAAAS5L+u5pS56YeN6YeP5Y+C5pWwBgcAAAAS5L+u5pS56YeN6YeP5Y+C5pWwCw== - - - - False - - - - None - True - True - True - - - Red - DarkGray - 修改 - 宋体, 14.25pt, style=Bold - 5, 3 - MCButton5 - 70, 40 - 1 - - Top + Fill 0, 0 - Panel2 - 696, 48 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAANAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= - - - - False - - - - None - True - True - True - - - Red - DarkGray - 刷新 - 宋体, 14.25pt, style=Bold - 81, 3 - MCButton4 - 70, 40 - 3 + Panel3 + 1138, 1158 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= - - - - False - - - - None - True - True - True - - - Red - DarkGray - 修改 - 宋体, 14.25pt, style=Bold - 5, 3 - MCButton2 - 70, 40 - 1 - - Top + Fill 0, 0 - Panel1 - 696, 48 + Panel2 + 1138, 1158 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDBBNDJGOEY3OTE2QTNCNjY4REIzODMwRUE5MDJBOUQ5BgYAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwBgcAAAAV5Yid5aeL5YyW6YeN6YeP5Y+C5pWwCw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDI4NUMwMDc0QzZENDQ0NUU3NDFEMzVGOEM4NUM5MEQ2BgYAAAAY5Yid5aeL56ew6YeP6YWN5pa5566h55CGBgcAAAAY5Yid5aeL56ew6YeP6YWN5pa5566h55CGCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -209,13 +241,13 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - False + True False False Control - 712, 505 + 1154, 1197 WindowsDefaultLocation - 榄菊设备参数重量管理 + 称量配方管理 Normal Tile diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index c58792b..39777f5 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -207,6 +207,10 @@ Designer PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest @@ -223,6 +227,10 @@ Designer PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest