diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjAction/InitDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjAction/InitDbAction.cs new file mode 100644 index 0000000..6af69b2 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjAction/InitDbAction.cs @@ -0,0 +1,42 @@ +using System.Data; +using System.Linq; +using Mesnac.Action.Base; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjAction +{ + public class InitDbAction:ChemicalWeighingAction,IAction + { + + 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, "ActionCode").FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + + } + + private void FileControl() + { + DataTable table = MaterialInfoTypeHelp.GetTable(@"select ActionCode.id,code,ActionName,ActionCode.Remark,DeviceUnitId,DeviceUnit.Name + from ActionCode + left join DeviceUnit on ActionCode.DeviceUnitId = DeviceUnit.Id"); + + if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) + { + this._materialGridControl.BaseControl.BindDataSource = null; + this._materialGridControl.BaseControl.BindDataSource = table; + //DBLog("成功!"); + } + else + { + ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs index 7d31dde..dd13bd5 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Data; +using DevExpress.DataProcessing; using FastReport.Data; using Mesnac.Codd.Session; @@ -12,6 +14,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial { + protected static IDictionary GetDefault() + { + return new Dictionary(); + } + public static DataTable GetTable(string sql) { DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); @@ -72,11 +79,39 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial } } + + + + public class MyNameValue + { + public int Id { get; set; } + public string Name { get; set; } + } + public class MaterialInfoTypeHelp:DBHelp { + public static IList GetALL() + { + string sql = "select * from MaterialInfoType "; + var dt = GetTable(sql); + IList ls = new List(); + foreach (DataRow dr in dt.Rows) + { + ls.Add(new MyNameValue() + { + Id = Convert.ToInt32(dr[0].ToString()), + Name = dr[1].ToString() + }); + + } + + return ls; + } + + public static int Exist(string materialinfoTypeName) { string sql = "select * from MaterialInfoType where MaterialTypeName=@mName"; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs new file mode 100644 index 0000000..848385c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs @@ -0,0 +1,278 @@ +using System.ComponentModel; +using System.Drawing; +using System.Windows.Forms; + +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + partial class FrmTankNum + { + /// + /// 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.TankCode = new System.Windows.Forms.TextBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.TankName = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.High = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.Slow = new System.Windows.Forms.TextBox(); + this.SlowScale = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.Lead = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.Jog = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // TankCode + // + this.TankCode.Enabled = false; + this.TankCode.Location = new System.Drawing.Point(154, 91); + 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 = 14; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(248, 418); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.TabIndex = 13; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.Location = new System.Drawing.Point(75, 418); + this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.TabIndex = 12; + this.btnOK.Text = "确认"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(73, 43); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.TabIndex = 11; + this.label1.Text = "物料名称:"; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(154, 40); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.TabIndex = 15; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(73, 91); + 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 = 11; + this.label3.Text = "日罐编码:"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(73, 142); + this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(59, 12); + this.label4.TabIndex = 11; + this.label4.Text = "日罐编码:"; + // + // TankName + // + this.TankName.Enabled = false; + this.TankName.Location = new System.Drawing.Point(154, 142); + 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 = 14; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(73, 189); + 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 = 11; + this.label5.Text = "高速称量速度:"; + // + // High + // + this.High.Location = new System.Drawing.Point(154, 189); + 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 = 14; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(73, 235); + 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 = 11; + this.label6.Text = "低速称量速度:"; + this.label6.Click += new System.EventHandler(this.label6_Click); + // + // Slow + // + this.Slow.Location = new System.Drawing.Point(154, 235); + 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 = 14; + this.Slow.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + // + // SlowScale + // + this.SlowScale.Location = new System.Drawing.Point(154, 282); + 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 = 17; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(73, 285); + 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 = 16; + this.label7.Text = "慢称值:"; + // + // Lead + // + this.Lead.Location = new System.Drawing.Point(154, 324); + 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 = 19; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(73, 327); + 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 = 18; + this.label8.Text = "提前量:"; + // + // Jog + // + this.Jog.Location = new System.Drawing.Point(154, 359); + 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 = 21; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(73, 362); + 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 = 20; + this.label9.Text = "点动值:"; + // + // FrmTankNum + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(453, 536); + 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 = "FrmTankNum"; + this.Text = "日罐物料对应"; + this.ResumeLayout(false); + this.PerformLayout(); + } + + #endregion + + private System.Windows.Forms.TextBox TankCode; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnOK; + private Label label1; + private System.Windows.Forms.ComboBox comboBox1; + private Label label2; + private Label label3; + private Label label4; + private TextBox TankName; + private Label label5; + private TextBox High; + private Label label6; + private TextBox Slow; + private TextBox SlowScale; + private Label label7; + private TextBox Lead; + private Label label8; + private TextBox Jog; + private Label label9; + } +} \ 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 new file mode 100644 index 0000000..4d2f8d9 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs @@ -0,0 +1,215 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Windows.Forms; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + public partial class FrmTankNum : Form + { + public FrmTankNum() + { + InitializeComponent(); + } + + private TankNumCodingView _tankNumCodingView; + public FrmTankNum(TankNumCodingView view) : this() + { + _tankNumCodingView = view; + Init(); + } + + 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 == _tankNumCodingView.MTypeId) + { + comboBox1.SelectedItem = combo; + break; + } + } + + if (null != _tankNumCodingView) + { + this.TankCode.Text = _tankNumCodingView.TankCode; + this.TankName.Text = _tankNumCodingView.TankName; + this.High.Text = _tankNumCodingView.High.ToString(); + this.Slow.Text = _tankNumCodingView.Slow.ToString(); + this.SlowScale.Text = _tankNumCodingView.SlowScale.ToString(); + this.Lead.Text = _tankNumCodingView.Lead.ToString(); + this.Jog.Text = _tankNumCodingView.Jog.ToString(); + } + } + + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void textBox1_TextChanged(object sender, EventArgs e) + { + + } + + private void label6_Click(object sender, EventArgs e) + { + + } + + 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 + + + _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); + + + TankNumCodingDbHelp.Update(_tankNumCodingView); + this.DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.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/LjTanNum/FrmTankNumCoding.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNumCoding.cs new file mode 100644 index 0000000..e69de29 diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs new file mode 100644 index 0000000..d271a09 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/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.LjTanNum +{ + 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, + "TankNumCoding").FirstOrDefault(); //获取物料数据控件 + this._materialGridControl = materialGridControl; + FileControl(); + } + + private void FileControl() + { + string sql = @"select tank.*,mater.MaterialTypeName from TankNumCoding tank + left join MaterialInfoType mater + on tank.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); + } + } + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs new file mode 100644 index 0000000..9135561 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + public class TankNumCodingDbHelp:DBHelp + { + + public static int Update(TankNumCodingView view) + { + string sql = @"update [TankNumCoding] 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/LjTanNum/TankNumCodingView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs new file mode 100644 index 0000000..b38f26c --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs @@ -0,0 +1,51 @@ +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + public class TankNumCodingView + { + /// + /// + /// + public int Id { get; set; } + /// + /// + /// + public string TankCode { get; set; } + /// + /// + /// + public string TankName { 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/LjTanNum/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/UpdateAction.cs new file mode 100644 index 0000000..4c65a22 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/UpdateAction.cs @@ -0,0 +1,66 @@ +using System; +using System.Linq; +using System.Windows.Forms; +using ICSharpCode.Core; +using Mesnac.Action.Base; + +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + 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, + "TankNumCoding").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]; + + TankNumCodingView actionCodeView = new TankNumCodingView() + { + Id = (int)dataGridViewRow.Cells["id"].Value, + TankCode = dataGridViewRow.Cells["TankCode"].Value.ToString(), + TankName = dataGridViewRow.Cells["TankName"].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) + }; + + FrmTankNum frmTankNum = new FrmTankNum(actionCodeView); + DialogResult result = frmTankNum.ShowDialog(); + this._runtime.BaseControl.MCEnabled = false; + if (result == DialogResult.OK) + { + if (OnUpdateMaterial != null) + { + OnUpdateMaterial(this._runtime.BaseControl.MCRoot, System.EventArgs.Empty); + } + + frmTankNum.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 d30beb7..1f8e0fb 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -214,6 +214,7 @@ + Form @@ -226,6 +227,16 @@ + + Form + + + FrmTankNum.cs + + + + + Component @@ -233,7 +244,9 @@ BarcodeReport.cs - + + Form + @@ -454,6 +467,9 @@ FrmMaterial.cs + + FrmTankNum.cs + BarcodeReport.cs diff --git a/Main/MCEdit/Data/EventConfig/小料称量/榄菊动作管理.xml b/Main/MCEdit/Data/EventConfig/小料称量/榄菊动作管理.xml new file mode 100644 index 0000000..28e0298 --- /dev/null +++ b/Main/MCEdit/Data/EventConfig/小料称量/榄菊动作管理.xml @@ -0,0 +1,26 @@ + + + + + + + 初始化动作 + 初始化动作 + + + + + + + + + + + + + + + + + + \ 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..3b43c46 --- /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 2e7a6f2..b9f113c 100644 --- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj +++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj @@ -27,6 +27,8 @@ + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormAction.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormAction.xml new file mode 100644 index 0000000..b95c856 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormAction.xml @@ -0,0 +1,112 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAHcAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAAAmlkBgoAAAAG5bqP5Y+3AQUAAAAEAAAABgsAAAAEY29kZQYMAAAADOWKqOS9nOe8lueggQEGAAAABAAAAAYNAAAACkFjdGlvbk5hbWUGDgAAAAzliqjkvZzlkI3np7ABBwAAAAQAAAAGDwAAAAROYW1lBhAAAAAG6K6+5aSHAQgAAAAEAAAABhEAAAAGUmVtYXJrBhIAAAAG5aSH5rOoCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[ActionCode] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 666, 359 + 6 + + + + + + Red + DarkGray + + + False + + + + None + True + True + 需要添加请联系管理员 + 104, 18 + MCLabel1 + 125, 12 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 3, 4 + MCButton4 + 70, 40 + 3 + + Top + 0, 0 + Panel1 + 666, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlENzhDQURBNUM5MzU0OTk0N0ZCMzY3MzQzNjJCQTc2BgYAAAAP5Yid5aeL5YyW5Yqo5L2cBgcAAAAP5Yid5aeL5YyW5Yqo5L2cCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 682, 446 + WindowsDefaultLocation + 榄菊动作 + Normal + + Tile + 宋体, 9pt + ControlText + FormAction + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml index 431f8e8..d3fa854 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml @@ -32,7 +32,7 @@ Fill 0, 48 MCDataGridView1 - 623, 314 + 696, 339 4 @@ -135,7 +135,7 @@ Top 0, 0 Panel1 - 623, 48 + 696, 48 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZGNTNDQTRFQjkxOTQ0OTNBRDY5OTBGQjEwOUUwOEE5BgYAAAAP5Yid5aeL5YyW54mp5paZBgcAAAAP5Yid5aeL5YyW54mp5paZCw== @@ -153,7 +153,7 @@ False False Control - 639, 401 + 712, 426 WindowsDefaultLocation 物料大类 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml new file mode 100644 index 0000000..9a33403 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml @@ -0,0 +1,117 @@ + + + + False + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAI0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAAhUYW5rQ29kZQYQAAAADOaXpee9kOe8lueggQEGAAAABAAAAAYRAAAACFRhbmtOYW1lBhIAAAAM5pel572Q5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDlFQTFFNzEzRjM3NTI4RDQ1RTgwOUI4RUQyMjY0N28yBgYAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7BgcAAAAb5Yid5aeL5YyW5pel572Q54mp5paZ5YWz57O7Cw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + [DataSource1].[TankNumCoding] + + True + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== + + None + True + True + False + ControlLightLight + 30 + False + Fill + 0, 48 + MCDataGridView1 + 888, 525 + 7 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEI2N0E5NTc1QkY2MTQyNkJBQTNEMzcwQkM0QkRENDc3BgYAAAAP5Yid5aeL5YyW54mp5paZBgcAAAAP5Yid5aeL5YyW54mp5paZCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 刷新 + 89, 3 + MCButton4 + 70, 40 + 3 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEU3NkUwNDYyNDY2NTA0QjFBN0UwMDVDOEEzRDM1NUJDBgYAAAAS5L+u5pS55pel572Q54mp5paZBgcAAAAS5L+u5pS55pel572Q54mp5paZCw== + + + + False + + + + None + True + True + True + + + Red + DarkGray + 修改 + 9, 3 + MCButton2 + 70, 40 + 1 + + Top + 0, 0 + Panel1 + 888, 48 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAPAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhGRjIzQjNDODBGODk3MTQ1Mjk1OTcwQ0UwMjIxMkYxBgYAAAAV5Yid5aeL5YyW5pel572Q54mp5paZBgcAAAAV5Yid5aeL5YyW5pel572Q54mp5paZCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + False + False + False + Control + 904, 612 + WindowsDefaultLocation + 日罐物料 + Normal + + Tile + 宋体, 9pt + ControlText + FormTankNum + diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index c37496e..8bf0638 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -191,6 +191,14 @@ PreserveNewest + + Designer + PreserveNewest + + + Designer + PreserveNewest + Designer PreserveNewest