From eaf940b8cd0831db7331bae9cd79b2488ce7b997 Mon Sep 17 00:00:00 2001 From: nodyang Date: Fri, 7 Jul 2023 14:50:48 +0800 Subject: [PATCH] =?UTF-8?q?ToSingle=20=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjStock/FrmStock.Designer.cs | 275 ++++++++++++++++++ .../LjStock/FrmStock.cs | 202 +++++++++++++ .../LjStock/FrmStock.resx | 120 ++++++++ .../LjStock/InItDbAction.cs | 61 ++++ .../LjStock/StockDbHelp.cs | 31 ++ .../LjStock/StockView.cs | 50 ++++ .../LjStock/UpdateAction.cs | 66 +++++ .../LjTanNum/FrmTankNum.cs | 10 +- .../Mesnac.Action.ChemicalWeighing.csproj | 13 + .../EventConfig/上辅机/LanguageDefault.xml | 216 -------------- .../上辅机/PLC管理.PLC管理.xml | 93 ------ .../EventConfig/上辅机/业务测试.xml | 49 ---- .../上辅机/基础数据维护.xml | 229 --------------- .../基础数据维护.物料细类.xml | 24 -- .../上辅机/基础界面.单表界面.xml | 114 -------- .../EventConfig/上辅机/工艺回溯.xml | 24 -- .../上辅机/工艺配方.配方管理.xml | 182 ------------ .../上辅机/报表.批报表.xml | 49 ---- .../上辅机/报表.报表设计.xml | 33 --- .../上辅机/报表.物料投放.xml | 43 --- .../上辅机/报表.车报表.xml | 149 ---------- .../EventConfig/上辅机/数据回放.xml | 59 ---- .../上辅机/日志.报警日志.xml | 53 ---- .../上辅机/日志.系统日志.xml | 42 --- .../EventConfig/上辅机/生产管理.xml | 82 ------ .../EventConfig/上辅机/生产计划.xml | 64 ---- .../上辅机/生产计划.当班计划.xml | 155 ---------- .../EventConfig/上辅机/系统初始化.xml | 54 ---- .../EventConfig/上辅机/系统工具.xml | 33 --- .../EventConfig/上辅机/系统设置.xml | 54 ---- .../上辅机/系统配置.权限管理.xml | 122 -------- .../上辅机/系统配置.通用配置.xml | 39 --- .../小料称量/榄菊料仓物料.xml | 38 +++ Main/MCEdit/Data/MCProject/SCWSProject2.mprj | 1 + .../Data/MCProject/nodeForm/FormStock.xml | 117 ++++++++ Main/MCEdit/MCEdit.csproj | 74 +---- 36 files changed, 983 insertions(+), 2037 deletions(-) create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.resx create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/InItDbAction.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockDbHelp.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockView.cs create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/UpdateAction.cs delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/LanguageDefault.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/PLC管理.PLC管理.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/业务测试.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.物料细类.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/基础界面.单表界面.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/工艺回溯.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/工艺配方.配方管理.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/报表.批报表.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/报表.报表设计.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/报表.物料投放.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/报表.车报表.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/数据回放.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/日志.报警日志.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/日志.系统日志.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/生产管理.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/生产计划.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/生产计划.当班计划.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/系统初始化.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/系统工具.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/系统设置.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/系统配置.权限管理.xml delete mode 100644 Main/MCEdit/Data/EventConfig/上辅机/系统配置.通用配置.xml create mode 100644 Main/MCEdit/Data/EventConfig/小料称量/榄菊料仓物料.xml create mode 100644 Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs new file mode 100644 index 0000000..6c147e5 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.Designer.cs @@ -0,0 +1,275 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + partial class FrmStock + { + /// + /// 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.Jog = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.Lead = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.SlowScale = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.Slow = new System.Windows.Forms.TextBox(); + this.High = new System.Windows.Forms.TextBox(); + this.TankName = new System.Windows.Forms.TextBox(); + this.TankCode = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // Jog + // + this.Jog.Location = new System.Drawing.Point(133, 333); + this.Jog.Margin = new System.Windows.Forms.Padding(5); + this.Jog.Name = "Jog"; + this.Jog.Size = new System.Drawing.Size(129, 21); + this.Jog.TabIndex = 39; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(52, 336); + this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(47, 12); + this.label9.TabIndex = 38; + this.label9.Text = "点动值:"; + // + // Lead + // + this.Lead.Location = new System.Drawing.Point(133, 298); + this.Lead.Margin = new System.Windows.Forms.Padding(5); + this.Lead.Name = "Lead"; + this.Lead.Size = new System.Drawing.Size(129, 21); + this.Lead.TabIndex = 37; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(52, 301); + this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(47, 12); + this.label8.TabIndex = 36; + this.label8.Text = "提前量:"; + // + // SlowScale + // + this.SlowScale.Location = new System.Drawing.Point(133, 256); + this.SlowScale.Margin = new System.Windows.Forms.Padding(5); + this.SlowScale.Name = "SlowScale"; + this.SlowScale.Size = new System.Drawing.Size(129, 21); + this.SlowScale.TabIndex = 35; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(52, 259); + this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(47, 12); + this.label7.TabIndex = 34; + this.label7.Text = "慢称值:"; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(133, 14); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.TabIndex = 33; + // + // Slow + // + this.Slow.Location = new System.Drawing.Point(133, 209); + this.Slow.Margin = new System.Windows.Forms.Padding(5); + this.Slow.Name = "Slow"; + this.Slow.Size = new System.Drawing.Size(129, 21); + this.Slow.TabIndex = 31; + // + // High + // + this.High.Location = new System.Drawing.Point(133, 163); + this.High.Margin = new System.Windows.Forms.Padding(5); + this.High.Name = "High"; + this.High.Size = new System.Drawing.Size(129, 21); + this.High.TabIndex = 32; + // + // TankName + // + this.TankName.Enabled = false; + this.TankName.Location = new System.Drawing.Point(133, 116); + this.TankName.Margin = new System.Windows.Forms.Padding(5); + this.TankName.Name = "TankName"; + this.TankName.Size = new System.Drawing.Size(129, 21); + this.TankName.TabIndex = 29; + // + // TankCode + // + this.TankCode.Enabled = false; + this.TankCode.Location = new System.Drawing.Point(133, 65); + this.TankCode.Margin = new System.Windows.Forms.Padding(5); + this.TankCode.Name = "TankCode"; + this.TankCode.Size = new System.Drawing.Size(129, 21); + this.TankCode.TabIndex = 30; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(227, 392); + 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 = 28; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(54, 392); + 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 = 27; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(52, 209); + this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(83, 12); + this.label6.TabIndex = 23; + this.label6.Text = "低速称量速度:"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(52, 163); + this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(83, 12); + this.label5.TabIndex = 22; + this.label5.Text = "高速称量速度:"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(52, 116); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 24; + this.label4.Text = "料仓名称"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(52, 65); + this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(59, 12); + this.label3.TabIndex = 26; + this.label3.Text = "料仓编码:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(52, 17); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.TabIndex = 25; + this.label1.Text = "物料名称:"; + // + // FrmStock + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(362, 450); + this.Controls.Add(this.Jog); + this.Controls.Add(this.label9); + this.Controls.Add(this.Lead); + this.Controls.Add(this.label8); + this.Controls.Add(this.SlowScale); + this.Controls.Add(this.label7); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.Slow); + this.Controls.Add(this.High); + this.Controls.Add(this.TankName); + this.Controls.Add(this.TankCode); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.label6); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label1); + this.Name = "FrmStock"; + this.Text = "料仓物料"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + private System.Windows.Forms.TextBox Jog; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox Lead; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox SlowScale; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.TextBox Slow; + private System.Windows.Forms.TextBox High; + private System.Windows.Forms.TextBox TankName; + private System.Windows.Forms.TextBox TankCode; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + 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/LjStock/FrmStock.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.cs new file mode 100644 index 0000000..5474a31 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.cs @@ -0,0 +1,202 @@ +using System; +using System.Windows.Forms; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + public partial class FrmStock : Form + { + public FrmStock() + { + InitializeComponent(); + } + + private StockView viewl; + public FrmStock(StockView view) : this() + { + this.viewl = view; + Init(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void Init() + { + var nameValueCollection = MaterialInfoTypeHelp.GetALL(); + this.comboBox1.DataSource = nameValueCollection; + comboBox1.ValueMember = "Id"; + comboBox1.DisplayMember = "Name"; + foreach (MyNameValue combo in comboBox1.Items) + { + if (combo.Id == viewl.MTypeId) + { + comboBox1.SelectedItem = combo; + break; + } + } + + if (null != viewl) + { + this.TankCode.Text = viewl.Code; + this.TankName.Text = viewl.StockName; + this.High.Text = viewl.High.ToString(); + this.Slow.Text = viewl.Slow.ToString(); + this.SlowScale.Text = viewl.SlowScale.ToString(); + this.Lead.Text = viewl.Lead.ToString(); + this.Jog.Text = viewl.Jog.ToString(); + } + } + + private void btnOK_Click(object sender, EventArgs e) + { + #region check + + if (string.IsNullOrEmpty(High.Text.Trim())) + { + High.Focus(); + MessageBox.Show("请输入高速称量速度"); + return; + } + else + { + if (float.TryParse(High.Text.Trim(),out float a)) + { + if (a < 0 || a > 50) + { + High.Focus(); + MessageBox.Show("请输入正确高速称量速度[0.0~50.0]"); + return; + } + } + else + { + High.Focus(); + MessageBox.Show("请输入正确高速称量速度[0.0~50.0]"); + return; + } + } + + + + if (string.IsNullOrEmpty(Slow.Text.Trim())) + { + Slow.Focus(); + MessageBox.Show("请输入慢速称量速度"); + return; + } + else + { + if (float.TryParse(Slow.Text.Trim(),out float b)) + { + if (b < 0 || b > 50) + { + Slow.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~50.0]"); + return; + } + } + else + { + Slow.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~50.0]"); + return; + } + } + + + + + if (string.IsNullOrEmpty(SlowScale.Text.Trim())) + { + SlowScale.Focus(); + MessageBox.Show("请输入慢称值"); + return; + } + else + { + if (float.TryParse(SlowScale.Text.Trim(),out float b)) + { + if (b < 0 || b > 10) + { + SlowScale.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~10.0]"); + return; + } + } + else + { + SlowScale.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~10.0]"); + return; + } + } + + if (string.IsNullOrEmpty(Lead.Text.Trim())) + { + Lead.Focus(); + MessageBox.Show("请输入提前量"); + return; + } + else + { + if (float.TryParse(Lead.Text.Trim(),out float b)) + { + if (b < 0 || b > 10) + { + Lead.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~10.0]"); + return; + } + } + else + { + Lead.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~10.0]"); + return; + } + } + + if (string.IsNullOrEmpty(Jog.Text.Trim())) + { + Jog.Focus(); + MessageBox.Show("请输入点动值"); + return; + } + else + { + if (float.TryParse(Lead.Text.Trim(),out float b)) + { + if (b < 0 || b > 20) + { + Jog.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~20.0]"); + return; + } + } + else + { + Jog.Focus(); + MessageBox.Show("请输入正确低速称量速度[0.0~20.0]"); + return; + } + } + + #endregion + + + viewl.MTypeId = Convert.ToInt32(this.comboBox1.SelectedValue); + viewl.High = Convert.ToSingle(High.Text); + viewl.Slow = Convert.ToSingle(Slow.Text); + viewl.SlowScale = Convert.ToSingle(SlowScale.Text); + viewl.Lead = Convert.ToSingle(Lead.Text); + viewl.Jog = Convert.ToSingle(Jog.Text); + + + StockDbHelp.Update(viewl); + this.DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/FrmStock.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/InItDbAction.cs new file mode 100644 index 0000000..c019109 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/InItDbAction.cs @@ -0,0 +1,61 @@ +using System; +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + public class InItDbAction : ChemicalWeighingAction, IAction + { + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + + UpdateAction.OnUpdateMaterial -= Process_Event; + UpdateAction.OnUpdateMaterial += Process_Event; + + DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, + "Stock").FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + string sql = @"select stock.*,mater.MaterialTypeName from Stock stock +left join MaterialInfoType mater +on stock.MTypeId=mater.Id"; + DataTable table = DBHelp.GetTable(sql); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) + { + this._materialGridControl.BaseControl.BindDataSource = null; + this._materialGridControl.BaseControl.BindDataSource = table; + + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + } + + } + + private void Process_Event(object sender, EventArgs e) + { + if (sender is RuntimeParameter) + { + this.Run(sender as RuntimeParameter); + } + else + { + this.Run(this._runtime); + } + } + } +} diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockDbHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockDbHelp.cs new file mode 100644 index 0000000..bd27d65 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockDbHelp.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + public class StockDbHelp:DBHelp + { + public static int Update(StockView view) + { + string sql = @"update [Stock] set +[MTypeId] = @MTypeId, +[High] = @High, +[Slow] = @Slow, +[SlowScale] = @SlowScale, +[Lead] = @Lead, +[Jog] = @Jog where id=@id"; + + IDictionary dic = GetDefault(); + dic.Add("@id",view.Id); + dic.Add("@MTypeId",view.MTypeId); + dic.Add("@High",view.High); + dic.Add("@Slow",view.Slow); + dic.Add("@SlowScale",view.SlowScale); + dic.Add("@Lead",view.Lead); + dic.Add("@Jog",view.Jog); + + ExecuteNonQuery(sql, dic); + return 1; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockView.cs new file mode 100644 index 0000000..eab672c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/StockView.cs @@ -0,0 +1,50 @@ +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + public class StockView + { + /// + /// + /// + public int Id { get; set; } + /// + /// + /// + public string Code { get; set; } + /// + /// + /// + public string StockName { get; set; } + /// + /// + /// + public int MTypeId { get; set; } + /// + /// + /// + public float High { get; set; } + /// + /// + /// + public float Slow { get; set; } + /// + /// + /// + public float SlowScale { get; set; } + /// + /// + /// + public float Lead { get; set; } + /// + /// + /// + public float Jog { get; set; } + /// + /// + /// + public string Remark { get; set; } + /// + /// 小料1 + /// + public string MaterialTypeName { get; set; } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/UpdateAction.cs new file mode 100644 index 0000000..6a7f098 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjStock/UpdateAction.cs @@ -0,0 +1,66 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjTanNum; + +namespace Mesnac.Action.ChemicalWeighing.LjStock +{ + public class UpdateAction:ChemicalWeighingAction,IAction + { + public static event EventHandler OnUpdateMaterial; + private DbMCControl _materialGridControl = null; //物料列表控件 + private RuntimeParameter _runtime; + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + + DbMCControl materialGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, + "Stock").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]; + + StockView actionCodeView = new StockView() + { + Id = (int)dataGridViewRow.Cells["id"].Value, + Code = dataGridViewRow.Cells["Code"].Value.ToString(), + StockName = dataGridViewRow.Cells["StockName"].Value.ToString(), + MTypeId = (int)dataGridViewRow.Cells["MTypeId"].Value, + High = Convert.ToInt64(dataGridViewRow.Cells["High"].Value), + Slow = Convert.ToInt64(dataGridViewRow.Cells["Slow"].Value), + SlowScale = Convert.ToInt64(dataGridViewRow.Cells["SlowScale"].Value), + Lead = Convert.ToInt64(dataGridViewRow.Cells["Lead"].Value), + Jog = Convert.ToInt64(dataGridViewRow.Cells["Jog"].Value) + }; + + FrmStock frmStock = new FrmStock(actionCodeView); + DialogResult result = frmStock.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdateMaterial != null) + { + OnUpdateMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frmStock.Dispose(); + + } + + this._runtime.BaseControl.MCEnabled = true; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs index 4d2f8d9..3a7f727 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs @@ -201,11 +201,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum _tankNumCodingView.MTypeId = Convert.ToInt32(this.comboBox1.SelectedValue); - _tankNumCodingView.High = Convert.ToInt64(High.Text); - _tankNumCodingView.Slow = Convert.ToInt64(Slow.Text); - _tankNumCodingView.SlowScale = Convert.ToInt64(SlowScale.Text); - _tankNumCodingView.Lead = Convert.ToInt64(Lead.Text); - _tankNumCodingView.Jog = Convert.ToInt64(Jog.Text); + _tankNumCodingView.High = Convert.ToSingle(High.Text); + _tankNumCodingView.Slow = Convert.ToSingle(Slow.Text); + _tankNumCodingView.SlowScale = Convert.ToSingle(SlowScale.Text); + _tankNumCodingView.Lead = Convert.ToSingle(Lead.Text); + _tankNumCodingView.Jog = Convert.ToSingle(Jog.Text); TankNumCodingDbHelp.Update(_tankNumCodingView); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 1f8e0fb..13ddea5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -227,6 +227,16 @@ + + Form + + + FrmStock.cs + + + + + Form @@ -467,6 +477,9 @@ FrmMaterial.cs + + FrmStock.cs + FrmTankNum.cs diff --git a/Main/MCEdit/Data/EventConfig/上辅机/LanguageDefault.xml b/Main/MCEdit/Data/EventConfig/上辅机/LanguageDefault.xml deleted file mode 100644 index f4d0df1..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/LanguageDefault.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/PLC管理.PLC管理.xml b/Main/MCEdit/Data/EventConfig/上辅机/PLC管理.PLC管理.xml deleted file mode 100644 index 5b5b329..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/PLC管理.PLC管理.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - 实时记录保存 - 实时记录保存 - - - - - 数据存盘 - 数据存盘 - - - - - 数据库写入PLC - 数据库写入PLC - - - - - 文本框写入PLC - 文本框写入PLC - - - - - - 称量参数下载 - 称量参数下载 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/业务测试.xml b/Main/MCEdit/Data/EventConfig/上辅机/业务测试.xml deleted file mode 100644 index 59e1583..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/业务测试.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 业务测试4 - 业务测试4 - - - 上辅机业务测试 - 上辅机业务测试 - - - 胶料称变量测试 - 胶料称监控画面变量测试 - - - 浮点数写入测试 - 浮点数写入测试 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.xml b/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.xml deleted file mode 100644 index 5fe3334..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - 导入报警参数 - 从老版本上辅机SCHEME.INI文件导入AlarmName信息至Pmt_AlarmInfo表 - - - - - 密炼条件同步 - 同步网络数据库的密炼条件数据 - - - - - 同步班次 - 从网络同步班次数据 - - - 同步班组 - 从网络同步班组数据 - - - - - 添加 - 添加原材料数据 - - - 原材料同步 - 同步网络数据库的原材料数据 - - - 选择罐类别 - 选择罐类别 - - - 日罐选择罐类别 - 日罐选择罐类别 - - - 罐参数选择罐号 - 罐参数选择罐号 - - - - - 同步日罐设置 - 从网络同步日罐物料参数设置 - - - 添加 - 添加日罐信息 - - - 修改 - 修改日罐信息 - - - - - - 添加 - 添加称量物料参数数据 - - - 修改 - 修改称量物料参数数据 - - - 从PLC获取称量物料参数 - 从PLC获取称量物料参数 - - - - - 同步配方类型 - 从网络库同步配方类型数据 - - - 下载所有配方 - 从网络库下载本机台所有配方数据 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.物料细类.xml b/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.物料细类.xml deleted file mode 100644 index 9b2934d..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/基础数据维护.物料细类.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - 窗体初始化 - 窗体初始化 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/基础界面.单表界面.xml b/Main/MCEdit/Data/EventConfig/上辅机/基础界面.单表界面.xml deleted file mode 100644 index 05d6fcc..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/基础界面.单表界面.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - 界面初始化 - 界面初始化 - - - 添加 - 添加信息 - - - 删除 - 删除选中的信息 - - - 修改 - 配方管理中的条件信息查询 - - - 查询 - 配方管理中的条件信息查询 - - - 清空界面 - 选择表格中的行 - - - 选择行 - 选择表格中的行 - - - 上一行 - 选择表格中的行 - - - 下一行 - 选择表格中的行 - - - 第一行 - 选择表格中的行 - - - 最后一行 - 选择表格中的行 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/工艺回溯.xml b/Main/MCEdit/Data/EventConfig/上辅机/工艺回溯.xml deleted file mode 100644 index fa9aee0..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/工艺回溯.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - 工艺回溯 - 工艺回溯 - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/工艺配方.配方管理.xml b/Main/MCEdit/Data/EventConfig/上辅机/工艺配方.配方管理.xml deleted file mode 100644 index 1444092..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/工艺配方.配方管理.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - 加载 - 初始化信息 - - - 新建 - 新建 - - - 编辑 - 编辑（配方输入项进入到编辑状态） - - - 只读 - 只读（禁用配方输入项） - - - 保存 - 保存正在编辑的配方 - - - 配方另存 - 当前配方另存 - - - 删除 - 删除当前选中的配方 - - - 选择配方 - 查询选择配方 - - - 全部配方 - 查询全部配方 - - - 正用配方 - 查询正用配方 - - - 停用配方 - 查询停用配方 - - - 作废配方 - 查询作废配方 - - - 配方查询放大器 - 配方查询放大器 - - - 更新配方 - 从网络更新当前配方 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/报表.批报表.xml b/Main/MCEdit/Data/EventConfig/上辅机/报表.批报表.xml deleted file mode 100644 index 6af4834..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/报表.批报表.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 窗体初始化 - 车报表查询条件初始化 - - - 查询 - 车报表查询 - - - 显示明细 - 显示明细 - - - 显示重量明细信息 - 显示重量明细信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/报表.报表设计.xml b/Main/MCEdit/Data/EventConfig/上辅机/报表.报表设计.xml deleted file mode 100644 index 9afc280..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/报表.报表设计.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - 设计器初始化 - 设计器初始化 - - - 通用报表显示 - 通用报表显示 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/报表.物料投放.xml b/Main/MCEdit/Data/EventConfig/上辅机/报表.物料投放.xml deleted file mode 100644 index 51674f6..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/报表.物料投放.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - 物料投放初始化 - 物料投放初始化 - - - 物料投放查询 - 物料投放查询 - - - 打印预览 - 打印预览 - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/报表.车报表.xml b/Main/MCEdit/Data/EventConfig/上辅机/报表.车报表.xml deleted file mode 100644 index c3aae5d..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/报表.车报表.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - 窗体初始化 - 车报表查询条件初始化 - - - 查询 - 车报表查询 - - - 首条 - 首页 - - - 上一条 - 上一条 - - - 下一条 - 下一条 - - - 末条 - 末条 - - - 初始化曲线图 - 初始化曲线图 - - - 报表明细 - 报表明细 - - - 刷新配方列表 - 刷新配方列表（包括车报表和批报表） - - - 复位 - 复位 - - - 左移 - 左移 - - - 右移 - 右移 - - - 放大 - 放大 - - - 缩小 - 缩小 - - - 上移 - 上移 - - - 下移 - 下移 - - - - - - - - - - v - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/数据回放.xml b/Main/MCEdit/Data/EventConfig/上辅机/数据回放.xml deleted file mode 100644 index 01a8947..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/数据回放.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 播放 - 数据回访 - - - - - 暂停 - 数据回访 - - - - - 二倍速 - 数据回访 - - - - - 四倍速 - 数据回访 - - - - - 半倍速 - 数据回访 - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/日志.报警日志.xml b/Main/MCEdit/Data/EventConfig/上辅机/日志.报警日志.xml deleted file mode 100644 index a347cee..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/日志.报警日志.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - 系统报警日志初始化 - 系统报警日志初始化 - - - 系统报警日志查询 - 系统报警日志查询 - - - 导出报警日志 - 导出报警日志到Excel中 - - - - - 控件报警事件 - 控件报警事件处理 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/日志.系统日志.xml b/Main/MCEdit/Data/EventConfig/上辅机/日志.系统日志.xml deleted file mode 100644 index 6e3dcef..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/日志.系统日志.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - 系统日志初始化 - 系统日志初始化 - - - 系统日志查询 - 系统日志查询 - - - 导出系统日志 - 导出系统日志到Excel - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/生产管理.xml b/Main/MCEdit/Data/EventConfig/上辅机/生产管理.xml deleted file mode 100644 index 775e025..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/生产管理.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - 修改次数 - 修改生产计划数 - - - - - 配方重传 - 重新下配方 - - - - - 系统复位 - 系统复位 - - - - - 终止称量 - 终止称量 - - - - - 终止密炼 - 终止密炼 - - - - - 清除存盘标志 - 手动清除存盘标志 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/生产计划.xml b/Main/MCEdit/Data/EventConfig/上辅机/生产计划.xml deleted file mode 100644 index 5328821..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/生产计划.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 计划执行 - 执行生产计划 - - - - - 暂停计划 - 暂停生产计划 - - - - - 修改生产数量 - 修改生产数量 - - - - - 修改称重次数 - 修改称重次数 - - - - - 输入条码 - 手动输入条码 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/生产计划.当班计划.xml b/Main/MCEdit/Data/EventConfig/上辅机/生产计划.当班计划.xml deleted file mode 100644 index 4777d0e..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/生产计划.当班计划.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - 窗体初始化 - 绑定班次、绑定网络版生产计划 - - - 胶称画面计划列表初始化 - 初始化并刷新胶料称监控画面计划列表数据 - - - 刷新 - 刷新网络计划 - - - 选择接收 - 选择接收 网络计划 - - - 全部接收 - 全部接收 网络计划 - - - 修改 - 修改 本地计划 - - - 添加 - 添加 本地计划 - - - 删除 - 删除 本地计划 - - - 上移 - 上移 本地计划 - - - 下移 - 下移 本地计划 - - - 执行计划日期班次校验 - 执行计划日期班次校验 - - - 设置计划执行方式 - 设置计划执行方式 - - - 拆分计划(换班) - 换班时拆分计划 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/系统初始化.xml b/Main/MCEdit/Data/EventConfig/上辅机/系统初始化.xml deleted file mode 100644 index 0178c42..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/系统初始化.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - 判断是否能连接网络库 - 判断是否能连接网络库，否则自动转化为单机版 - - - 系统数据初始化 - 初始化缓存的系统数据：配方、称量... - - - 存盘扫描 - 循环处理存盘业务 - - - - Socket接收处理 - 接收到Socket客户端消息后，进行相应业务处理 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/系统工具.xml b/Main/MCEdit/Data/EventConfig/上辅机/系统工具.xml deleted file mode 100644 index b60ff18..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/系统工具.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - 计算器 - 调用系统计算器 - - - 同步网络时间 - 同步网络服务器的系统时间 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/系统设置.xml b/Main/MCEdit/Data/EventConfig/上辅机/系统设置.xml deleted file mode 100644 index 2f0a891..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/系统设置.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - 设置为网络方式运行 - 设置为网络方式运行 - - - 设置为单机方式运行 - 设置为网络方式运行 - - - - - 窗体初始化 - 清除历史存盘数据界面初始化 - - - 清除历史存盘数据 - 执行清除历史存盘数据操作 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/系统配置.权限管理.xml b/Main/MCEdit/Data/EventConfig/上辅机/系统配置.权限管理.xml deleted file mode 100644 index aa391e1..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/系统配置.权限管理.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - 窗体初始化 - 绑定角色、绑定角色权限树 - - - 权限初始化 - 根据工程文件填充权限基本信息 - - - 权限刷新 - 根据所选角色刷新权限树信息 - - - 权限保存 - 保存角色具有的权限信息 - - - 保存为默认权限 - 保存为默认权限信息 - - - 勾选所有权限项 - 勾选树形控件的所有权限项 - - - 勾选默认权限项 - 勾选树形控件的默认权限项 - - - 取消勾选所有权限项 - 取消勾选树形控件的所有权限项 - - - - - 通用权限控制 - 根据权限处理界面控件 - - - 通用权限验证 - 系统登录与权限验证 - - - 重新登录 - 重新登录 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/上辅机/系统配置.通用配置.xml b/Main/MCEdit/Data/EventConfig/上辅机/系统配置.通用配置.xml deleted file mode 100644 index d49503d..0000000 --- a/Main/MCEdit/Data/EventConfig/上辅机/系统配置.通用配置.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 加载 - 初始化信息 - - - 保存 - 保存 - - - PLC类型 - PLC类型 - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊料仓物料.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊料仓物料.xml new file mode 100644 index 0000000..95513c9 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊料仓物料.xml @@ -0,0 +1,38 @@ + + + + + + + + 初始化料仓物料 + 初始化料仓物料 + + + 修改料仓物料 + 修改料仓物料 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj index b9f113c..96a059b 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -29,6 +29,7 @@ + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml new file mode 100644 index 0000000..a0e1b77 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormStock.xml @@ -0,0 +1,117 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAJcAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAARDb2RlBhAAAAAM5paZ5LuT57yW56CBAQYAAAAEAAAABhEAAAAJU3RvY2tOYW1lBhIAAAAM5paZ5LuT5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlFQTFFNzEzRjM3NTI4RDQ1RTgwOUI4RUQyMjY0N28yBgYAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7BgcAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7Cw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[Stock] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 888, 525 + 9 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2NDM2NTQ2QjZCQjYwNzE3RTM3RDU2MjA2NzE3NkNBBgYAAAAV5Yid5aeL5YyW5paZ5LuT54mp5paZBgcAAAAV5Yid5aeL5YyW5paZ5LuT54mp5paZCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 89, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEU0QzA3RDU2RUM4RDQ5OEUzNjhEREE4N0QxQTVGMENEBgYAAAAS5L+u5pS55paZ5LuT54mp5paZBgcAAAAS5L+u5pS55paZ5LuT54mp5paZCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 9, 3 + MCButton2 + 70, 40 + 1 + + Top + 0, 0 + Panel1 + 888, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDQ2NDM2NTQ2QjZCQjYwNzE3RTM3RDU2MjA2NzE3NkNBBgYAAAAV5Yid5aeL5YyW5paZ5LuT54mp5paZBgcAAAAV5Yid5aeL5YyW5paZ5LuT54mp5paZCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 904, 612 + WindowsDefaultLocation + 料仓物料 + Normal + + Tile + 宋体, 9pt + ControlText + FormStock + diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index 8bf0638..44acbc6 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -195,6 +195,10 @@ Designer PreserveNewest + + Designer + PreserveNewest + Designer PreserveNewest @@ -486,76 +490,6 @@ Designer - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - PreserveNewest