diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
index c7f6ce8..b98e241 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
@@ -45,13 +45,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.dataGridWater1 = new System.Windows.Forms.DataGridView();
+ this.ComBoxSilo1BinWater = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.TxtSilo1WeightWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.TxtSilo1ToleranceWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CbSiloC = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label();
this.dataGridSilo1 = new System.Windows.Forms.DataGridView();
+ this.ComBoxSilo1Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.TxtSilo1Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.TxtSilo1Tolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.dataGridWater2 = new System.Windows.Forms.DataGridView();
+ this.ComBoxSilo2BinWater = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.TxtSilo2WeightWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.TxtSilo2ToleranceWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridSilo2 = new System.Windows.Forms.DataGridView();
+ this.ComBoxSilo2Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.TxtSilo2Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.TxtSilo2Tolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.dataGridDryer = new System.Windows.Forms.DataGridView();
this.ComBoxDryer1Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
@@ -65,54 +77,42 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.CbWeterH = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.dataGridWeter1 = new System.Windows.Forms.DataGridView();
+ this.ComBoxWeter1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.ComBoxWeter1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter1SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter1SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.dataGridWeter2 = new System.Windows.Forms.DataGridView();
+ this.ComBoxWeter2Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.ComBoxWeter2TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter2Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter2Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter2SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxWeter2SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.CbSiloH = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.dataGridSiloH1 = new System.Windows.Forms.DataGridView();
- this.tabPage2 = new System.Windows.Forms.TabPage();
- this.dataGridSiloH2 = new System.Windows.Forms.DataGridView();
- this.groupBox7 = new System.Windows.Forms.GroupBox();
- this.dataGridDryer1Action = new System.Windows.Forms.DataGridView();
- this.BtnCanel = new System.Windows.Forms.Button();
- this.ComBoxSilo1Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.TxtSilo1Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.TxtSilo1Tolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxSilo1BinWater = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.TxtSilo1WeightWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.TxtSilo1ToleranceWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxSilo2Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.TxtSilo2Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.TxtSilo2Tolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxSilo2BinWater = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.TxtSilo2WeightWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.TxtSilo2ToleranceWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxDryer1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.ComBoxDryer1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxDryer1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxDryer1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxSilo1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxSilo1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxSilo1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxSilo1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.dataGridSiloH2 = new System.Windows.Forms.DataGridView();
this.ComBoxSilo2Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxSilo2TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxSilo2Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxSilo2Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.ComBoxWeter1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter1SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter1SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter2Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
- this.ComBoxWeter2TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter2Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter2Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter2SetValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ComBoxWeter2SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.dataGridDryer1Action = new System.Windows.Forms.DataGridView();
+ this.ComBoxDryer1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.ComBoxDryer1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxDryer1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ComBoxDryer1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.BtnCanel = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabControl2.SuspendLayout();
@@ -149,16 +149,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.txtName);
this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Location = new System.Drawing.Point(12, 24);
+ this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(997, 46);
+ this.groupBox1.Size = new System.Drawing.Size(630, 46);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "配方";
//
// txtCpVersion
//
- this.txtCpVersion.Location = new System.Drawing.Point(537, 16);
+ this.txtCpVersion.Location = new System.Drawing.Point(488, 15);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5);
this.txtCpVersion.MaxLength = 100;
this.txtCpVersion.Name = "txtCpVersion";
@@ -168,7 +168,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(468, 19);
+ this.label1.Location = new System.Drawing.Point(419, 19);
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);
@@ -178,7 +178,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// DrpCpType
//
this.DrpCpType.FormattingEnabled = true;
- this.DrpCpType.Location = new System.Drawing.Point(302, 17);
+ this.DrpCpType.Location = new System.Drawing.Point(282, 16);
this.DrpCpType.Name = "DrpCpType";
this.DrpCpType.Size = new System.Drawing.Size(129, 20);
this.DrpCpType.TabIndex = 58;
@@ -186,7 +186,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(233, 20);
+ this.label4.Location = new System.Drawing.Point(215, 19);
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);
@@ -195,7 +195,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// txtName
//
- this.txtName.Location = new System.Drawing.Point(88, 16);
+ this.txtName.Location = new System.Drawing.Point(76, 15);
this.txtName.Margin = new System.Windows.Forms.Padding(5);
this.txtName.MaxLength = 100;
this.txtName.Name = "txtName";
@@ -205,7 +205,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(19, 19);
+ this.label3.Location = new System.Drawing.Point(12, 19);
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);
@@ -218,7 +218,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox2.Controls.Add(this.groupBox3);
this.groupBox2.Location = new System.Drawing.Point(12, 76);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(454, 637);
+ this.groupBox2.Size = new System.Drawing.Size(445, 637);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "称量配方";
@@ -227,10 +227,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Controls.Add(this.tabPage4);
- this.tabControl2.Location = new System.Drawing.Point(14, 220);
+ this.tabControl2.Location = new System.Drawing.Point(6, 212);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(434, 400);
+ this.tabControl2.Size = new System.Drawing.Size(433, 419);
this.tabControl2.TabIndex = 1;
//
// tabPage3
@@ -242,7 +242,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(426, 374);
+ this.tabPage3.Size = new System.Drawing.Size(425, 393);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -250,9 +250,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox6
//
this.groupBox6.Controls.Add(this.dataGridWater1);
- this.groupBox6.Location = new System.Drawing.Point(7, 236);
+ this.groupBox6.Location = new System.Drawing.Point(6, 225);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(413, 132);
+ this.groupBox6.Size = new System.Drawing.Size(413, 162);
this.groupBox6.TabIndex = 71;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "水称";
@@ -267,10 +267,30 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWater1.Location = new System.Drawing.Point(6, 20);
this.dataGridWater1.Name = "dataGridWater1";
this.dataGridWater1.RowTemplate.Height = 23;
- this.dataGridWater1.Size = new System.Drawing.Size(400, 98);
+ this.dataGridWater1.Size = new System.Drawing.Size(401, 136);
this.dataGridWater1.TabIndex = 69;
this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded);
//
+ // ComBoxSilo1BinWater
+ //
+ this.ComBoxSilo1BinWater.HeaderText = "物料选择";
+ this.ComBoxSilo1BinWater.Name = "ComBoxSilo1BinWater";
+ //
+ // TxtSilo1WeightWater
+ //
+ this.TxtSilo1WeightWater.DataPropertyName = "Weight";
+ this.TxtSilo1WeightWater.HeaderText = "重量";
+ this.TxtSilo1WeightWater.MaxInputLength = 100;
+ this.TxtSilo1WeightWater.Name = "TxtSilo1WeightWater";
+ this.TxtSilo1WeightWater.Width = 95;
+ //
+ // TxtSilo1ToleranceWater
+ //
+ this.TxtSilo1ToleranceWater.DataPropertyName = "Tolerance";
+ this.TxtSilo1ToleranceWater.HeaderText = "公差";
+ this.TxtSilo1ToleranceWater.Name = "TxtSilo1ToleranceWater";
+ this.TxtSilo1ToleranceWater.Width = 95;
+ //
// CbSiloC
//
this.CbSiloC.AutoSize = true;
@@ -298,13 +318,34 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1Bin,
this.TxtSilo1Weight,
this.TxtSilo1Tolerance});
- this.dataGridSilo1.Location = new System.Drawing.Point(3, 44);
+ this.dataGridSilo1.Location = new System.Drawing.Point(6, 44);
this.dataGridSilo1.Name = "dataGridSilo1";
this.dataGridSilo1.RowTemplate.Height = 23;
- this.dataGridSilo1.Size = new System.Drawing.Size(420, 175);
+ this.dataGridSilo1.Size = new System.Drawing.Size(413, 175);
this.dataGridSilo1.TabIndex = 63;
this.dataGridSilo1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo_DefaultValuesNeeded);
//
+ // ComBoxSilo1Bin
+ //
+ this.ComBoxSilo1Bin.HeaderText = "物料选择";
+ this.ComBoxSilo1Bin.Name = "ComBoxSilo1Bin";
+ this.ComBoxSilo1Bin.Width = 150;
+ //
+ // TxtSilo1Weight
+ //
+ this.TxtSilo1Weight.DataPropertyName = "Weight";
+ this.TxtSilo1Weight.HeaderText = "重量";
+ this.TxtSilo1Weight.MaxInputLength = 100;
+ this.TxtSilo1Weight.Name = "TxtSilo1Weight";
+ this.TxtSilo1Weight.Width = 95;
+ //
+ // TxtSilo1Tolerance
+ //
+ this.TxtSilo1Tolerance.DataPropertyName = "Tolerance";
+ this.TxtSilo1Tolerance.HeaderText = "公差";
+ this.TxtSilo1Tolerance.Name = "TxtSilo1Tolerance";
+ this.TxtSilo1Tolerance.Width = 95;
+ //
// tabPage4
//
this.tabPage4.Controls.Add(this.groupBox4);
@@ -312,7 +353,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(426, 374);
+ this.tabPage4.Size = new System.Drawing.Size(425, 393);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -341,6 +382,26 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWater2.TabIndex = 69;
this.dataGridWater2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater2_DefaultValuesNeeded);
//
+ // ComBoxSilo2BinWater
+ //
+ this.ComBoxSilo2BinWater.HeaderText = "物料选择";
+ this.ComBoxSilo2BinWater.Name = "ComBoxSilo2BinWater";
+ //
+ // TxtSilo2WeightWater
+ //
+ this.TxtSilo2WeightWater.DataPropertyName = "Weight";
+ this.TxtSilo2WeightWater.HeaderText = "重量";
+ this.TxtSilo2WeightWater.MaxInputLength = 100;
+ this.TxtSilo2WeightWater.Name = "TxtSilo2WeightWater";
+ this.TxtSilo2WeightWater.Width = 95;
+ //
+ // TxtSilo2ToleranceWater
+ //
+ this.TxtSilo2ToleranceWater.DataPropertyName = "Tolerance";
+ this.TxtSilo2ToleranceWater.HeaderText = "公差";
+ this.TxtSilo2ToleranceWater.Name = "TxtSilo2ToleranceWater";
+ this.TxtSilo2ToleranceWater.Width = 95;
+ //
// dataGridSilo2
//
this.dataGridSilo2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -355,10 +416,32 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSilo2.TabIndex = 72;
this.dataGridSilo2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo2_DefaultValuesNeeded);
//
+ // ComBoxSilo2Bin
+ //
+ this.ComBoxSilo2Bin.HeaderText = "物料选择";
+ this.ComBoxSilo2Bin.Name = "ComBoxSilo2Bin";
+ this.ComBoxSilo2Bin.Width = 150;
+ //
+ // TxtSilo2Weight
+ //
+ this.TxtSilo2Weight.DataPropertyName = "Weight";
+ this.TxtSilo2Weight.HeaderText = "重量";
+ this.TxtSilo2Weight.MaxInputLength = 100;
+ this.TxtSilo2Weight.Name = "TxtSilo2Weight";
+ this.TxtSilo2Weight.Width = 95;
+ //
+ // TxtSilo2Tolerance
+ //
+ this.TxtSilo2Tolerance.DataPropertyName = "Tolerance";
+ this.TxtSilo2Tolerance.HeaderText = "公差";
+ this.TxtSilo2Tolerance.MaxInputLength = 100;
+ this.TxtSilo2Tolerance.Name = "TxtSilo2Tolerance";
+ this.TxtSilo2Tolerance.Width = 95;
+ //
// groupBox3
//
this.groupBox3.Controls.Add(this.dataGridDryer);
- this.groupBox3.Location = new System.Drawing.Point(11, 20);
+ this.groupBox3.Location = new System.Drawing.Point(6, 20);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(433, 186);
this.groupBox3.TabIndex = 0;
@@ -413,7 +496,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnSave
//
- this.BtnSave.Location = new System.Drawing.Point(88, 738);
+ this.BtnSave.Location = new System.Drawing.Point(88, 719);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(119, 47);
this.BtnSave.TabIndex = 2;
@@ -426,9 +509,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox5.Controls.Add(this.tabControl3);
this.groupBox5.Controls.Add(this.tabControl1);
this.groupBox5.Controls.Add(this.groupBox7);
- this.groupBox5.Location = new System.Drawing.Point(472, 76);
+ this.groupBox5.Location = new System.Drawing.Point(463, 76);
this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(751, 692);
+ this.groupBox5.Size = new System.Drawing.Size(721, 692);
this.groupBox5.TabIndex = 3;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方";
@@ -437,10 +520,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.tabControl3.Controls.Add(this.tabPage5);
this.tabControl3.Controls.Add(this.tabPage6);
- this.tabControl3.Location = new System.Drawing.Point(14, 430);
+ this.tabControl3.Location = new System.Drawing.Point(6, 430);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
- this.tabControl3.Size = new System.Drawing.Size(710, 237);
+ this.tabControl3.Size = new System.Drawing.Size(709, 256);
this.tabControl3.TabIndex = 5;
//
// tabPage5
@@ -451,7 +534,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage5.Size = new System.Drawing.Size(702, 211);
+ this.tabPage5.Size = new System.Drawing.Size(701, 230);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "湿混机(#A)";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -486,20 +569,59 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxWeter1Speed,
this.ComBoxWeter1SetValue,
this.ComBoxWeter1SetTolerance});
- this.dataGridWeter1.Location = new System.Drawing.Point(9, 36);
+ this.dataGridWeter1.Location = new System.Drawing.Point(6, 36);
this.dataGridWeter1.Name = "dataGridWeter1";
this.dataGridWeter1.RowTemplate.Height = 23;
- this.dataGridWeter1.Size = new System.Drawing.Size(687, 149);
+ this.dataGridWeter1.Size = new System.Drawing.Size(689, 188);
this.dataGridWeter1.TabIndex = 64;
this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
//
+ // ComBoxWeter1Code
+ //
+ this.ComBoxWeter1Code.HeaderText = "动作";
+ this.ComBoxWeter1Code.Name = "ComBoxWeter1Code";
+ this.ComBoxWeter1Code.Width = 150;
+ //
+ // ComBoxWeter1TimeInfo
+ //
+ this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxWeter1TimeInfo.HeaderText = "时间";
+ this.ComBoxWeter1TimeInfo.MaxInputLength = 100;
+ this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo";
+ this.ComBoxWeter1TimeInfo.Width = 95;
+ //
+ // ComBoxWeter1Temp
+ //
+ this.ComBoxWeter1Temp.DataPropertyName = "Temp";
+ this.ComBoxWeter1Temp.HeaderText = "温度";
+ this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp";
+ this.ComBoxWeter1Temp.Width = 95;
+ //
+ // ComBoxWeter1Speed
+ //
+ this.ComBoxWeter1Speed.DataPropertyName = "Speed";
+ this.ComBoxWeter1Speed.HeaderText = "速度";
+ this.ComBoxWeter1Speed.Name = "ComBoxWeter1Speed";
+ //
+ // ComBoxWeter1SetValue
+ //
+ this.ComBoxWeter1SetValue.DataPropertyName = "SetValue";
+ this.ComBoxWeter1SetValue.HeaderText = "设定重量";
+ this.ComBoxWeter1SetValue.Name = "ComBoxWeter1SetValue";
+ //
+ // ComBoxWeter1SetTolerance
+ //
+ this.ComBoxWeter1SetTolerance.DataPropertyName = "SetTolerance";
+ this.ComBoxWeter1SetTolerance.HeaderText = "设定公差";
+ this.ComBoxWeter1SetTolerance.Name = "ComBoxWeter1SetTolerance";
+ //
// tabPage6
//
this.tabPage6.Controls.Add(this.dataGridWeter2);
this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage6.Size = new System.Drawing.Size(702, 211);
+ this.tabPage6.Size = new System.Drawing.Size(701, 230);
this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "湿混机(#B)";
this.tabPage6.UseVisualStyleBackColor = true;
@@ -518,18 +640,57 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridWeter2.Location = new System.Drawing.Point(3, 3);
this.dataGridWeter2.Name = "dataGridWeter2";
this.dataGridWeter2.RowTemplate.Height = 23;
- this.dataGridWeter2.Size = new System.Drawing.Size(696, 205);
+ this.dataGridWeter2.Size = new System.Drawing.Size(695, 224);
this.dataGridWeter2.TabIndex = 65;
this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
//
+ // ComBoxWeter2Code
+ //
+ this.ComBoxWeter2Code.HeaderText = "动作";
+ this.ComBoxWeter2Code.Name = "ComBoxWeter2Code";
+ this.ComBoxWeter2Code.Width = 150;
+ //
+ // ComBoxWeter2TimeInfo
+ //
+ this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxWeter2TimeInfo.HeaderText = "时间";
+ this.ComBoxWeter2TimeInfo.MaxInputLength = 100;
+ this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo";
+ this.ComBoxWeter2TimeInfo.Width = 95;
+ //
+ // ComBoxWeter2Temp
+ //
+ this.ComBoxWeter2Temp.DataPropertyName = "Temp";
+ this.ComBoxWeter2Temp.HeaderText = "温度";
+ this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp";
+ this.ComBoxWeter2Temp.Width = 95;
+ //
+ // ComBoxWeter2Speed
+ //
+ this.ComBoxWeter2Speed.DataPropertyName = "Speed";
+ this.ComBoxWeter2Speed.HeaderText = "速度";
+ this.ComBoxWeter2Speed.Name = "ComBoxWeter2Speed";
+ //
+ // ComBoxWeter2SetValue
+ //
+ this.ComBoxWeter2SetValue.DataPropertyName = "SetValue";
+ this.ComBoxWeter2SetValue.HeaderText = "设定重量";
+ this.ComBoxWeter2SetValue.Name = "ComBoxWeter2SetValue";
+ //
+ // ComBoxWeter2SetTolerance
+ //
+ this.ComBoxWeter2SetTolerance.DataPropertyName = "SetTolerance";
+ this.ComBoxWeter2SetTolerance.HeaderText = "设定公差";
+ this.ComBoxWeter2SetTolerance.Name = "ComBoxWeter2SetTolerance";
+ //
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Location = new System.Drawing.Point(14, 220);
+ this.tabControl1.Location = new System.Drawing.Point(6, 232);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(706, 194);
+ this.tabControl1.Size = new System.Drawing.Size(709, 197);
this.tabControl1.TabIndex = 4;
//
// tabPage1
@@ -540,7 +701,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(698, 168);
+ this.tabPage1.Size = new System.Drawing.Size(701, 171);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "糊化机(#A)";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -573,20 +734,47 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1TimeInfo,
this.ComBoxSilo1Temp,
this.ComBoxSilo1Speed});
- this.dataGridSiloH1.Location = new System.Drawing.Point(9, 34);
+ this.dataGridSiloH1.Location = new System.Drawing.Point(6, 29);
this.dataGridSiloH1.Name = "dataGridSiloH1";
this.dataGridSiloH1.RowTemplate.Height = 23;
- this.dataGridSiloH1.Size = new System.Drawing.Size(667, 118);
+ this.dataGridSiloH1.Size = new System.Drawing.Size(689, 136);
this.dataGridSiloH1.TabIndex = 66;
this.dataGridSiloH1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH1_DefaultValuesNeeded);
//
+ // ComBoxSilo1Code
+ //
+ this.ComBoxSilo1Code.HeaderText = "动作";
+ this.ComBoxSilo1Code.Name = "ComBoxSilo1Code";
+ this.ComBoxSilo1Code.Width = 150;
+ //
+ // ComBoxSilo1TimeInfo
+ //
+ this.ComBoxSilo1TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxSilo1TimeInfo.HeaderText = "时间";
+ this.ComBoxSilo1TimeInfo.MaxInputLength = 100;
+ this.ComBoxSilo1TimeInfo.Name = "ComBoxSilo1TimeInfo";
+ this.ComBoxSilo1TimeInfo.Width = 95;
+ //
+ // ComBoxSilo1Temp
+ //
+ this.ComBoxSilo1Temp.DataPropertyName = "Temp";
+ this.ComBoxSilo1Temp.HeaderText = "温度";
+ this.ComBoxSilo1Temp.Name = "ComBoxSilo1Temp";
+ this.ComBoxSilo1Temp.Width = 95;
+ //
+ // ComBoxSilo1Speed
+ //
+ this.ComBoxSilo1Speed.DataPropertyName = "Speed";
+ this.ComBoxSilo1Speed.HeaderText = "速度";
+ this.ComBoxSilo1Speed.Name = "ComBoxSilo1Speed";
+ //
// tabPage2
//
this.tabPage2.Controls.Add(this.dataGridSiloH2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(698, 168);
+ this.tabPage2.Size = new System.Drawing.Size(701, 171);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -603,16 +791,43 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSiloH2.Location = new System.Drawing.Point(3, 3);
this.dataGridSiloH2.Name = "dataGridSiloH2";
this.dataGridSiloH2.RowTemplate.Height = 23;
- this.dataGridSiloH2.Size = new System.Drawing.Size(692, 162);
+ this.dataGridSiloH2.Size = new System.Drawing.Size(695, 165);
this.dataGridSiloH2.TabIndex = 64;
this.dataGridSiloH2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH2_DefaultValuesNeeded);
//
+ // ComBoxSilo2Code
+ //
+ this.ComBoxSilo2Code.HeaderText = "动作";
+ this.ComBoxSilo2Code.Name = "ComBoxSilo2Code";
+ this.ComBoxSilo2Code.Width = 150;
+ //
+ // ComBoxSilo2TimeInfo
+ //
+ this.ComBoxSilo2TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxSilo2TimeInfo.HeaderText = "时间";
+ this.ComBoxSilo2TimeInfo.MaxInputLength = 100;
+ this.ComBoxSilo2TimeInfo.Name = "ComBoxSilo2TimeInfo";
+ this.ComBoxSilo2TimeInfo.Width = 95;
+ //
+ // ComBoxSilo2Temp
+ //
+ this.ComBoxSilo2Temp.DataPropertyName = "Temp";
+ this.ComBoxSilo2Temp.HeaderText = "温度";
+ this.ComBoxSilo2Temp.Name = "ComBoxSilo2Temp";
+ this.ComBoxSilo2Temp.Width = 95;
+ //
+ // ComBoxSilo2Speed
+ //
+ this.ComBoxSilo2Speed.DataPropertyName = "Speed";
+ this.ComBoxSilo2Speed.HeaderText = "速度";
+ this.ComBoxSilo2Speed.Name = "ComBoxSilo2Speed";
+ //
// groupBox7
//
this.groupBox7.Controls.Add(this.dataGridDryer1Action);
- this.groupBox7.Location = new System.Drawing.Point(11, 20);
+ this.groupBox7.Location = new System.Drawing.Point(6, 20);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(702, 186);
+ this.groupBox7.Size = new System.Drawing.Size(709, 208);
this.groupBox7.TabIndex = 0;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "干混机(#A)";
@@ -628,103 +843,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridDryer1Action.Location = new System.Drawing.Point(3, 17);
this.dataGridDryer1Action.Name = "dataGridDryer1Action";
this.dataGridDryer1Action.RowTemplate.Height = 23;
- this.dataGridDryer1Action.Size = new System.Drawing.Size(693, 174);
+ this.dataGridDryer1Action.Size = new System.Drawing.Size(702, 189);
this.dataGridDryer1Action.TabIndex = 63;
this.dataGridDryer1Action.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridDryer1Action_DefaultValuesNeeded);
//
- // BtnCanel
- //
- this.BtnCanel.Location = new System.Drawing.Point(247, 738);
- this.BtnCanel.Name = "BtnCanel";
- this.BtnCanel.Size = new System.Drawing.Size(119, 47);
- this.BtnCanel.TabIndex = 2;
- this.BtnCanel.Text = "取消配方";
- this.BtnCanel.UseVisualStyleBackColor = true;
- this.BtnCanel.Click += new System.EventHandler(this.BtnCanel_Click);
- //
- // ComBoxSilo1Bin
- //
- this.ComBoxSilo1Bin.HeaderText = "物料选择";
- this.ComBoxSilo1Bin.Name = "ComBoxSilo1Bin";
- this.ComBoxSilo1Bin.Width = 150;
- //
- // TxtSilo1Weight
- //
- this.TxtSilo1Weight.DataPropertyName = "Weight";
- this.TxtSilo1Weight.HeaderText = "重量";
- this.TxtSilo1Weight.MaxInputLength = 100;
- this.TxtSilo1Weight.Name = "TxtSilo1Weight";
- this.TxtSilo1Weight.Width = 95;
- //
- // TxtSilo1Tolerance
- //
- this.TxtSilo1Tolerance.DataPropertyName = "Tolerance";
- this.TxtSilo1Tolerance.HeaderText = "公差";
- this.TxtSilo1Tolerance.Name = "TxtSilo1Tolerance";
- this.TxtSilo1Tolerance.Width = 95;
- //
- // ComBoxSilo1BinWater
- //
- this.ComBoxSilo1BinWater.HeaderText = "物料选择";
- this.ComBoxSilo1BinWater.Name = "ComBoxSilo1BinWater";
- //
- // TxtSilo1WeightWater
- //
- this.TxtSilo1WeightWater.DataPropertyName = "Weight";
- this.TxtSilo1WeightWater.HeaderText = "重量";
- this.TxtSilo1WeightWater.MaxInputLength = 100;
- this.TxtSilo1WeightWater.Name = "TxtSilo1WeightWater";
- this.TxtSilo1WeightWater.Width = 95;
- //
- // TxtSilo1ToleranceWater
- //
- this.TxtSilo1ToleranceWater.DataPropertyName = "Tolerance";
- this.TxtSilo1ToleranceWater.HeaderText = "公差";
- this.TxtSilo1ToleranceWater.Name = "TxtSilo1ToleranceWater";
- this.TxtSilo1ToleranceWater.Width = 95;
- //
- // ComBoxSilo2Bin
- //
- this.ComBoxSilo2Bin.HeaderText = "物料选择";
- this.ComBoxSilo2Bin.Name = "ComBoxSilo2Bin";
- this.ComBoxSilo2Bin.Width = 150;
- //
- // TxtSilo2Weight
- //
- this.TxtSilo2Weight.DataPropertyName = "Weight";
- this.TxtSilo2Weight.HeaderText = "重量";
- this.TxtSilo2Weight.MaxInputLength = 100;
- this.TxtSilo2Weight.Name = "TxtSilo2Weight";
- this.TxtSilo2Weight.Width = 95;
- //
- // TxtSilo2Tolerance
- //
- this.TxtSilo2Tolerance.DataPropertyName = "Tolerance";
- this.TxtSilo2Tolerance.HeaderText = "公差";
- this.TxtSilo2Tolerance.MaxInputLength = 100;
- this.TxtSilo2Tolerance.Name = "TxtSilo2Tolerance";
- this.TxtSilo2Tolerance.Width = 95;
- //
- // ComBoxSilo2BinWater
- //
- this.ComBoxSilo2BinWater.HeaderText = "物料选择";
- this.ComBoxSilo2BinWater.Name = "ComBoxSilo2BinWater";
- //
- // TxtSilo2WeightWater
- //
- this.TxtSilo2WeightWater.DataPropertyName = "Weight";
- this.TxtSilo2WeightWater.HeaderText = "重量";
- this.TxtSilo2WeightWater.MaxInputLength = 100;
- this.TxtSilo2WeightWater.Name = "TxtSilo2WeightWater";
- this.TxtSilo2WeightWater.Width = 95;
- //
- // TxtSilo2ToleranceWater
- //
- this.TxtSilo2ToleranceWater.DataPropertyName = "Tolerance";
- this.TxtSilo2ToleranceWater.HeaderText = "公差";
- this.TxtSilo2ToleranceWater.Name = "TxtSilo2ToleranceWater";
- this.TxtSilo2ToleranceWater.Width = 95;
- //
// ComBoxDryer1Code
//
this.ComBoxDryer1Code.AutoComplete = false;
@@ -753,143 +875,21 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1Speed.HeaderText = "速度";
this.ComBoxDryer1Speed.Name = "ComBoxDryer1Speed";
//
- // ComBoxSilo1Code
- //
- this.ComBoxSilo1Code.HeaderText = "动作";
- this.ComBoxSilo1Code.Name = "ComBoxSilo1Code";
- this.ComBoxSilo1Code.Width = 150;
- //
- // ComBoxSilo1TimeInfo
- //
- this.ComBoxSilo1TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxSilo1TimeInfo.HeaderText = "时间";
- this.ComBoxSilo1TimeInfo.MaxInputLength = 100;
- this.ComBoxSilo1TimeInfo.Name = "ComBoxSilo1TimeInfo";
- this.ComBoxSilo1TimeInfo.Width = 95;
- //
- // ComBoxSilo1Temp
- //
- this.ComBoxSilo1Temp.DataPropertyName = "Temp";
- this.ComBoxSilo1Temp.HeaderText = "温度";
- this.ComBoxSilo1Temp.Name = "ComBoxSilo1Temp";
- this.ComBoxSilo1Temp.Width = 95;
- //
- // ComBoxSilo1Speed
- //
- this.ComBoxSilo1Speed.DataPropertyName = "Speed";
- this.ComBoxSilo1Speed.HeaderText = "速度";
- this.ComBoxSilo1Speed.Name = "ComBoxSilo1Speed";
- //
- // ComBoxSilo2Code
- //
- this.ComBoxSilo2Code.HeaderText = "动作";
- this.ComBoxSilo2Code.Name = "ComBoxSilo2Code";
- this.ComBoxSilo2Code.Width = 150;
- //
- // ComBoxSilo2TimeInfo
- //
- this.ComBoxSilo2TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxSilo2TimeInfo.HeaderText = "时间";
- this.ComBoxSilo2TimeInfo.MaxInputLength = 100;
- this.ComBoxSilo2TimeInfo.Name = "ComBoxSilo2TimeInfo";
- this.ComBoxSilo2TimeInfo.Width = 95;
- //
- // ComBoxSilo2Temp
- //
- this.ComBoxSilo2Temp.DataPropertyName = "Temp";
- this.ComBoxSilo2Temp.HeaderText = "温度";
- this.ComBoxSilo2Temp.Name = "ComBoxSilo2Temp";
- this.ComBoxSilo2Temp.Width = 95;
- //
- // ComBoxSilo2Speed
- //
- this.ComBoxSilo2Speed.DataPropertyName = "Speed";
- this.ComBoxSilo2Speed.HeaderText = "速度";
- this.ComBoxSilo2Speed.Name = "ComBoxSilo2Speed";
- //
- // ComBoxWeter1Code
- //
- this.ComBoxWeter1Code.HeaderText = "动作";
- this.ComBoxWeter1Code.Name = "ComBoxWeter1Code";
- this.ComBoxWeter1Code.Width = 150;
- //
- // ComBoxWeter1TimeInfo
- //
- this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxWeter1TimeInfo.HeaderText = "时间";
- this.ComBoxWeter1TimeInfo.MaxInputLength = 100;
- this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo";
- this.ComBoxWeter1TimeInfo.Width = 95;
- //
- // ComBoxWeter1Temp
- //
- this.ComBoxWeter1Temp.DataPropertyName = "Temp";
- this.ComBoxWeter1Temp.HeaderText = "温度";
- this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp";
- this.ComBoxWeter1Temp.Width = 95;
- //
- // ComBoxWeter1Speed
- //
- this.ComBoxWeter1Speed.DataPropertyName = "Speed";
- this.ComBoxWeter1Speed.HeaderText = "速度";
- this.ComBoxWeter1Speed.Name = "ComBoxWeter1Speed";
- //
- // ComBoxWeter1SetValue
- //
- this.ComBoxWeter1SetValue.DataPropertyName = "SetValue";
- this.ComBoxWeter1SetValue.HeaderText = "设定重量";
- this.ComBoxWeter1SetValue.Name = "ComBoxWeter1SetValue";
- //
- // ComBoxWeter1SetTolerance
- //
- this.ComBoxWeter1SetTolerance.DataPropertyName = "SetTolerance";
- this.ComBoxWeter1SetTolerance.HeaderText = "设定公差";
- this.ComBoxWeter1SetTolerance.Name = "ComBoxWeter1SetTolerance";
- //
- // ComBoxWeter2Code
- //
- this.ComBoxWeter2Code.HeaderText = "动作";
- this.ComBoxWeter2Code.Name = "ComBoxWeter2Code";
- this.ComBoxWeter2Code.Width = 150;
- //
- // ComBoxWeter2TimeInfo
- //
- this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxWeter2TimeInfo.HeaderText = "时间";
- this.ComBoxWeter2TimeInfo.MaxInputLength = 100;
- this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo";
- this.ComBoxWeter2TimeInfo.Width = 95;
- //
- // ComBoxWeter2Temp
- //
- this.ComBoxWeter2Temp.DataPropertyName = "Temp";
- this.ComBoxWeter2Temp.HeaderText = "温度";
- this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp";
- this.ComBoxWeter2Temp.Width = 95;
- //
- // ComBoxWeter2Speed
- //
- this.ComBoxWeter2Speed.DataPropertyName = "Speed";
- this.ComBoxWeter2Speed.HeaderText = "速度";
- this.ComBoxWeter2Speed.Name = "ComBoxWeter2Speed";
- //
- // ComBoxWeter2SetValue
- //
- this.ComBoxWeter2SetValue.DataPropertyName = "SetValue";
- this.ComBoxWeter2SetValue.HeaderText = "设定重量";
- this.ComBoxWeter2SetValue.Name = "ComBoxWeter2SetValue";
- //
- // ComBoxWeter2SetTolerance
+ // BtnCanel
//
- this.ComBoxWeter2SetTolerance.DataPropertyName = "SetTolerance";
- this.ComBoxWeter2SetTolerance.HeaderText = "设定公差";
- this.ComBoxWeter2SetTolerance.Name = "ComBoxWeter2SetTolerance";
+ this.BtnCanel.Location = new System.Drawing.Point(258, 719);
+ this.BtnCanel.Name = "BtnCanel";
+ this.BtnCanel.Size = new System.Drawing.Size(119, 47);
+ this.BtnCanel.TabIndex = 2;
+ this.BtnCanel.Text = "取消配方";
+ this.BtnCanel.UseVisualStyleBackColor = true;
+ this.BtnCanel.Click += new System.EventHandler(this.BtnCanel_Click);
//
// FrmWeiRecipeDataAdd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1266, 797);
+ this.ClientSize = new System.Drawing.Size(1196, 773);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.BtnCanel);
this.Controls.Add(this.BtnSave);
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
index 9864909..79e8d55 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
@@ -126,6 +126,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -144,6 +162,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -189,6 +225,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -207,76 +261,70 @@
True
-
- True
-
-
- True
-
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
@@ -291,16 +339,16 @@
True
-
+
True
-
+
True
-
+
True
-
+
True
\ No newline at end of file