change - 拉取前提交

dep_nodyang
wangsr 1 year ago
parent c5c60daf59
commit e8899e6ec7

@ -156,7 +156,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// txtCpVersion // txtCpVersion
// //
this.txtCpVersion.Location = new System.Drawing.Point(488, 15); this.txtCpVersion.Location = new System.Drawing.Point(488, 15);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5);
this.txtCpVersion.MaxLength = 100; this.txtCpVersion.MaxLength = 100;
this.txtCpVersion.Name = "txtCpVersion"; this.txtCpVersion.Name = "txtCpVersion";
this.txtCpVersion.Size = new System.Drawing.Size(129, 21); this.txtCpVersion.Size = new System.Drawing.Size(129, 21);
@ -193,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// txtName // txtName
// //
this.txtName.Location = new System.Drawing.Point(76, 15); this.txtName.Location = new System.Drawing.Point(76, 15);
this.txtName.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.txtName.Margin = new System.Windows.Forms.Padding(5);
this.txtName.MaxLength = 100; this.txtName.MaxLength = 100;
this.txtName.Name = "txtName"; this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(129, 21); this.txtName.Size = new System.Drawing.Size(129, 21);
@ -237,7 +237,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage3.Controls.Add(this.dataGridSilo1); this.tabPage3.Controls.Add(this.dataGridSilo1);
this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(425, 393); this.tabPage3.Size = new System.Drawing.Size(425, 393);
this.tabPage3.TabIndex = 0; this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)"; this.tabPage3.Text = "糊化机(#A)";
@ -348,7 +348,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage4.Controls.Add(this.dataGridSilo2); this.tabPage4.Controls.Add(this.dataGridSilo2);
this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); 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, 393);
this.tabPage4.TabIndex = 1; this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)"; this.tabPage4.Text = "糊化机(#B)";
@ -543,7 +543,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage5.Controls.Add(this.dataGridWeter1); this.tabPage5.Controls.Add(this.dataGridWeter1);
this.tabPage5.Location = new System.Drawing.Point(4, 22); this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(701, 230); this.tabPage5.Size = new System.Drawing.Size(701, 230);
this.tabPage5.TabIndex = 0; this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "湿混机(#A)"; this.tabPage5.Text = "湿混机(#A)";
@ -640,7 +640,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage6.Controls.Add(this.dataGridWeter2); this.tabPage6.Controls.Add(this.dataGridWeter2);
this.tabPage6.Location = new System.Drawing.Point(4, 22); this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Name = "tabPage6"; this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(701, 230); this.tabPage6.Size = new System.Drawing.Size(701, 230);
this.tabPage6.TabIndex = 1; this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "湿混机(#B)"; this.tabPage6.Text = "湿混机(#B)";
@ -728,7 +728,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage1.Controls.Add(this.dataGridSiloH1); this.tabPage1.Controls.Add(this.dataGridSiloH1);
this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(701, 171); this.tabPage1.Size = new System.Drawing.Size(701, 171);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "糊化机(#A)"; this.tabPage1.Text = "糊化机(#A)";
@ -787,7 +787,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.tabPage2.Controls.Add(this.dataGridSiloH2); this.tabPage2.Controls.Add(this.dataGridSiloH2);
this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); 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(701, 171);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)"; this.tabPage2.Text = "糊化机(#B)";
@ -916,7 +916,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1199, 707); this.ClientSize = new System.Drawing.Size(1199, 848);
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.BtnCanel); this.Controls.Add(this.BtnCanel);
this.Controls.Add(this.BtnSave); this.Controls.Add(this.BtnSave);
@ -924,6 +924,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Name = "FrmWeiRecipeDataAdd"; this.Name = "FrmWeiRecipeDataAdd";
this.Text = "配方名称"; this.Text = "配方名称";
this.Load += new System.EventHandler(this.FrmWeiRecipeDataAdd_Load);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);

@ -1151,6 +1151,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
} }
private void FrmWeiRecipeDataAdd_Load(object sender, EventArgs e)
{
}
} }
} }

@ -169,9 +169,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath> <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel">
<HintPath>..\..\Microsoft.Office.Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

Loading…
Cancel
Save