diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs index a3d8821..c487edd 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs @@ -146,69 +146,69 @@ 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(16, 15); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Location = new System.Drawing.Point(18, 18); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(840, 58); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Size = new System.Drawing.Size(945, 70); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "配方"; // // txtCpVersion // - this.txtCpVersion.Location = new System.Drawing.Point(651, 19); - this.txtCpVersion.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.txtCpVersion.Location = new System.Drawing.Point(732, 23); + this.txtCpVersion.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); this.txtCpVersion.MaxLength = 100; this.txtCpVersion.Name = "txtCpVersion"; - this.txtCpVersion.Size = new System.Drawing.Size(171, 25); + this.txtCpVersion.Size = new System.Drawing.Size(192, 28); this.txtCpVersion.TabIndex = 60; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(559, 24); - this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label1.Location = new System.Drawing.Point(629, 29); + this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(75, 15); + this.label1.Size = new System.Drawing.Size(89, 18); this.label1.TabIndex = 59; this.label1.Text = "配方版本:"; // // DrpCpType // this.DrpCpType.FormattingEnabled = true; - this.DrpCpType.Location = new System.Drawing.Point(376, 20); - this.DrpCpType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DrpCpType.Location = new System.Drawing.Point(423, 24); + this.DrpCpType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.DrpCpType.Name = "DrpCpType"; - this.DrpCpType.Size = new System.Drawing.Size(171, 23); + this.DrpCpType.Size = new System.Drawing.Size(192, 26); this.DrpCpType.TabIndex = 58; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(287, 24); - this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label4.Location = new System.Drawing.Point(323, 29); + this.label4.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(75, 15); + this.label4.Size = new System.Drawing.Size(89, 18); this.label4.TabIndex = 57; this.label4.Text = "配方类别:"; // // txtName // - this.txtName.Location = new System.Drawing.Point(101, 19); - this.txtName.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6); + this.txtName.Location = new System.Drawing.Point(114, 23); + this.txtName.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); this.txtName.MaxLength = 100; this.txtName.Name = "txtName"; - this.txtName.Size = new System.Drawing.Size(171, 25); + this.txtName.Size = new System.Drawing.Size(192, 28); this.txtName.TabIndex = 56; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(16, 24); - this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0); + this.label3.Location = new System.Drawing.Point(18, 29); + this.label3.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(75, 15); + this.label3.Size = new System.Drawing.Size(89, 18); this.label3.TabIndex = 53; this.label3.Text = "配方名称:"; // @@ -216,11 +216,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.groupBox2.Controls.Add(this.tabControl2); this.groupBox2.Controls.Add(this.groupBox3); - this.groupBox2.Location = new System.Drawing.Point(16, 95); - this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox2.Location = new System.Drawing.Point(18, 114); + this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox2.Size = new System.Drawing.Size(593, 796); + this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox2.Size = new System.Drawing.Size(667, 955); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "称量配方"; @@ -229,11 +229,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); - this.tabControl2.Location = new System.Drawing.Point(8, 265); - this.tabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabControl2.Location = new System.Drawing.Point(9, 318); + this.tabControl2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; - this.tabControl2.Size = new System.Drawing.Size(577, 524); + this.tabControl2.Size = new System.Drawing.Size(649, 629); this.tabControl2.TabIndex = 1; // // tabPage3 @@ -241,11 +241,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.tabPage3.Controls.Add(this.groupBox6); this.tabPage3.Controls.Add(this.CbSiloC); this.tabPage3.Controls.Add(this.dataGridSilo1); - this.tabPage3.Location = new System.Drawing.Point(4, 25); - this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage3.Location = new System.Drawing.Point(4, 28); + this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage3.Size = new System.Drawing.Size(569, 495); + this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage3.Size = new System.Drawing.Size(641, 597); this.tabPage3.TabIndex = 0; this.tabPage3.Text = "糊化机(#A)"; this.tabPage3.UseVisualStyleBackColor = true; @@ -253,11 +253,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // groupBox6 // this.groupBox6.Controls.Add(this.dataGridWater1); - this.groupBox6.Location = new System.Drawing.Point(8, 281); - this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox6.Location = new System.Drawing.Point(9, 337); + this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox6.Size = new System.Drawing.Size(551, 202); + this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox6.Size = new System.Drawing.Size(620, 242); this.groupBox6.TabIndex = 71; this.groupBox6.TabStop = false; this.groupBox6.Text = "水称"; @@ -269,24 +269,28 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo1BinWater, this.TxtSilo1WeightWater, this.TxtSilo1ToleranceWater}); - this.dataGridWater1.Location = new System.Drawing.Point(8, 25); - this.dataGridWater1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridWater1.Location = new System.Drawing.Point(9, 30); + this.dataGridWater1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridWater1.Name = "dataGridWater1"; + this.dataGridWater1.RowHeadersWidth = 62; this.dataGridWater1.RowTemplate.Height = 23; - this.dataGridWater1.Size = new System.Drawing.Size(535, 170); + this.dataGridWater1.Size = new System.Drawing.Size(602, 204); this.dataGridWater1.TabIndex = 69; this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded); // // ComBoxSilo1BinWater // this.ComBoxSilo1BinWater.HeaderText = "物料选择"; + this.ComBoxSilo1BinWater.MinimumWidth = 8; this.ComBoxSilo1BinWater.Name = "ComBoxSilo1BinWater"; + this.ComBoxSilo1BinWater.Width = 150; // // TxtSilo1WeightWater // this.TxtSilo1WeightWater.DataPropertyName = "Weight"; this.TxtSilo1WeightWater.HeaderText = "重量"; this.TxtSilo1WeightWater.MaxInputLength = 100; + this.TxtSilo1WeightWater.MinimumWidth = 8; this.TxtSilo1WeightWater.Name = "TxtSilo1WeightWater"; this.TxtSilo1WeightWater.Width = 95; // @@ -294,6 +298,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.TxtSilo1ToleranceWater.DataPropertyName = "Tolerance"; this.TxtSilo1ToleranceWater.HeaderText = "公差"; + this.TxtSilo1ToleranceWater.MinimumWidth = 8; this.TxtSilo1ToleranceWater.Name = "TxtSilo1ToleranceWater"; this.TxtSilo1ToleranceWater.Width = 95; // @@ -301,9 +306,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.CbSiloC.AutoSize = true; this.CbSiloC.Location = new System.Drawing.Point(8, 10); - this.CbSiloC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.CbSiloC.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.CbSiloC.Name = "CbSiloC"; - this.CbSiloC.Size = new System.Drawing.Size(207, 19); + this.CbSiloC.Size = new System.Drawing.Size(250, 22); this.CbSiloC.TabIndex = 70; this.CbSiloC.Text = "糊化机B采用糊化机A的配方"; this.CbSiloC.UseVisualStyleBackColor = true; @@ -316,17 +321,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo1Bin, this.TxtSilo1Weight, this.TxtSilo1Tolerance}); - this.dataGridSilo1.Location = new System.Drawing.Point(8, 55); - this.dataGridSilo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridSilo1.Location = new System.Drawing.Point(8, 42); + this.dataGridSilo1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridSilo1.Name = "dataGridSilo1"; + this.dataGridSilo1.RowHeadersWidth = 62; this.dataGridSilo1.RowTemplate.Height = 23; - this.dataGridSilo1.Size = new System.Drawing.Size(551, 219); + this.dataGridSilo1.Size = new System.Drawing.Size(621, 287); this.dataGridSilo1.TabIndex = 63; this.dataGridSilo1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo_DefaultValuesNeeded); // // ComBoxSilo1Bin // this.ComBoxSilo1Bin.HeaderText = "物料选择"; + this.ComBoxSilo1Bin.MinimumWidth = 8; this.ComBoxSilo1Bin.Name = "ComBoxSilo1Bin"; this.ComBoxSilo1Bin.Width = 150; // @@ -335,6 +342,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.TxtSilo1Weight.DataPropertyName = "Weight"; this.TxtSilo1Weight.HeaderText = "重量"; this.TxtSilo1Weight.MaxInputLength = 100; + this.TxtSilo1Weight.MinimumWidth = 8; this.TxtSilo1Weight.Name = "TxtSilo1Weight"; this.TxtSilo1Weight.Width = 95; // @@ -342,6 +350,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.TxtSilo1Tolerance.DataPropertyName = "Tolerance"; this.TxtSilo1Tolerance.HeaderText = "公差"; + this.TxtSilo1Tolerance.MinimumWidth = 8; this.TxtSilo1Tolerance.Name = "TxtSilo1Tolerance"; this.TxtSilo1Tolerance.Width = 95; // @@ -349,11 +358,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.tabPage4.Controls.Add(this.groupBox4); this.tabPage4.Controls.Add(this.dataGridSilo2); - this.tabPage4.Location = new System.Drawing.Point(4, 25); - this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage4.Location = new System.Drawing.Point(4, 28); + this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage4.Size = new System.Drawing.Size(569, 495); + this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage4.Size = new System.Drawing.Size(641, 597); this.tabPage4.TabIndex = 1; this.tabPage4.Text = "糊化机(#B)"; this.tabPage4.UseVisualStyleBackColor = true; @@ -361,11 +370,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // groupBox4 // this.groupBox4.Controls.Add(this.dataGridWater2); - this.groupBox4.Location = new System.Drawing.Point(9, 271); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox4.Location = new System.Drawing.Point(10, 325); + this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox4.Size = new System.Drawing.Size(551, 165); + this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox4.Size = new System.Drawing.Size(620, 198); this.groupBox4.TabIndex = 73; this.groupBox4.TabStop = false; this.groupBox4.Text = "水称"; @@ -377,24 +386,28 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo2BinWater, this.TxtSilo2WeightWater, this.TxtSilo2ToleranceWater}); - this.dataGridWater2.Location = new System.Drawing.Point(8, 25); - this.dataGridWater2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridWater2.Location = new System.Drawing.Point(9, 30); + this.dataGridWater2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridWater2.Name = "dataGridWater2"; + this.dataGridWater2.RowHeadersWidth = 62; this.dataGridWater2.RowTemplate.Height = 23; - this.dataGridWater2.Size = new System.Drawing.Size(533, 122); + this.dataGridWater2.Size = new System.Drawing.Size(600, 146); this.dataGridWater2.TabIndex = 69; this.dataGridWater2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater2_DefaultValuesNeeded); // // ComBoxSilo2BinWater // this.ComBoxSilo2BinWater.HeaderText = "物料选择"; + this.ComBoxSilo2BinWater.MinimumWidth = 8; this.ComBoxSilo2BinWater.Name = "ComBoxSilo2BinWater"; + this.ComBoxSilo2BinWater.Width = 150; // // TxtSilo2WeightWater // this.TxtSilo2WeightWater.DataPropertyName = "Weight"; this.TxtSilo2WeightWater.HeaderText = "重量"; this.TxtSilo2WeightWater.MaxInputLength = 100; + this.TxtSilo2WeightWater.MinimumWidth = 8; this.TxtSilo2WeightWater.Name = "TxtSilo2WeightWater"; this.TxtSilo2WeightWater.Width = 95; // @@ -402,6 +415,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.TxtSilo2ToleranceWater.DataPropertyName = "Tolerance"; this.TxtSilo2ToleranceWater.HeaderText = "公差"; + this.TxtSilo2ToleranceWater.MinimumWidth = 8; this.TxtSilo2ToleranceWater.Name = "TxtSilo2ToleranceWater"; this.TxtSilo2ToleranceWater.Width = 95; // @@ -412,17 +426,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo2Bin, this.TxtSilo2Weight, this.TxtSilo2Tolerance}); - this.dataGridSilo2.Location = new System.Drawing.Point(4, 10); - this.dataGridSilo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridSilo2.Location = new System.Drawing.Point(4, 12); + this.dataGridSilo2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridSilo2.Name = "dataGridSilo2"; + this.dataGridSilo2.RowHeadersWidth = 62; this.dataGridSilo2.RowTemplate.Height = 23; - this.dataGridSilo2.Size = new System.Drawing.Size(560, 254); + this.dataGridSilo2.Size = new System.Drawing.Size(630, 305); this.dataGridSilo2.TabIndex = 72; this.dataGridSilo2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo2_DefaultValuesNeeded); // // ComBoxSilo2Bin // this.ComBoxSilo2Bin.HeaderText = "物料选择"; + this.ComBoxSilo2Bin.MinimumWidth = 8; this.ComBoxSilo2Bin.Name = "ComBoxSilo2Bin"; this.ComBoxSilo2Bin.Width = 150; // @@ -431,6 +447,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.TxtSilo2Weight.DataPropertyName = "Weight"; this.TxtSilo2Weight.HeaderText = "重量"; this.TxtSilo2Weight.MaxInputLength = 100; + this.TxtSilo2Weight.MinimumWidth = 8; this.TxtSilo2Weight.Name = "TxtSilo2Weight"; this.TxtSilo2Weight.Width = 95; // @@ -439,17 +456,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.TxtSilo2Tolerance.DataPropertyName = "Tolerance"; this.TxtSilo2Tolerance.HeaderText = "公差"; this.TxtSilo2Tolerance.MaxInputLength = 100; + this.TxtSilo2Tolerance.MinimumWidth = 8; this.TxtSilo2Tolerance.Name = "TxtSilo2Tolerance"; this.TxtSilo2Tolerance.Width = 95; // // groupBox3 // this.groupBox3.Controls.Add(this.dataGridDryer); - this.groupBox3.Location = new System.Drawing.Point(8, 25); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Location = new System.Drawing.Point(9, 30); + this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox3.Size = new System.Drawing.Size(577, 232); + this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox3.Size = new System.Drawing.Size(649, 278); this.groupBox3.TabIndex = 0; this.groupBox3.TabStop = false; this.groupBox3.Text = "干混机(#A)"; @@ -462,11 +480,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.TxtDryer1Weight, this.TxtDryer1Tolerance}); this.dataGridDryer.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridDryer.Location = new System.Drawing.Point(4, 22); - this.dataGridDryer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridDryer.Location = new System.Drawing.Point(4, 26); + this.dataGridDryer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridDryer.Name = "dataGridDryer"; + this.dataGridDryer.RowHeadersWidth = 62; this.dataGridDryer.RowTemplate.Height = 23; - this.dataGridDryer.Size = new System.Drawing.Size(569, 206); + this.dataGridDryer.Size = new System.Drawing.Size(641, 247); this.dataGridDryer.TabIndex = 63; this.dataGridDryer.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridDryer_CellContentClick); this.dataGridDryer.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dataGridView1_DataBindingComplete); @@ -477,6 +496,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxDryer1Bin.AutoComplete = false; this.ComBoxDryer1Bin.HeaderText = "物料选择"; this.ComBoxDryer1Bin.MaxDropDownItems = 4; + this.ComBoxDryer1Bin.MinimumWidth = 8; this.ComBoxDryer1Bin.Name = "ComBoxDryer1Bin"; this.ComBoxDryer1Bin.Width = 150; // @@ -485,6 +505,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.TxtDryer1Weight.DataPropertyName = "Weight"; this.TxtDryer1Weight.HeaderText = "重量"; this.TxtDryer1Weight.MaxInputLength = 100; + this.TxtDryer1Weight.MinimumWidth = 8; this.TxtDryer1Weight.Name = "TxtDryer1Weight"; this.TxtDryer1Weight.Width = 95; // @@ -492,21 +513,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.TxtDryer1Tolerance.DataPropertyName = "Tolerance"; this.TxtDryer1Tolerance.HeaderText = "公差"; + this.TxtDryer1Tolerance.MinimumWidth = 8; this.TxtDryer1Tolerance.Name = "TxtDryer1Tolerance"; this.TxtDryer1Tolerance.Width = 95; // // dataGridViewComboBoxColumn1 // this.dataGridViewComboBoxColumn1.HeaderText = "物料选择"; + this.dataGridViewComboBoxColumn1.MinimumWidth = 8; this.dataGridViewComboBoxColumn1.Name = "dataGridViewComboBoxColumn1"; this.dataGridViewComboBoxColumn1.Width = 150; // // BtnSave // - this.BtnSave.Location = new System.Drawing.Point(117, 899); - this.BtnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.BtnSave.Location = new System.Drawing.Point(132, 1079); + this.BtnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.BtnSave.Name = "BtnSave"; - this.BtnSave.Size = new System.Drawing.Size(159, 59); + this.BtnSave.Size = new System.Drawing.Size(179, 71); this.BtnSave.TabIndex = 2; this.BtnSave.Text = "保存配方"; this.BtnSave.UseVisualStyleBackColor = true; @@ -517,11 +540,11 @@ 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(617, 95); - this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox5.Location = new System.Drawing.Point(694, 114); + this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox5.Size = new System.Drawing.Size(961, 865); + this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox5.Size = new System.Drawing.Size(1081, 1038); this.groupBox5.TabIndex = 3; this.groupBox5.TabStop = false; this.groupBox5.Text = "混合配方"; @@ -530,11 +553,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.tabControl3.Controls.Add(this.tabPage5); this.tabControl3.Controls.Add(this.tabPage6); - this.tabControl3.Location = new System.Drawing.Point(8, 538); - this.tabControl3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabControl3.Location = new System.Drawing.Point(9, 646); + this.tabControl3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl3.Name = "tabControl3"; this.tabControl3.SelectedIndex = 0; - this.tabControl3.Size = new System.Drawing.Size(945, 320); + this.tabControl3.Size = new System.Drawing.Size(1063, 384); this.tabControl3.TabIndex = 5; // // tabPage5 @@ -542,11 +565,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning 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, 25); - this.tabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage5.Location = new System.Drawing.Point(4, 28); + this.tabPage5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage5.Size = new System.Drawing.Size(937, 291); + this.tabPage5.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage5.Size = new System.Drawing.Size(1055, 352); this.tabPage5.TabIndex = 0; this.tabPage5.Text = "湿混机(#A)"; this.tabPage5.UseVisualStyleBackColor = true; @@ -554,10 +577,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // CbWeterH // this.CbWeterH.AutoSize = true; - this.CbWeterH.Location = new System.Drawing.Point(13, 18); - this.CbWeterH.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.CbWeterH.Location = new System.Drawing.Point(8, 10); + this.CbWeterH.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.CbWeterH.Name = "CbWeterH"; - this.CbWeterH.Size = new System.Drawing.Size(169, 19); + this.CbWeterH.Size = new System.Drawing.Size(205, 22); this.CbWeterH.TabIndex = 70; this.CbWeterH.Text = "复制湿混机A混合配方"; this.CbWeterH.UseVisualStyleBackColor = true; @@ -566,10 +589,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(205, 19); + this.label6.Location = new System.Drawing.Point(221, 11); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(240, 15); + this.label6.Size = new System.Drawing.Size(287, 18); this.label6.TabIndex = 69; this.label6.Text = "如果湿混机B采用相同的配方请勾选"; // @@ -583,17 +606,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxWeter1Speed, this.ComBoxWeter1SetValue, this.ComBoxWeter1SetTolerance}); - this.dataGridWeter1.Location = new System.Drawing.Point(8, 45); - this.dataGridWeter1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridWeter1.Location = new System.Drawing.Point(9, 42); + this.dataGridWeter1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridWeter1.Name = "dataGridWeter1"; + this.dataGridWeter1.RowHeadersWidth = 62; this.dataGridWeter1.RowTemplate.Height = 23; - this.dataGridWeter1.Size = new System.Drawing.Size(919, 235); + this.dataGridWeter1.Size = new System.Drawing.Size(1034, 294); 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; // @@ -602,6 +627,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxWeter1TimeInfo.DataPropertyName = "TimeInfo"; this.ComBoxWeter1TimeInfo.HeaderText = "时间"; this.ComBoxWeter1TimeInfo.MaxInputLength = 100; + this.ComBoxWeter1TimeInfo.MinimumWidth = 8; this.ComBoxWeter1TimeInfo.Name = "ComBoxWeter1TimeInfo"; this.ComBoxWeter1TimeInfo.Width = 95; // @@ -609,6 +635,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxWeter1Temp.DataPropertyName = "Temp"; this.ComBoxWeter1Temp.HeaderText = "温度"; + this.ComBoxWeter1Temp.MinimumWidth = 8; this.ComBoxWeter1Temp.Name = "ComBoxWeter1Temp"; this.ComBoxWeter1Temp.Width = 95; // @@ -616,28 +643,34 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // 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, 25); - this.tabPage6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage6.Location = new System.Drawing.Point(4, 28); + this.tabPage6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage6.Name = "tabPage6"; - this.tabPage6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage6.Size = new System.Drawing.Size(937, 291); + this.tabPage6.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage6.Size = new System.Drawing.Size(1055, 352); this.tabPage6.TabIndex = 1; this.tabPage6.Text = "湿混机(#B)"; this.tabPage6.UseVisualStyleBackColor = true; @@ -653,17 +686,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxWeter2SetValue, this.ComBoxWeter2SetTolerance}); this.dataGridWeter2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridWeter2.Location = new System.Drawing.Point(4, 4); - this.dataGridWeter2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridWeter2.Location = new System.Drawing.Point(4, 5); + this.dataGridWeter2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridWeter2.Name = "dataGridWeter2"; + this.dataGridWeter2.RowHeadersWidth = 62; this.dataGridWeter2.RowTemplate.Height = 23; - this.dataGridWeter2.Size = new System.Drawing.Size(929, 283); + this.dataGridWeter2.Size = new System.Drawing.Size(1047, 342); 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; // @@ -672,6 +707,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxWeter2TimeInfo.DataPropertyName = "TimeInfo"; this.ComBoxWeter2TimeInfo.HeaderText = "时间"; this.ComBoxWeter2TimeInfo.MaxInputLength = 100; + this.ComBoxWeter2TimeInfo.MinimumWidth = 8; this.ComBoxWeter2TimeInfo.Name = "ComBoxWeter2TimeInfo"; this.ComBoxWeter2TimeInfo.Width = 95; // @@ -679,6 +715,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxWeter2Temp.DataPropertyName = "Temp"; this.ComBoxWeter2Temp.HeaderText = "温度"; + this.ComBoxWeter2Temp.MinimumWidth = 8; this.ComBoxWeter2Temp.Name = "ComBoxWeter2Temp"; this.ComBoxWeter2Temp.Width = 95; // @@ -686,39 +723,45 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // 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); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(8, 290); - this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabControl1.Location = new System.Drawing.Point(9, 348); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(945, 246); + this.tabControl1.Size = new System.Drawing.Size(1063, 295); this.tabControl1.TabIndex = 4; // // tabPage1 // this.tabPage1.Controls.Add(this.dataGridSiloH1); - this.tabPage1.Location = new System.Drawing.Point(4, 25); - this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage1.Location = new System.Drawing.Point(4, 28); + this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage1.Size = new System.Drawing.Size(937, 217); + this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage1.Size = new System.Drawing.Size(1055, 263); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "糊化机(#A)"; this.tabPage1.UseVisualStyleBackColor = true; @@ -731,17 +774,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo1TimeInfo, this.ComBoxSilo1Temp, this.ComBoxSilo1Speed}); - this.dataGridSiloH1.Location = new System.Drawing.Point(8, 36); - this.dataGridSiloH1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridSiloH1.Location = new System.Drawing.Point(9, 14); + this.dataGridSiloH1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridSiloH1.Name = "dataGridSiloH1"; + this.dataGridSiloH1.RowHeadersWidth = 62; this.dataGridSiloH1.RowTemplate.Height = 23; - this.dataGridSiloH1.Size = new System.Drawing.Size(919, 170); + this.dataGridSiloH1.Size = new System.Drawing.Size(1034, 233); this.dataGridSiloH1.TabIndex = 66; this.dataGridSiloH1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH1_DefaultValuesNeeded); // // ComBoxSilo1Code // this.ComBoxSilo1Code.HeaderText = "动作"; + this.ComBoxSilo1Code.MinimumWidth = 8; this.ComBoxSilo1Code.Name = "ComBoxSilo1Code"; this.ComBoxSilo1Code.Width = 150; // @@ -750,6 +795,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo1TimeInfo.DataPropertyName = "TimeInfo"; this.ComBoxSilo1TimeInfo.HeaderText = "时间"; this.ComBoxSilo1TimeInfo.MaxInputLength = 100; + this.ComBoxSilo1TimeInfo.MinimumWidth = 8; this.ComBoxSilo1TimeInfo.Name = "ComBoxSilo1TimeInfo"; this.ComBoxSilo1TimeInfo.Width = 95; // @@ -757,6 +803,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxSilo1Temp.DataPropertyName = "Temp"; this.ComBoxSilo1Temp.HeaderText = "温度"; + this.ComBoxSilo1Temp.MinimumWidth = 8; this.ComBoxSilo1Temp.Name = "ComBoxSilo1Temp"; this.ComBoxSilo1Temp.Width = 95; // @@ -764,16 +811,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxSilo1Speed.DataPropertyName = "Speed"; this.ComBoxSilo1Speed.HeaderText = "速度"; + this.ComBoxSilo1Speed.MinimumWidth = 8; this.ComBoxSilo1Speed.Name = "ComBoxSilo1Speed"; + this.ComBoxSilo1Speed.Width = 150; // // tabPage2 // this.tabPage2.Controls.Add(this.dataGridSiloH2); - this.tabPage2.Location = new System.Drawing.Point(4, 25); - this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tabPage2.Location = new System.Drawing.Point(4, 28); + this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.tabPage2.Size = new System.Drawing.Size(937, 217); + this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage2.Size = new System.Drawing.Size(1055, 263); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "糊化机(#B)"; this.tabPage2.UseVisualStyleBackColor = true; @@ -787,17 +836,19 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo2Temp, this.ComBoxSilo2Speed}); this.dataGridSiloH2.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridSiloH2.Location = new System.Drawing.Point(4, 4); - this.dataGridSiloH2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridSiloH2.Location = new System.Drawing.Point(4, 5); + this.dataGridSiloH2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridSiloH2.Name = "dataGridSiloH2"; + this.dataGridSiloH2.RowHeadersWidth = 62; this.dataGridSiloH2.RowTemplate.Height = 23; - this.dataGridSiloH2.Size = new System.Drawing.Size(929, 209); + this.dataGridSiloH2.Size = new System.Drawing.Size(1047, 253); this.dataGridSiloH2.TabIndex = 64; this.dataGridSiloH2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH2_DefaultValuesNeeded); // // ComBoxSilo2Code // this.ComBoxSilo2Code.HeaderText = "动作"; + this.ComBoxSilo2Code.MinimumWidth = 8; this.ComBoxSilo2Code.Name = "ComBoxSilo2Code"; this.ComBoxSilo2Code.Width = 150; // @@ -806,6 +857,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxSilo2TimeInfo.DataPropertyName = "TimeInfo"; this.ComBoxSilo2TimeInfo.HeaderText = "时间"; this.ComBoxSilo2TimeInfo.MaxInputLength = 100; + this.ComBoxSilo2TimeInfo.MinimumWidth = 8; this.ComBoxSilo2TimeInfo.Name = "ComBoxSilo2TimeInfo"; this.ComBoxSilo2TimeInfo.Width = 95; // @@ -813,6 +865,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxSilo2Temp.DataPropertyName = "Temp"; this.ComBoxSilo2Temp.HeaderText = "温度"; + this.ComBoxSilo2Temp.MinimumWidth = 8; this.ComBoxSilo2Temp.Name = "ComBoxSilo2Temp"; this.ComBoxSilo2Temp.Width = 95; // @@ -820,16 +873,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxSilo2Speed.DataPropertyName = "Speed"; this.ComBoxSilo2Speed.HeaderText = "速度"; + this.ComBoxSilo2Speed.MinimumWidth = 8; this.ComBoxSilo2Speed.Name = "ComBoxSilo2Speed"; + this.ComBoxSilo2Speed.Width = 150; // // groupBox7 // this.groupBox7.Controls.Add(this.dataGridDryer1Action); - this.groupBox7.Location = new System.Drawing.Point(8, 25); - this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox7.Location = new System.Drawing.Point(9, 30); + this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox7.Size = new System.Drawing.Size(945, 260); + this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox7.Size = new System.Drawing.Size(1063, 312); this.groupBox7.TabIndex = 0; this.groupBox7.TabStop = false; this.groupBox7.Text = "干混机(#A)"; @@ -842,11 +897,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxDryer1TimeInfo, this.ComBoxDryer1Temp, this.ComBoxDryer1Speed}); - this.dataGridDryer1Action.Location = new System.Drawing.Point(4, 21); - this.dataGridDryer1Action.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dataGridDryer1Action.Location = new System.Drawing.Point(4, 25); + this.dataGridDryer1Action.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dataGridDryer1Action.Name = "dataGridDryer1Action"; + this.dataGridDryer1Action.RowHeadersWidth = 62; this.dataGridDryer1Action.RowTemplate.Height = 23; - this.dataGridDryer1Action.Size = new System.Drawing.Size(936, 236); + this.dataGridDryer1Action.Size = new System.Drawing.Size(1053, 283); this.dataGridDryer1Action.TabIndex = 63; this.dataGridDryer1Action.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridDryer1Action_DefaultValuesNeeded); // @@ -855,13 +911,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.ComBoxDryer1Code.AutoComplete = false; this.ComBoxDryer1Code.HeaderText = "动作"; this.ComBoxDryer1Code.MaxDropDownItems = 4; + this.ComBoxDryer1Code.MinimumWidth = 8; this.ComBoxDryer1Code.Name = "ComBoxDryer1Code"; + this.ComBoxDryer1Code.Width = 150; // // ComBoxDryer1TimeInfo // this.ComBoxDryer1TimeInfo.DataPropertyName = "TimeInfo"; this.ComBoxDryer1TimeInfo.HeaderText = "时间"; this.ComBoxDryer1TimeInfo.MaxInputLength = 100; + this.ComBoxDryer1TimeInfo.MinimumWidth = 8; this.ComBoxDryer1TimeInfo.Name = "ComBoxDryer1TimeInfo"; this.ComBoxDryer1TimeInfo.Width = 95; // @@ -869,6 +928,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxDryer1Temp.DataPropertyName = "Temp"; this.ComBoxDryer1Temp.HeaderText = "温度"; + this.ComBoxDryer1Temp.MinimumWidth = 8; this.ComBoxDryer1Temp.Name = "ComBoxDryer1Temp"; this.ComBoxDryer1Temp.Width = 95; // @@ -876,14 +936,16 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // this.ComBoxDryer1Speed.DataPropertyName = "Speed"; this.ComBoxDryer1Speed.HeaderText = "速度"; + this.ComBoxDryer1Speed.MinimumWidth = 8; this.ComBoxDryer1Speed.Name = "ComBoxDryer1Speed"; + this.ComBoxDryer1Speed.Width = 150; // // BtnCanel // - this.BtnCanel.Location = new System.Drawing.Point(344, 899); - this.BtnCanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.BtnCanel.Location = new System.Drawing.Point(387, 1079); + this.BtnCanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.BtnCanel.Name = "BtnCanel"; - this.BtnCanel.Size = new System.Drawing.Size(159, 59); + this.BtnCanel.Size = new System.Drawing.Size(179, 71); this.BtnCanel.TabIndex = 2; this.BtnCanel.Text = "取消配方"; this.BtnCanel.UseVisualStyleBackColor = true; @@ -891,17 +953,18 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning // // FrmWeiRecipeDataAdd // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1595, 966); + this.ClientSize = new System.Drawing.Size(1799, 1168); this.Controls.Add(this.groupBox5); this.Controls.Add(this.BtnCanel); this.Controls.Add(this.BtnSave); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "FrmWeiRecipeDataAdd"; this.Text = "配方名称"; + this.Load += new System.EventHandler(this.FrmWeiRecipeDataAdd_Load); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs index 3aef81d..9899a43 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs @@ -1150,6 +1150,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning this.tabPage6.Enabled = true; } } + + private void FrmWeiRecipeDataAdd_Load(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx index a4ac849..79e8d55 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx @@ -117,13 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True @@ -135,13 +135,13 @@ True - + True - + True - + True @@ -207,18 +207,6 @@ True - - True - - - True - - - True - - - True - True @@ -303,6 +291,18 @@ True + + True + + + True + + + True + + + True + True diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index 307c6ad..6c1c661 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -153,9 +153,6 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll - - ..\..\Microsoft.Office.Interop.Excel.dll - diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index 3bd1626..8cab24e 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -366,13 +366,10 @@ WayValve.cs -<<<<<<< Updated upstream UserControl -======= - ->>>>>>> Stashed changes + Chuiqizhi.cs diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml index 62c2acf..d26c440 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml @@ -36,7 +36,7 @@ Fill 3, 17 MCDataGridView3 - 1088, 274 + 1088, 280 1 False @@ -44,13 +44,13 @@ Fill 0, 0 GroupBox1 - 1094, 294 + 1094, 300 0 Fill 0, 0 Panel1 - 1094, 294 + 1094, 300 @@ -123,7 +123,7 @@ Fill 0, 0 MCDataGridView17 - 543, 74 + 541, 143 16 湿混机(#B) @@ -235,7 +235,7 @@ Fill 0, 0 MCDataGridView15 - 380, 145 + 541, 140 6 糊化机(#B) @@ -510,14 +510,14 @@ 0 Bottom - 0, 294 + 0, 300 Panel11 1094, 500 Fill - 0, 61 + 0, 55 Panel10 - 1094, 794 + 1094, 800 @@ -540,7 +540,7 @@ DarkGray 刷新 宋体, 14.25pt, style=Bold - 367, 12 + 374, 12 MCButton5 100, 30 15 @@ -566,7 +566,7 @@ Transparent 修改 宋体, 14.25pt, style=Bold - 123, 12 + 130, 12 MCButton1 100, 30 13 @@ -592,7 +592,7 @@ Transparent 删除 宋体, 14.25pt, style=Bold - 245, 12 + 252, 12 MCButton4 100, 30 12 @@ -618,7 +618,7 @@ Transparent 添加 宋体, 14.25pt, style=Bold - 5, 12 + 12, 12 MCButton2 100, 30 14 @@ -626,7 +626,7 @@ Top 0, 0 Panel9 - 1094, 61 + 1094, 55 Fill 0, 0