diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
index d66bc69..1cab9b5 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs
@@ -71,25 +71,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridViewComboBoxColumn1 = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.BtnSave = new System.Windows.Forms.Button();
this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.tabControl3 = new System.Windows.Forms.TabControl();
- this.tabPage5 = new System.Windows.Forms.TabPage();
- 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.dataGridSiloH1 = new System.Windows.Forms.DataGridView();
@@ -109,6 +90,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxDryer1Temp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ComBoxDryer1Speed = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tabControl3 = new System.Windows.Forms.TabControl();
+ this.tabPage5 = new System.Windows.Forms.TabPage();
+ 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.BtnCanel = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -124,11 +124,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer)).BeginInit();
this.groupBox5.SuspendLayout();
- this.tabControl3.SuspendLayout();
- this.tabPage5.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).BeginInit();
- this.tabPage6.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH1)).BeginInit();
@@ -136,6 +131,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH2)).BeginInit();
this.groupBox7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer1Action)).BeginInit();
+ this.tabControl3.SuspendLayout();
+ this.tabPage5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).BeginInit();
+ this.tabPage6.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).BeginInit();
this.SuspendLayout();
//
// groupBox1
@@ -247,9 +247,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox6
//
this.groupBox6.Controls.Add(this.dataGridWater1);
- this.groupBox6.Location = new System.Drawing.Point(6, 168);
+ this.groupBox6.Location = new System.Drawing.Point(3, 168);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(413, 165);
+ this.groupBox6.Size = new System.Drawing.Size(419, 165);
this.groupBox6.TabIndex = 71;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "水称";
@@ -261,11 +261,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1BinWater,
this.TxtSilo1WeightWater,
this.TxtSilo1ToleranceWater});
- this.dataGridWater1.Location = new System.Drawing.Point(6, 20);
+ this.dataGridWater1.Location = new System.Drawing.Point(4, 20);
this.dataGridWater1.Name = "dataGridWater1";
this.dataGridWater1.RowHeadersWidth = 62;
this.dataGridWater1.RowTemplate.Height = 23;
- this.dataGridWater1.Size = new System.Drawing.Size(401, 139);
+ this.dataGridWater1.Size = new System.Drawing.Size(410, 139);
this.dataGridWater1.TabIndex = 69;
this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded);
//
@@ -350,7 +350,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(425, 393);
+ this.tabPage4.Size = new System.Drawing.Size(425, 337);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -358,9 +358,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox4
//
this.groupBox4.Controls.Add(this.dataGridWater2);
- this.groupBox4.Location = new System.Drawing.Point(7, 217);
+ this.groupBox4.Location = new System.Drawing.Point(3, 171);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(413, 132);
+ this.groupBox4.Size = new System.Drawing.Size(419, 163);
this.groupBox4.TabIndex = 73;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "水称";
@@ -372,11 +372,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2BinWater,
this.TxtSilo2WeightWater,
this.TxtSilo2ToleranceWater});
- this.dataGridWater2.Location = new System.Drawing.Point(6, 20);
+ this.dataGridWater2.Location = new System.Drawing.Point(3, 20);
this.dataGridWater2.Name = "dataGridWater2";
this.dataGridWater2.RowHeadersWidth = 62;
this.dataGridWater2.RowTemplate.Height = 23;
- this.dataGridWater2.Size = new System.Drawing.Size(400, 97);
+ this.dataGridWater2.Size = new System.Drawing.Size(410, 137);
this.dataGridWater2.TabIndex = 69;
this.dataGridWater2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater2_DefaultValuesNeeded);
//
@@ -411,11 +411,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2Bin,
this.TxtSilo2Weight,
this.TxtSilo2Tolerance});
- this.dataGridSilo2.Location = new System.Drawing.Point(3, 8);
+ this.dataGridSilo2.Location = new System.Drawing.Point(6, 8);
this.dataGridSilo2.Name = "dataGridSilo2";
this.dataGridSilo2.RowHeadersWidth = 62;
this.dataGridSilo2.RowTemplate.Height = 23;
- this.dataGridSilo2.Size = new System.Drawing.Size(420, 203);
+ this.dataGridSilo2.Size = new System.Drawing.Size(414, 157);
this.dataGridSilo2.TabIndex = 72;
this.dataGridSilo2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo2_DefaultValuesNeeded);
//
@@ -526,193 +526,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方";
//
- // tabControl3
- //
- this.tabControl3.Controls.Add(this.tabPage5);
- this.tabControl3.Controls.Add(this.tabPage6);
- this.tabControl3.Location = new System.Drawing.Point(12, 661);
- this.tabControl3.Name = "tabControl3";
- this.tabControl3.SelectedIndex = 0;
- this.tabControl3.Size = new System.Drawing.Size(879, 256);
- this.tabControl3.TabIndex = 5;
- //
- // tabPage5
- //
- this.tabPage5.Controls.Add(this.CbWeterH);
- this.tabPage5.Controls.Add(this.label6);
- this.tabPage5.Controls.Add(this.dataGridWeter1);
- 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(871, 230);
- this.tabPage5.TabIndex = 0;
- this.tabPage5.Text = "湿混机(#A)";
- this.tabPage5.UseVisualStyleBackColor = true;
- //
- // CbWeterH
- //
- this.CbWeterH.AutoSize = true;
- this.CbWeterH.Location = new System.Drawing.Point(5, 7);
- this.CbWeterH.Name = "CbWeterH";
- this.CbWeterH.Size = new System.Drawing.Size(138, 16);
- this.CbWeterH.TabIndex = 70;
- this.CbWeterH.Text = "复制湿混机A混合配方";
- this.CbWeterH.UseVisualStyleBackColor = true;
- this.CbWeterH.CheckedChanged += new System.EventHandler(this.CbWeterH_CheckedChanged);
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(147, 7);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(191, 12);
- this.label6.TabIndex = 69;
- this.label6.Text = "如果湿混机B采用相同的配方请勾选";
- //
- // dataGridWeter1
- //
- this.dataGridWeter1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridWeter1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.ComBoxWeter1Code,
- this.ComBoxWeter1TimeInfo,
- this.ComBoxWeter1Temp,
- this.ComBoxWeter1Speed,
- this.ComBoxWeter1SetValue,
- this.ComBoxWeter1SetTolerance});
- this.dataGridWeter1.Location = new System.Drawing.Point(6, 28);
- this.dataGridWeter1.Name = "dataGridWeter1";
- this.dataGridWeter1.RowHeadersWidth = 62;
- this.dataGridWeter1.RowTemplate.Height = 23;
- this.dataGridWeter1.Size = new System.Drawing.Size(857, 196);
- this.dataGridWeter1.TabIndex = 64;
- this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
- //
- // ComBoxWeter1Code
- //
- this.ComBoxWeter1Code.HeaderText = "动作";
- this.ComBoxWeter1Code.MinimumWidth = 8;
- this.ComBoxWeter1Code.Name = "ComBoxWeter1Code";
- this.ComBoxWeter1Code.Width = 150;
- //
- // ComBoxWeter1TimeInfo
- //
- this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxWeter1TimeInfo.HeaderText = "时间";
- this.ComBoxWeter1TimeInfo.MaxInputLength = 100;
- this.ComBoxWeter1TimeInfo.MinimumWidth = 8;
- this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo";
- this.ComBoxWeter1TimeInfo.Width = 95;
- //
- // ComBoxWeter1Temp
- //
- this.ComBoxWeter1Temp.DataPropertyName = "Temp";
- this.ComBoxWeter1Temp.HeaderText = "温度";
- this.ComBoxWeter1Temp.MinimumWidth = 8;
- this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp";
- this.ComBoxWeter1Temp.Width = 95;
- //
- // ComBoxWeter1Speed
- //
- this.ComBoxWeter1Speed.DataPropertyName = "Speed";
- this.ComBoxWeter1Speed.HeaderText = "速度";
- this.ComBoxWeter1Speed.MinimumWidth = 8;
- this.ComBoxWeter1Speed.Name = "ComBoxWeter1Speed";
- this.ComBoxWeter1Speed.Width = 150;
- //
- // ComBoxWeter1SetValue
- //
- this.ComBoxWeter1SetValue.DataPropertyName = "SetValue";
- this.ComBoxWeter1SetValue.HeaderText = "设定重量";
- this.ComBoxWeter1SetValue.MinimumWidth = 8;
- this.ComBoxWeter1SetValue.Name = "ComBoxWeter1SetValue";
- this.ComBoxWeter1SetValue.Width = 150;
- //
- // ComBoxWeter1SetTolerance
- //
- this.ComBoxWeter1SetTolerance.DataPropertyName = "SetTolerance";
- this.ComBoxWeter1SetTolerance.HeaderText = "设定公差";
- this.ComBoxWeter1SetTolerance.MinimumWidth = 8;
- this.ComBoxWeter1SetTolerance.Name = "ComBoxWeter1SetTolerance";
- this.ComBoxWeter1SetTolerance.Width = 150;
- //
- // 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(897, 230);
- this.tabPage6.TabIndex = 1;
- this.tabPage6.Text = "湿混机(#B)";
- this.tabPage6.UseVisualStyleBackColor = true;
- //
- // dataGridWeter2
- //
- this.dataGridWeter2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.dataGridWeter2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
- this.ComBoxWeter2Code,
- this.ComBoxWeter2TimeInfo,
- this.ComBoxWeter2Temp,
- this.ComBoxWeter2Speed,
- this.ComBoxWeter2SetValue,
- this.ComBoxWeter2SetTolerance});
- this.dataGridWeter2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.dataGridWeter2.Location = new System.Drawing.Point(3, 3);
- this.dataGridWeter2.Name = "dataGridWeter2";
- this.dataGridWeter2.RowHeadersWidth = 62;
- this.dataGridWeter2.RowTemplate.Height = 23;
- this.dataGridWeter2.Size = new System.Drawing.Size(891, 224);
- this.dataGridWeter2.TabIndex = 65;
- this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
- //
- // ComBoxWeter2Code
- //
- this.ComBoxWeter2Code.HeaderText = "动作";
- this.ComBoxWeter2Code.MinimumWidth = 8;
- this.ComBoxWeter2Code.Name = "ComBoxWeter2Code";
- this.ComBoxWeter2Code.Width = 150;
- //
- // ComBoxWeter2TimeInfo
- //
- this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo";
- this.ComBoxWeter2TimeInfo.HeaderText = "时间";
- this.ComBoxWeter2TimeInfo.MaxInputLength = 100;
- this.ComBoxWeter2TimeInfo.MinimumWidth = 8;
- this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo";
- this.ComBoxWeter2TimeInfo.Width = 95;
- //
- // ComBoxWeter2Temp
- //
- this.ComBoxWeter2Temp.DataPropertyName = "Temp";
- this.ComBoxWeter2Temp.HeaderText = "温度";
- this.ComBoxWeter2Temp.MinimumWidth = 8;
- this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp";
- this.ComBoxWeter2Temp.Width = 95;
- //
- // ComBoxWeter2Speed
- //
- this.ComBoxWeter2Speed.DataPropertyName = "Speed";
- this.ComBoxWeter2Speed.HeaderText = "速度";
- this.ComBoxWeter2Speed.MinimumWidth = 8;
- this.ComBoxWeter2Speed.Name = "ComBoxWeter2Speed";
- this.ComBoxWeter2Speed.Width = 150;
- //
- // ComBoxWeter2SetValue
- //
- this.ComBoxWeter2SetValue.DataPropertyName = "SetValue";
- this.ComBoxWeter2SetValue.HeaderText = "设定重量";
- this.ComBoxWeter2SetValue.MinimumWidth = 8;
- this.ComBoxWeter2SetValue.Name = "ComBoxWeter2SetValue";
- this.ComBoxWeter2SetValue.Width = 150;
- //
- // ComBoxWeter2SetTolerance
- //
- this.ComBoxWeter2SetTolerance.DataPropertyName = "SetTolerance";
- this.ComBoxWeter2SetTolerance.HeaderText = "设定公差";
- this.ComBoxWeter2SetTolerance.MinimumWidth = 8;
- this.ComBoxWeter2SetTolerance.Name = "ComBoxWeter2SetTolerance";
- this.ComBoxWeter2SetTolerance.Width = 150;
- //
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
@@ -742,11 +555,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1TimeInfo,
this.ComBoxSilo1Temp,
this.ComBoxSilo1Speed});
- this.dataGridSiloH1.Location = new System.Drawing.Point(6, 9);
+ this.dataGridSiloH1.Location = new System.Drawing.Point(3, 3);
this.dataGridSiloH1.Name = "dataGridSiloH1";
this.dataGridSiloH1.RowHeadersWidth = 62;
this.dataGridSiloH1.RowTemplate.Height = 23;
- this.dataGridSiloH1.Size = new System.Drawing.Size(557, 304);
+ this.dataGridSiloH1.Size = new System.Drawing.Size(563, 311);
this.dataGridSiloH1.TabIndex = 66;
this.dataGridSiloH1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH1_DefaultValuesNeeded);
//
@@ -788,7 +601,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
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(701, 171);
+ this.tabPage2.Size = new System.Drawing.Size(569, 317);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -806,7 +619,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.dataGridSiloH2.Name = "dataGridSiloH2";
this.dataGridSiloH2.RowHeadersWidth = 62;
this.dataGridSiloH2.RowTemplate.Height = 23;
- this.dataGridSiloH2.Size = new System.Drawing.Size(695, 165);
+ this.dataGridSiloH2.Size = new System.Drawing.Size(563, 311);
this.dataGridSiloH2.TabIndex = 64;
this.dataGridSiloH2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH2_DefaultValuesNeeded);
//
@@ -902,6 +715,193 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1Speed.Name = "ComBoxDryer1Speed";
this.ComBoxDryer1Speed.Width = 150;
//
+ // tabControl3
+ //
+ this.tabControl3.Controls.Add(this.tabPage5);
+ this.tabControl3.Controls.Add(this.tabPage6);
+ this.tabControl3.Location = new System.Drawing.Point(12, 661);
+ this.tabControl3.Name = "tabControl3";
+ this.tabControl3.SelectedIndex = 0;
+ this.tabControl3.Size = new System.Drawing.Size(879, 256);
+ this.tabControl3.TabIndex = 5;
+ //
+ // tabPage5
+ //
+ this.tabPage5.Controls.Add(this.CbWeterH);
+ this.tabPage5.Controls.Add(this.label6);
+ this.tabPage5.Controls.Add(this.dataGridWeter1);
+ 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(871, 230);
+ this.tabPage5.TabIndex = 0;
+ this.tabPage5.Text = "湿混机(#A)";
+ this.tabPage5.UseVisualStyleBackColor = true;
+ //
+ // CbWeterH
+ //
+ this.CbWeterH.AutoSize = true;
+ this.CbWeterH.Location = new System.Drawing.Point(5, 7);
+ this.CbWeterH.Name = "CbWeterH";
+ this.CbWeterH.Size = new System.Drawing.Size(138, 16);
+ this.CbWeterH.TabIndex = 70;
+ this.CbWeterH.Text = "复制湿混机A混合配方";
+ this.CbWeterH.UseVisualStyleBackColor = true;
+ this.CbWeterH.CheckedChanged += new System.EventHandler(this.CbWeterH_CheckedChanged);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(147, 7);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(191, 12);
+ this.label6.TabIndex = 69;
+ this.label6.Text = "如果湿混机B采用相同的配方请勾选";
+ //
+ // dataGridWeter1
+ //
+ this.dataGridWeter1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridWeter1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ComBoxWeter1Code,
+ this.ComBoxWeter1TimeInfo,
+ this.ComBoxWeter1Temp,
+ this.ComBoxWeter1Speed,
+ this.ComBoxWeter1SetValue,
+ this.ComBoxWeter1SetTolerance});
+ this.dataGridWeter1.Location = new System.Drawing.Point(6, 28);
+ this.dataGridWeter1.Name = "dataGridWeter1";
+ this.dataGridWeter1.RowHeadersWidth = 62;
+ this.dataGridWeter1.RowTemplate.Height = 23;
+ this.dataGridWeter1.Size = new System.Drawing.Size(857, 196);
+ this.dataGridWeter1.TabIndex = 64;
+ this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
+ //
+ // ComBoxWeter1Code
+ //
+ this.ComBoxWeter1Code.HeaderText = "动作";
+ this.ComBoxWeter1Code.MinimumWidth = 8;
+ this.ComBoxWeter1Code.Name = "ComBoxWeter1Code";
+ this.ComBoxWeter1Code.Width = 150;
+ //
+ // ComBoxWeter1TimeInfo
+ //
+ this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxWeter1TimeInfo.HeaderText = "时间";
+ this.ComBoxWeter1TimeInfo.MaxInputLength = 100;
+ this.ComBoxWeter1TimeInfo.MinimumWidth = 8;
+ this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo";
+ this.ComBoxWeter1TimeInfo.Width = 95;
+ //
+ // ComBoxWeter1Temp
+ //
+ this.ComBoxWeter1Temp.DataPropertyName = "Temp";
+ this.ComBoxWeter1Temp.HeaderText = "温度";
+ this.ComBoxWeter1Temp.MinimumWidth = 8;
+ this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp";
+ this.ComBoxWeter1Temp.Width = 95;
+ //
+ // ComBoxWeter1Speed
+ //
+ this.ComBoxWeter1Speed.DataPropertyName = "Speed";
+ this.ComBoxWeter1Speed.HeaderText = "速度";
+ this.ComBoxWeter1Speed.MinimumWidth = 8;
+ this.ComBoxWeter1Speed.Name = "ComBoxWeter1Speed";
+ this.ComBoxWeter1Speed.Width = 150;
+ //
+ // ComBoxWeter1SetValue
+ //
+ this.ComBoxWeter1SetValue.DataPropertyName = "SetValue";
+ this.ComBoxWeter1SetValue.HeaderText = "设定重量";
+ this.ComBoxWeter1SetValue.MinimumWidth = 8;
+ this.ComBoxWeter1SetValue.Name = "ComBoxWeter1SetValue";
+ this.ComBoxWeter1SetValue.Width = 150;
+ //
+ // ComBoxWeter1SetTolerance
+ //
+ this.ComBoxWeter1SetTolerance.DataPropertyName = "SetTolerance";
+ this.ComBoxWeter1SetTolerance.HeaderText = "设定公差";
+ this.ComBoxWeter1SetTolerance.MinimumWidth = 8;
+ this.ComBoxWeter1SetTolerance.Name = "ComBoxWeter1SetTolerance";
+ this.ComBoxWeter1SetTolerance.Width = 150;
+ //
+ // 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(871, 230);
+ this.tabPage6.TabIndex = 1;
+ this.tabPage6.Text = "湿混机(#B)";
+ this.tabPage6.UseVisualStyleBackColor = true;
+ //
+ // dataGridWeter2
+ //
+ this.dataGridWeter2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridWeter2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.ComBoxWeter2Code,
+ this.ComBoxWeter2TimeInfo,
+ this.ComBoxWeter2Temp,
+ this.ComBoxWeter2Speed,
+ this.ComBoxWeter2SetValue,
+ this.ComBoxWeter2SetTolerance});
+ this.dataGridWeter2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridWeter2.Location = new System.Drawing.Point(3, 3);
+ this.dataGridWeter2.Name = "dataGridWeter2";
+ this.dataGridWeter2.RowHeadersWidth = 62;
+ this.dataGridWeter2.RowTemplate.Height = 23;
+ this.dataGridWeter2.Size = new System.Drawing.Size(865, 224);
+ this.dataGridWeter2.TabIndex = 65;
+ this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
+ //
+ // ComBoxWeter2Code
+ //
+ this.ComBoxWeter2Code.HeaderText = "动作";
+ this.ComBoxWeter2Code.MinimumWidth = 8;
+ this.ComBoxWeter2Code.Name = "ComBoxWeter2Code";
+ this.ComBoxWeter2Code.Width = 150;
+ //
+ // ComBoxWeter2TimeInfo
+ //
+ this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo";
+ this.ComBoxWeter2TimeInfo.HeaderText = "时间";
+ this.ComBoxWeter2TimeInfo.MaxInputLength = 100;
+ this.ComBoxWeter2TimeInfo.MinimumWidth = 8;
+ this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo";
+ this.ComBoxWeter2TimeInfo.Width = 95;
+ //
+ // ComBoxWeter2Temp
+ //
+ this.ComBoxWeter2Temp.DataPropertyName = "Temp";
+ this.ComBoxWeter2Temp.HeaderText = "温度";
+ this.ComBoxWeter2Temp.MinimumWidth = 8;
+ this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp";
+ this.ComBoxWeter2Temp.Width = 95;
+ //
+ // ComBoxWeter2Speed
+ //
+ this.ComBoxWeter2Speed.DataPropertyName = "Speed";
+ this.ComBoxWeter2Speed.HeaderText = "速度";
+ this.ComBoxWeter2Speed.MinimumWidth = 8;
+ this.ComBoxWeter2Speed.Name = "ComBoxWeter2Speed";
+ this.ComBoxWeter2Speed.Width = 150;
+ //
+ // ComBoxWeter2SetValue
+ //
+ this.ComBoxWeter2SetValue.DataPropertyName = "SetValue";
+ this.ComBoxWeter2SetValue.HeaderText = "设定重量";
+ this.ComBoxWeter2SetValue.MinimumWidth = 8;
+ this.ComBoxWeter2SetValue.Name = "ComBoxWeter2SetValue";
+ this.ComBoxWeter2SetValue.Width = 150;
+ //
+ // ComBoxWeter2SetTolerance
+ //
+ this.ComBoxWeter2SetTolerance.DataPropertyName = "SetTolerance";
+ this.ComBoxWeter2SetTolerance.HeaderText = "设定公差";
+ this.ComBoxWeter2SetTolerance.MinimumWidth = 8;
+ this.ComBoxWeter2SetTolerance.Name = "ComBoxWeter2SetTolerance";
+ this.ComBoxWeter2SetTolerance.Width = 150;
+ //
// BtnCanel
//
this.BtnCanel.Location = new System.Drawing.Point(917, 828);
@@ -941,12 +941,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer)).EndInit();
this.groupBox5.ResumeLayout(false);
- this.tabControl3.ResumeLayout(false);
- this.tabPage5.ResumeLayout(false);
- this.tabPage5.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).EndInit();
- this.tabPage6.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH1)).EndInit();
@@ -954,6 +948,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH2)).EndInit();
this.groupBox7.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridDryer1Action)).EndInit();
+ this.tabControl3.ResumeLayout(false);
+ this.tabPage5.ResumeLayout(false);
+ this.tabPage5.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter1)).EndInit();
+ this.tabPage6.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).EndInit();
this.ResumeLayout(false);
}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
index 9404fd0..42d4d2d 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
@@ -201,6 +219,42 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -231,22 +285,22 @@
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
@@ -267,28 +321,22 @@
True
-
- True
-
-
- True
-
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
-
+
True
\ No newline at end of file