diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs new file mode 100644 index 0000000..dee4730 --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/DBHelp.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Data; +using Mesnac.Codd.Session; + +namespace Mesnac.Action.ChemicalWeighing.LjMaterial +{ + public class DBHelp + { + + + 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); + if (dbHelper == null) + { + throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + string strSql = sql; + dbHelper.CommandText = strSql; + DataTable table = dbHelper.ToDataTable(); + return table; + } + + public static DataTable GetTable(string sql, IDictionary dic) + { + DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); + if (dbHelper == null) + { + throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + + string insertUserSql = sql; + dbHelper.CommandText = insertUserSql; + foreach (var keyValuePair in dic) + { + dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); + } + DataTable table = dbHelper.ToDataTable(); + return table; + } + + public static void ExecuteNonQuery(string sql) + { + ExecuteNonQuery(sql,new Dictionary()); + } + public static void ExecuteNonQuery(string sql, IDictionary dic) + { + DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); + if (dbHelper == null) + { + throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + + string insertUserSql = sql; + dbHelper.CommandText = insertUserSql; + foreach (var keyValuePair in dic) + { + dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); + } + + dbHelper.ExecuteNonQuery(); + } + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs index e2ebbb0..d614b41 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs @@ -37,23 +37,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial this.btnCancel = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.DrpmaterialType = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // MNameTB // - this.MNameTB.Location = new System.Drawing.Point(210, 50); - this.MNameTB.Margin = new System.Windows.Forms.Padding(5); + this.MNameTB.Location = new System.Drawing.Point(315, 165); + this.MNameTB.Margin = new System.Windows.Forms.Padding(8); this.MNameTB.Name = "MNameTB"; - this.MNameTB.Size = new System.Drawing.Size(175, 21); + this.MNameTB.Size = new System.Drawing.Size(260, 28); this.MNameTB.TabIndex = 10; // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(265, 141); - this.btnCancel.Margin = new System.Windows.Forms.Padding(5); + this.btnCancel.Location = new System.Drawing.Point(388, 302); + this.btnCancel.Margin = new System.Windows.Forms.Padding(8); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.Size = new System.Drawing.Size(147, 68); this.btnCancel.TabIndex = 9; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; @@ -61,10 +63,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial // // btnOK // - this.btnOK.Location = new System.Drawing.Point(92, 141); - this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Location = new System.Drawing.Point(135, 302); + this.btnOK.Margin = new System.Windows.Forms.Padding(8); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.Size = new System.Drawing.Size(147, 68); this.btnOK.TabIndex = 8; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -73,33 +75,60 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(90, 53); - this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label1.Location = new System.Drawing.Point(135, 165); + this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.Size = new System.Drawing.Size(89, 18); this.label1.TabIndex = 6; this.label1.Text = "物料名称:"; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(135, 84); + this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(89, 18); + this.label2.TabIndex = 6; + this.label2.Text = "物料类别:"; + // + // DrpmaterialType + // + this.DrpmaterialType.FormattingEnabled = true; + this.DrpmaterialType.Location = new System.Drawing.Point(315, 76); + this.DrpmaterialType.Margin = new System.Windows.Forms.Padding(4); + this.DrpmaterialType.Name = "DrpmaterialType"; + this.DrpmaterialType.Size = new System.Drawing.Size(180, 26); + this.DrpmaterialType.TabIndex = 52; + // // FrmMaterial // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(450, 300); + this.ClientSize = new System.Drawing.Size(675, 648); + this.Controls.Add(this.DrpmaterialType); this.Controls.Add(this.MNameTB); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); + this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "FrmMaterial"; this.Text = "物料类别"; this.ResumeLayout(false); this.PerformLayout(); + } + private System.Windows.Forms.Label label2; + #endregion - private TextBox MNameTB; + private System.Windows.Forms.TextBox MNameTB; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOK; - private Label label1; + private System.Windows.Forms.Label label1; + + private ComboBox DrpmaterialType; } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.cs index a7dc5eb..cf24c0c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.cs @@ -13,12 +13,32 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial { this._actionType = actionType; InitializeComponent(); + + DrpmaterialType.DataSource = MaterialInfoTypeHelp.GetType(); + DrpmaterialType.DisplayMember = "Name"; + DrpmaterialType.ValueMember = "Id"; } public FrmMaterial(ActionType actionType, MaterialInfoType materialInfoType):this(actionType) { _materialInfoType = materialInfoType; - this.MNameTB.Text = materialInfoType.MaterialInfoTypeName; + this.MNameTB.Text = materialInfoType.MaterialName; + + if (actionType == ActionType.Modify) + { + var mtypeIdById = MaterialInfoTypeHelp.GetMtypeIdById(materialInfoType.Id); + + foreach (MyNameValue s in DrpmaterialType.Items) + { + if (s.Id == mtypeIdById) + { + DrpmaterialType.SelectedItem = s; + break; + } + } + + } + } @@ -27,6 +47,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial { var materialinfoTypeName = MNameTB.Text.Trim(); + int mtypeId = Convert.ToInt32(DrpmaterialType.SelectedValue); + if (string.IsNullOrEmpty(materialinfoTypeName)) { MessageBox.Show("物料名不能为空！！"); @@ -42,7 +64,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial return; } - if (_actionType == ActionType.Modify && exist>0) + if (_actionType == ActionType.Modify && exist>1) { MessageBox.Show("物料名已经存在！！"); this.MNameTB.Focus(); @@ -51,12 +73,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial if (_actionType == ActionType.Add) { - MaterialInfoTypeHelp.Add(materialinfoTypeName); + MaterialInfoTypeHelp.Add(materialinfoTypeName,mtypeId); } if (_actionType == ActionType.Modify) { - MaterialInfoTypeHelp.Update(_materialInfoType.Id,materialinfoTypeName); + MaterialInfoTypeHelp.Update(_materialInfoType.Id,materialinfoTypeName,mtypeId); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/InitDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/InitDb.cs index 187f20a..633c763 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/InitDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/InitDb.cs @@ -34,7 +34,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial private void FileControl() { - DataTable table = MaterialInfoTypeHelp.GetTable("select id,MaterialTypeName,Remark from MaterialInfoType"); + DataTable table = MaterialInfoTypeHelp.GetTable(@"select a.*,b.Name as bname from lj_material as a left join lj_material_type as b + on a.MtypeId = b.Id"); if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoType.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoType.cs index 1c56a0a..b089a1b 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoType.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoType.cs @@ -3,6 +3,8 @@ public class MaterialInfoType { public int Id { get; set; } - public string MaterialInfoTypeName { get; set; } + public string MaterialName { get; set; } + + public string MTypeId { get; set; } } } \ 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 dd13bd5..7787b62 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/MaterialInfoTypeHelp.cs @@ -2,100 +2,76 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Data; +using System.Runtime.CompilerServices; +using DevExpress.ClipboardSource.SpreadsheetML; using DevExpress.DataProcessing; using FastReport.Data; -using Mesnac.Codd.Session; namespace Mesnac.Action.ChemicalWeighing.LjMaterial { - - - public class DBHelp + public class MyNameValue + { + public int Id { get; set; } + public string Name { get; set; } + } + + + public class MaterialInfoTypeHelp:DBHelp { - protected static IDictionary GetDefault() - { - return new Dictionary(); - } + - public static DataTable GetTable(string sql) + + public static int GetMtypeIdById(int id) { - DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); - if (dbHelper == null) - { - throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); - } - dbHelper.ClearParameter(); - dbHelper.CommandType = CommandType.Text; - string strSql = sql; - dbHelper.CommandText = strSql; - DataTable table = dbHelper.ToDataTable(); - return table; - } + string sql = "select MTypeId from lj_material where Id="+id; + DataTable dt = GetTable(sql); + return Convert.ToInt32(dt.Rows[0][0].ToString()); - public static DataTable GetTable(string sql, IDictionary dic) + } + + public static IList GetType() { - DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); - if (dbHelper == null) + string sql = "select * from lj_material_type "; + var dt = GetTable(sql); + IList ls = new List(); + foreach (DataRow dr in dt.Rows) { - throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + ls.Add(new MyNameValue() + { + Id = Convert.ToInt32(dr[0].ToString()), + Name = dr[1].ToString() + }); + } - dbHelper.ClearParameter(); - dbHelper.CommandType = CommandType.Text; - string insertUserSql = sql; - dbHelper.CommandText = insertUserSql; - foreach (var keyValuePair in dic) - { - dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); - } - DataTable table = dbHelper.ToDataTable(); - return table; + return ls; } + - public static void ExecuteNonQuery(string sql) - { - ExecuteNonQuery(sql,new Dictionary()); - } - public static void ExecuteNonQuery(string sql, IDictionary dic) + + public static IList GetALL() { - DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local); - if (dbHelper == null) + string sql = "select * from lj_material "; + var dt = GetTable(sql); + IList ls = new List(); + foreach (DataRow dr in dt.Rows) { - throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError); + ls.Add(new MyNameValue() + { + Id = Convert.ToInt32(dr[0].ToString()), + Name = dr[1].ToString() + }); + } - dbHelper.ClearParameter(); - dbHelper.CommandType = CommandType.Text; - string insertUserSql = sql; - dbHelper.CommandText = insertUserSql; - foreach (var keyValuePair in dic) - { - dbHelper.AddParameter(keyValuePair.Key,keyValuePair.Value); - } - - dbHelper.ExecuteNonQuery(); - } + return ls; + } - } - - - - public class MyNameValue - { - public int Id { get; set; } - public string Name { get; set; } - } - - - public class MaterialInfoTypeHelp:DBHelp - { - - - public static IList GetALL() + public static IList GetALLByTypeId(int MTypeId) { - string sql = "select * from MaterialInfoType "; + string sql = "select * from lj_material where MTypeId="+MTypeId; var dt = GetTable(sql); IList ls = new List(); foreach (DataRow dr in dt.Rows) @@ -111,37 +87,41 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial return ls; } + public static int Exist(string materialinfoTypeName) { - string sql = "select * from MaterialInfoType where MaterialTypeName=@mName"; + string sql = "select * from lj_material where MaterialName=@mName"; IDictionary dic = new Dictionary(); dic.Add("@mName",materialinfoTypeName); var dataTable = GetTable(sql,dic); return dataTable.Rows.Count; } - public static void Add(string materialinfoTypeName) + public static void Add(string materialinfoTypeName,int MtypeId) { - string sql = @"INSERT INTO [MaterialInfoType] ( - [MaterialTypeName] , - [Remark] ) VALUES (@MaterialTypeName,'')"; + string sql = @"INSERT INTO [lj_material] ( + [MaterialName] ,MTypeId + [Remark] ) VALUES (@MaterialName,@MtypeId,'')"; IDictionary dic = new Dictionary(); - dic.Add("@MaterialTypeName",materialinfoTypeName); + dic.Add("@MaterialName",materialinfoTypeName); + dic.Add("@MtypeId",MtypeId); ExecuteNonQuery(sql,dic); } - public static void Update(int id,string materialinfoTypeName) + public static void Update(int id,string materialinfoTypeName,int MtypeId) { - string sql = @"update [MaterialInfoType] set -[MaterialTypeName] = @MaterialTypeName where id=@id"; + string sql = @"update [lj_material] set + [MTypeId]=@MtypeId, +[MaterialName] = @MaterialName where id=@id"; IDictionary dic = new Dictionary(); - dic.Add("@MaterialTypeName",materialinfoTypeName); + dic.Add("@MaterialName",materialinfoTypeName); + dic.Add("@MtypeId",MtypeId); dic.Add("@id",id); ExecuteNonQuery(sql,dic); @@ -150,7 +130,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial public static void Del(int id) { - string sql = "delete from [MaterialInfoType] where id="+id; + string sql = "delete from [lj_material] where id="+id; ExecuteNonQuery(sql); } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/UpdateAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/UpdateAction.cs index cc2e48f..acc5cfe 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/UpdateAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/UpdateAction.cs @@ -58,7 +58,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial FrmMaterial frmInsertMaterial = new FrmMaterial(ActionType.Modify,new MaterialInfoType() { Id = id, - MaterialInfoTypeName = name + MaterialName = name }); frmInsertMaterial.ShowDialog(this._runtime.BaseControl.MCRoot as Control); if (frmInsertMaterial.DialogResult == DialogResult.OK) @@ -69,9 +69,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial } frmInsertMaterial.Dispose(); - this._runtime.BaseControl.MCEnabled = true; + } + this._runtime.BaseControl.MCEnabled = true; + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/DayMaterial.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/DayMaterial.cs new file mode 100644 index 0000000..91201da --- /dev/null +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/DayMaterial.cs @@ -0,0 +1,9 @@ +using Mesnac.Action.ChemicalWeighing.LjMaterial; + +namespace Mesnac.Action.ChemicalWeighing.LjTanNum +{ + public class DayMaterialDb:DBHelp + { + + } +} \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs index 848385c..77dba14 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.Designer.cs @@ -33,42 +33,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum /// 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.DayBinName = new System.Windows.Forms.TextBox(); + this.DrpType = new System.Windows.Forms.ComboBox(); 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.Location = new System.Drawing.Point(372, 627); + this.btnCancel.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(98, 45); + this.btnCancel.Size = new System.Drawing.Size(147, 68); this.btnCancel.TabIndex = 13; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; @@ -76,10 +57,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum // // btnOK // - this.btnOK.Location = new System.Drawing.Point(75, 418); - this.btnOK.Margin = new System.Windows.Forms.Padding(5); + this.btnOK.Location = new System.Drawing.Point(112, 627); + this.btnOK.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(98, 45); + this.btnOK.Size = new System.Drawing.Size(147, 68); this.btnOK.TabIndex = 12; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -88,191 +69,91 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum // 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.Location = new System.Drawing.Point(110, 117); + this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(59, 12); + this.label1.Size = new System.Drawing.Size(89, 18); this.label1.TabIndex = 11; this.label1.Text = "物料名称:"; // // comboBox1 // this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(154, 40); + this.comboBox1.Location = new System.Drawing.Point(231, 112); + this.comboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.Size = new System.Drawing.Size(180, 26); 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.Location = new System.Drawing.Point(110, 32); + this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(59, 12); + this.label3.Size = new System.Drawing.Size(89, 18); this.label3.TabIndex = 11; - this.label3.Text = "日罐编码:"; + 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.Location = new System.Drawing.Point(110, 213); + this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(59, 12); + this.label4.Size = new System.Drawing.Size(89, 18); 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.label4.Text = "日罐名称:"; // - 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); + // DayBinName // - // SlowScale + this.DayBinName.Enabled = false; + this.DayBinName.Location = new System.Drawing.Point(231, 213); + this.DayBinName.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); + this.DayBinName.Name = "DayBinName"; + this.DayBinName.Size = new System.Drawing.Size(192, 28); + this.DayBinName.TabIndex = 14; // - 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; + // DrpType // - // 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 = "点动值:"; + this.DrpType.FormattingEnabled = true; + this.DrpType.Location = new System.Drawing.Point(231, 24); + this.DrpType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DrpType.Name = "DrpType"; + this.DrpType.Size = new System.Drawing.Size(180, 26); + this.DrpType.TabIndex = 15; + this.DrpType.SelectedIndexChanged += new System.EventHandler(this.DrpType_SelectedIndexChanged); // // FrmTankNum // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(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.ClientSize = new System.Drawing.Size(680, 804); + this.Controls.Add(this.DrpType); 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.DayBinName); 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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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 System.Windows.Forms.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; + private TextBox DayBinName; + private System.Windows.Forms.ComboBox DrpType; } } \ 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 d8b3197..85d02e9 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/FrmTankNum.cs @@ -17,34 +17,55 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum public FrmTankNum(TankNumCodingView view) : this() { _tankNumCodingView = view; + var dataTable = TankNumCodingDbHelp.GetById(view.Id); + if (dataTable.Rows.Count == 1) + { + var da = dataTable.Rows[0]; + _tankNumCodingView.MTypeId = Convert.ToInt32(da["MTypeId"]); + _tankNumCodingView.MId = Convert.ToInt32(da["MId"]); + _tankNumCodingView.DayBinName = da["DayBinName"].ToString(); + + this.DayBinName.Text = _tankNumCodingView.DayBinName; + this.DayBinName.Enabled = false; + } + + Init(); } private void Init() { - var nameValueCollection = MaterialInfoTypeHelp.GetALL(); - this.comboBox1.DataSource = nameValueCollection; - comboBox1.ValueMember = "Id"; - comboBox1.DisplayMember = "Name"; - foreach (MyNameValue combo in comboBox1.Items) + var drpMtype = MaterialInfoTypeHelp.GetType(); + DrpType.ValueMember = "Id"; + DrpType.DisplayMember = "Name"; + this.DrpType.DataSource = drpMtype; + + + foreach (MyNameValue combo in DrpType.Items) { if (combo.Id == _tankNumCodingView.MTypeId) { - comboBox1.SelectedItem = combo; + DrpType.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(); - } + + // + // var nameValueCollection = MaterialInfoTypeHelp.GetALLByTypeId(Convert.ToInt32(DrpType.SelectedValue)); + // this.comboBox1.DataSource = nameValueCollection; + // comboBox1.ValueMember = "Id"; + // comboBox1.DisplayMember = "Name"; + // + // + // foreach (MyNameValue combo in comboBox1.Items) + // { + // if (combo.Id == _tankNumCodingView.MId) + // { + // comboBox1.SelectedItem = combo; + // break; + // } + // } + } @@ -53,162 +74,27 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum this.Close(); } - private void textBox1_TextChanged(object sender, EventArgs e) + + private void btnOK_Click(object sender, EventArgs e) { + _tankNumCodingView.MTypeId =Convert.ToInt32(DrpType.SelectedValue); + _tankNumCodingView.MId =Convert.ToInt32(comboBox1.SelectedValue); + _tankNumCodingView.MTypeName = DrpType.Text; + _tankNumCodingView.MName = comboBox1.Text; + TankNumCodingDbHelp.Update(_tankNumCodingView); + this.DialogResult = System.Windows.Forms.DialogResult.OK; } - private void label6_Click(object sender, EventArgs e) + private void DrpType_SelectedIndexChanged(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; - } - } + + var nameValueCollection = MaterialInfoTypeHelp.GetALLByTypeId(Convert.ToInt32(DrpType.SelectedValue)); + this.comboBox1.DataSource = nameValueCollection; + comboBox1.ValueMember = "Id"; + comboBox1.DisplayMember = "Name"; - - - - 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.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); - this.DialogResult = System.Windows.Forms.DialogResult.OK; } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs index d271a09..7e6f66e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/InItDbAction.cs @@ -28,9 +28,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum private void FileControl() { - string sql = @"select tank.*,mater.MaterialTypeName from TankNumCoding tank - left join MaterialInfoType mater - on tank.MTypeId=mater.Id"; + string sql = @"select Id, Code, DayBinName, MTypeId,MTypeName, MId, MName, Remark from lj_day_material;"; DataTable table = DBHelp.GetTable(sql); if (this._materialGridControl != null && this._materialGridControl.BaseControl != null) @@ -41,7 +39,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum } else { - ICSharpCode.Core.LoggingService.Warn("刷新物料信息失败：物料数据控件为Null..."); + ICSharpCode.Core.LoggingService.Warn("刷新日罐信息失败：物料数据控件为Null..."); } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs index 9135561..37c51af 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingDbHelp.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Data; using Mesnac.Action.ChemicalWeighing.LjMaterial; namespace Mesnac.Action.ChemicalWeighing.LjTanNum @@ -7,24 +8,30 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum public class TankNumCodingDbHelp:DBHelp { + + + public static DataTable GetById(int id) + { + string sql = "select Id, Code, DayBinName, MTypeId,MTypeName, MId, MName, Remark from lj_day_material where Id="+id; + DataTable dt = GetTable(sql); + return dt; + } + public static int Update(TankNumCodingView view) { - string sql = @"update [TankNumCoding] set + string sql = @"update [lj_day_material] set [MTypeId] = @MTypeId, -[High] = @High, -[Slow] = @Slow, -[SlowScale] = @SlowScale, -[Lead] = @Lead, -[Jog] = @Jog where id=@id"; +[MTypeName] = @MTypeName, +[MId] = @MId, +[MName] = @MName 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); + dic.Add("@MTypeName",view.MTypeName); + dic.Add("@MId",view.MId); + dic.Add("@MName",view.MName); + ExecuteNonQuery(sql, dic); return 1; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs index b38f26c..06bb2ff 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/TankNumCodingView.cs @@ -9,11 +9,11 @@ /// /// /// - public string TankCode { get; set; } + public string Code { get; set; } /// /// /// - public string TankName { get; set; } + public string DayBinName { get; set; } /// /// /// @@ -21,31 +21,21 @@ /// /// /// - public float High { get; set; } + public string MTypeName { get; set; } /// /// /// - public float Slow { get; set; } + public int MId { get; set; } /// /// /// - public float SlowScale { get; set; } - /// - /// - /// - public float Lead { get; set; } - /// - /// - /// - public float Jog { get; set; } + public string MName { 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 index 4c65a22..81798c6 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/UpdateAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjTanNum/UpdateAction.cs @@ -36,14 +36,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjTanNum 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); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 7563327..d76e206 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -248,6 +248,7 @@ + Form @@ -308,6 +309,7 @@ + Form diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml index 92318c8..d1ed6ea 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormMaterialInfoType.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAgAAAFIAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAADQYFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYGAAAAAmlkBgcAAAAG5bqP5Y+3AQUAAAAEAAAABggAAAAQTWF0ZXJpYWxUeXBlTmFtZQYJAAAADOeJqeaWmeWQjeensAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAwAAAF0AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAANBQUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgcAAAACaWQGCAAAAAbluo/lj7cBBQAAAAQAAAAGCQAAAAxNYXRlcmlhbE5hbWUGCgAAAAznianmlpnlkI3np7ABBgAAAAQAAAAGCwAAAAViTmFtZQYMAAAADOeJqeaWmeexu+WIqws= AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml index 9a33403..059dfc9 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormTankNum.xml @@ -3,7 +3,7 @@ False - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACQAAAI0AAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAANBwUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABg0AAAACaWQGDgAAAAbluo/lj7cBBQAAAAQAAAAGDwAAAAhUYW5rQ29kZQYQAAAADOaXpee9kOe8lueggQEGAAAABAAAAAYRAAAACFRhbmtOYW1lBhIAAAAM5pel572Q5ZCN56ewAQcAAAAEAAAABhMAAAAQTWF0ZXJpYWxUeXBlTmFtZQYUAAAABueJqeaWmQEIAAAABAAAAAYVAAAABEhpZ2gGFgAAABLpq5jpgJ/np7Dph4/pgJ/luqYBCQAAAAQAAAAGFwAAAARTbG93BhgAAAAS5oWi6YCf56ew6YeP6YCf5bqmAQoAAAAEAAAABhkAAAAJU2xvd1NjYWxlBhoAAAAJ5oWi56ew5YC8AQsAAAAEAAAABhsAAAAETGVhZAYcAAAACeaPkOWJjemHjwEMAAAABAAAAAYdAAAAA0pvZwYeAAAACeeCueWKqOWAvAs= + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABgAAAJQAAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAANCgUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABgoAAAACaWQGCwAAAAbluo/lj7cBBQAAAAQAAAAGDAAAAARDb2RlBg0AAAAM5pel572Q57yW56CBAQYAAAAEAAAABg4AAAAKRGF5QmluTmFtZQYPAAAADOaXpee9kOWQjeensAEHAAAABAAAAAYQAAAACU1UeXBlTmFtZQYRAAAADOeJqeaWmeexu+WIqwEIAAAABAAAAAYSAAAABU1OYW1lBhMAAAAM54mp5paZ5ZCN56ewAQkAAAAEAAAABhQAAAAGUmVtYXJrBhUAAAAG5aSH5rOoCw== AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL