From ad016a535e9e1ce7181500c15f8fd0193d438107 Mon Sep 17 00:00:00 2001 From: wangsr Date: Tue, 8 Aug 2023 10:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20-=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LjDevice/FrmDevice.Designer.cs | 13 +++-- .../LjDry/FrmDry.Designer.cs | 52 +++++++++++------- .../LjElectrical/FrmElectrical.Designer.cs | 14 +++-- .../LjMaterial/FrmMaterial.Designer.cs | 41 +++++++------- .../LjMetage/FrmMetage.Designer.cs | 32 ++++++----- .../FrmMetageFormula.Designer.cs | 55 +++++++++++-------- .../LjMetageFormula/FrmMetageFormula.cs | 5 ++ 7 files changed, 121 insertions(+), 91 deletions(-) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs index 2cc57fd..eeb5967 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDevice/FrmDevice.Designer.cs @@ -41,16 +41,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjDevice // // txtDeviceName // - this.txtDeviceName.Location = new System.Drawing.Point(172, 54); + this.txtDeviceName.Location = new System.Drawing.Point(128, 52); this.txtDeviceName.Margin = new System.Windows.Forms.Padding(5); + this.txtDeviceName.MaxLength = 100; this.txtDeviceName.Name = "txtDeviceName"; - this.txtDeviceName.Size = new System.Drawing.Size(175, 21); + this.txtDeviceName.Size = new System.Drawing.Size(285, 21); this.txtDeviceName.TabIndex = 14; // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(273, 145); + this.btnCancel.Location = new System.Drawing.Point(315, 121); this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); @@ -61,7 +62,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDevice // // btnOK // - this.btnOK.Location = new System.Drawing.Point(82, 184); + this.btnOK.Location = new System.Drawing.Point(61, 121); this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); @@ -73,7 +74,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDevice // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(80, 57); + this.label1.Location = new System.Drawing.Point(59, 55); 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); @@ -84,7 +85,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDevice // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(473, 450); + this.ClientSize = new System.Drawing.Size(479, 213); this.Controls.Add(this.txtDeviceName); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/FrmDry.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/FrmDry.Designer.cs index 7af2acd..136a147 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/FrmDry.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDry/FrmDry.Designer.cs @@ -57,8 +57,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // Batch // - this.Batch.Location = new System.Drawing.Point(173, 56); + this.Batch.Location = new System.Drawing.Point(147, 41); this.Batch.Margin = new System.Windows.Forms.Padding(5); + this.Batch.MaxLength = 100; this.Batch.Name = "Batch"; this.Batch.Size = new System.Drawing.Size(148, 21); this.Batch.TabIndex = 66; @@ -66,7 +67,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // JogTime // this.JogTime.AutoSize = true; - this.JogTime.Location = new System.Drawing.Point(70, 65); + this.JogTime.Location = new System.Drawing.Point(44, 44); this.JogTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.JogTime.Name = "JogTime"; this.JogTime.Size = new System.Drawing.Size(47, 12); @@ -76,7 +77,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(245, 511); + this.btnCancel.Location = new System.Drawing.Point(197, 334); this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); @@ -86,7 +87,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // btnOK // - this.btnOK.Location = new System.Drawing.Point(72, 511); + this.btnOK.Location = new System.Drawing.Point(46, 334); this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); @@ -97,7 +98,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(70, 112); + this.label1.Location = new System.Drawing.Point(44, 75); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(35, 12); @@ -106,8 +107,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // Step // - this.Step.Location = new System.Drawing.Point(173, 103); + this.Step.Location = new System.Drawing.Point(147, 72); this.Step.Margin = new System.Windows.Forms.Padding(5); + this.Step.MaxLength = 100; this.Step.Name = "Step"; this.Step.Size = new System.Drawing.Size(148, 21); this.Step.TabIndex = 66; @@ -115,7 +117,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(70, 155); + this.label2.Location = new System.Drawing.Point(44, 106); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(59, 12); @@ -124,8 +126,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // StepCode // - this.StepCode.Location = new System.Drawing.Point(173, 146); + this.StepCode.Location = new System.Drawing.Point(147, 103); this.StepCode.Margin = new System.Windows.Forms.Padding(5); + this.StepCode.MaxLength = 100; this.StepCode.Name = "StepCode"; this.StepCode.Size = new System.Drawing.Size(148, 21); this.StepCode.TabIndex = 66; @@ -133,7 +136,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(70, 204); + this.label3.Location = new System.Drawing.Point(44, 137); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(47, 12); @@ -142,8 +145,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // TotalTime // - this.TotalTime.Location = new System.Drawing.Point(173, 195); + this.TotalTime.Location = new System.Drawing.Point(147, 134); this.TotalTime.Margin = new System.Windows.Forms.Padding(5); + this.TotalTime.MaxLength = 100; this.TotalTime.Name = "TotalTime"; this.TotalTime.Size = new System.Drawing.Size(148, 21); this.TotalTime.TabIndex = 66; @@ -151,7 +155,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(70, 253); + this.label4.Location = new System.Drawing.Point(44, 168); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(71, 12); @@ -160,8 +164,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(173, 244); + this.textBox4.Location = new System.Drawing.Point(147, 165); this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.MaxLength = 100; this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(148, 21); this.textBox4.TabIndex = 66; @@ -169,7 +174,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(70, 301); + this.label5.Location = new System.Drawing.Point(44, 199); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(35, 12); @@ -178,8 +183,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // textBox5 // - this.textBox5.Location = new System.Drawing.Point(173, 292); + this.textBox5.Location = new System.Drawing.Point(147, 196); this.textBox5.Margin = new System.Windows.Forms.Padding(5); + this.textBox5.MaxLength = 100; this.textBox5.Name = "textBox5"; this.textBox5.Size = new System.Drawing.Size(148, 21); this.textBox5.TabIndex = 66; @@ -187,7 +193,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(70, 350); + this.label6.Location = new System.Drawing.Point(44, 230); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(35, 12); @@ -196,8 +202,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // textBox6 // - this.textBox6.Location = new System.Drawing.Point(173, 341); + this.textBox6.Location = new System.Drawing.Point(147, 227); this.textBox6.Margin = new System.Windows.Forms.Padding(5); + this.textBox6.MaxLength = 100; this.textBox6.Name = "textBox6"; this.textBox6.Size = new System.Drawing.Size(148, 21); this.textBox6.TabIndex = 66; @@ -205,7 +212,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(70, 396); + this.label7.Location = new System.Drawing.Point(44, 261); this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(35, 12); @@ -214,8 +221,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // textBox7 // - this.textBox7.Location = new System.Drawing.Point(173, 387); + this.textBox7.Location = new System.Drawing.Point(147, 258); this.textBox7.Margin = new System.Windows.Forms.Padding(5); + this.textBox7.MaxLength = 100; this.textBox7.Name = "textBox7"; this.textBox7.Size = new System.Drawing.Size(148, 21); this.textBox7.TabIndex = 66; @@ -223,7 +231,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(70, 444); + this.label8.Location = new System.Drawing.Point(44, 292); this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(35, 12); @@ -232,8 +240,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // // textBox8 // - this.textBox8.Location = new System.Drawing.Point(173, 435); + this.textBox8.Location = new System.Drawing.Point(147, 289); this.textBox8.Margin = new System.Windows.Forms.Padding(5); + this.textBox8.MaxLength = 100; this.textBox8.Name = "textBox8"; this.textBox8.Size = new System.Drawing.Size(148, 21); this.textBox8.TabIndex = 66; @@ -242,7 +251,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 740); + this.ClientSize = new System.Drawing.Size(340, 422); this.Controls.Add(this.textBox8); this.Controls.Add(this.label8); this.Controls.Add(this.textBox7); @@ -267,6 +276,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDry this.Text = "干混机显示参数"; this.ResumeLayout(false); this.PerformLayout(); + } private System.Windows.Forms.Label label8; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs index 6c145d6..0509fb2 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjElectrical/FrmElectrical.Designer.cs @@ -41,16 +41,17 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical // // Speed // - this.Speed.Location = new System.Drawing.Point(192, 72); + this.Speed.Location = new System.Drawing.Point(110, 54); this.Speed.Margin = new System.Windows.Forms.Padding(5); + this.Speed.MaxLength = 100; this.Speed.Name = "Speed"; - this.Speed.Size = new System.Drawing.Size(148, 21); + this.Speed.Size = new System.Drawing.Size(296, 21); this.Speed.TabIndex = 62; // // JogTime // this.JogTime.AutoSize = true; - this.JogTime.Location = new System.Drawing.Point(89, 81); + this.JogTime.Location = new System.Drawing.Point(65, 57); this.JogTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.JogTime.Name = "JogTime"; this.JogTime.Size = new System.Drawing.Size(35, 12); @@ -60,7 +61,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(262, 275); + this.btnCancel.Location = new System.Drawing.Point(308, 123); this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); @@ -70,7 +71,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical // // btnOK // - this.btnOK.Location = new System.Drawing.Point(89, 275); + this.btnOK.Location = new System.Drawing.Point(67, 123); this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); @@ -83,7 +84,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(583, 450); + this.ClientSize = new System.Drawing.Size(474, 222); this.Controls.Add(this.Speed); this.Controls.Add(this.JogTime); this.Controls.Add(this.btnCancel); @@ -92,6 +93,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjElectrical this.Text = "变频电机手动速度"; this.ResumeLayout(false); this.PerformLayout(); + } private System.Windows.Forms.TextBox Speed; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs index d614b41..cd79634 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMaterial/FrmMaterial.Designer.cs @@ -43,19 +43,20 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial // // MNameTB // - this.MNameTB.Location = new System.Drawing.Point(315, 165); - this.MNameTB.Margin = new System.Windows.Forms.Padding(8); + this.MNameTB.Location = new System.Drawing.Point(127, 93); + this.MNameTB.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.MNameTB.MaxLength = 100; this.MNameTB.Name = "MNameTB"; - this.MNameTB.Size = new System.Drawing.Size(260, 28); + this.MNameTB.Size = new System.Drawing.Size(175, 21); this.MNameTB.TabIndex = 10; // // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(388, 302); - this.btnCancel.Margin = new System.Windows.Forms.Padding(8); + this.btnCancel.Location = new System.Drawing.Point(204, 156); + this.btnCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(147, 68); + this.btnCancel.Size = new System.Drawing.Size(98, 45); this.btnCancel.TabIndex = 9; this.btnCancel.Text = "取消"; this.btnCancel.UseVisualStyleBackColor = true; @@ -63,10 +64,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial // // btnOK // - this.btnOK.Location = new System.Drawing.Point(135, 302); - this.btnOK.Margin = new System.Windows.Forms.Padding(8); + this.btnOK.Location = new System.Drawing.Point(60, 156); + this.btnOK.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(147, 68); + this.btnOK.Size = new System.Drawing.Size(98, 45); this.btnOK.TabIndex = 8; this.btnOK.Text = "确认"; this.btnOK.UseVisualStyleBackColor = true; @@ -75,44 +76,42 @@ namespace Mesnac.Action.ChemicalWeighing.LjMaterial // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(135, 165); - this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label1.Location = new System.Drawing.Point(58, 96); + this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(89, 18); + this.label1.Size = new System.Drawing.Size(59, 12); this.label1.TabIndex = 6; this.label1.Text = "物料名称:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(135, 84); - this.label2.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.label2.Location = new System.Drawing.Point(58, 51); + this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(89, 18); + this.label2.Size = new System.Drawing.Size(59, 12); this.label2.TabIndex = 6; this.label2.Text = "物料类别:"; // // DrpmaterialType // this.DrpmaterialType.FormattingEnabled = true; - this.DrpmaterialType.Location = new System.Drawing.Point(315, 76); - this.DrpmaterialType.Margin = new System.Windows.Forms.Padding(4); + this.DrpmaterialType.Location = new System.Drawing.Point(127, 48); this.DrpmaterialType.Name = "DrpmaterialType"; - this.DrpmaterialType.Size = new System.Drawing.Size(180, 26); + this.DrpmaterialType.Size = new System.Drawing.Size(175, 20); this.DrpmaterialType.TabIndex = 52; // // FrmMaterial // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(675, 648); + this.ClientSize = new System.Drawing.Size(368, 238); this.Controls.Add(this.DrpmaterialType); this.Controls.Add(this.MNameTB); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.label2); this.Controls.Add(this.label1); - this.Margin = new System.Windows.Forms.Padding(4); this.Name = "FrmMaterial"; this.Text = "物料类别"; this.ResumeLayout(false); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs index e82d9cb..f10f751 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/FrmMetage.Designer.cs @@ -49,8 +49,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // HighSpeed // - this.HighSpeed.Location = new System.Drawing.Point(157, 38); + this.HighSpeed.Location = new System.Drawing.Point(129, 32); this.HighSpeed.Margin = new System.Windows.Forms.Padding(5); + this.HighSpeed.MaxLength = 100; this.HighSpeed.Name = "HighSpeed"; this.HighSpeed.Size = new System.Drawing.Size(148, 21); this.HighSpeed.TabIndex = 58; @@ -58,7 +59,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(227, 365); + this.btnCancel.Location = new System.Drawing.Point(179, 205); this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); @@ -68,7 +69,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // btnOK // - this.btnOK.Location = new System.Drawing.Point(54, 365); + this.btnOK.Location = new System.Drawing.Point(38, 205); this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); @@ -80,7 +81,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(54, 47); + this.label3.Location = new System.Drawing.Point(36, 35); this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(83, 12); @@ -90,7 +91,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(54, 78); + this.label1.Location = new System.Drawing.Point(36, 66); this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(83, 12); @@ -99,8 +100,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // LowSpeed // - this.LowSpeed.Location = new System.Drawing.Point(157, 69); + this.LowSpeed.Location = new System.Drawing.Point(129, 63); this.LowSpeed.Margin = new System.Windows.Forms.Padding(5); + this.LowSpeed.MaxLength = 100; this.LowSpeed.Name = "LowSpeed"; this.LowSpeed.Size = new System.Drawing.Size(148, 21); this.LowSpeed.TabIndex = 58; @@ -108,7 +110,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(54, 109); + this.label2.Location = new System.Drawing.Point(72, 97); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(47, 12); @@ -117,8 +119,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // WeightSlow // - this.WeightSlow.Location = new System.Drawing.Point(157, 100); + this.WeightSlow.Location = new System.Drawing.Point(129, 94); this.WeightSlow.Margin = new System.Windows.Forms.Padding(5); + this.WeightSlow.MaxLength = 100; this.WeightSlow.Name = "WeightSlow"; this.WeightSlow.Size = new System.Drawing.Size(148, 21); this.WeightSlow.TabIndex = 58; @@ -126,7 +129,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(54, 140); + this.label4.Location = new System.Drawing.Point(72, 128); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(47, 12); @@ -135,8 +138,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // Precut // - this.Precut.Location = new System.Drawing.Point(157, 131); + this.Precut.Location = new System.Drawing.Point(129, 125); this.Precut.Margin = new System.Windows.Forms.Padding(5); + this.Precut.MaxLength = 100; this.Precut.Name = "Precut"; this.Precut.Size = new System.Drawing.Size(148, 21); this.Precut.TabIndex = 58; @@ -144,7 +148,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // JogTime // this.JogTime.AutoSize = true; - this.JogTime.Location = new System.Drawing.Point(54, 171); + this.JogTime.Location = new System.Drawing.Point(72, 159); this.JogTime.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.JogTime.Name = "JogTime"; this.JogTime.Size = new System.Drawing.Size(47, 12); @@ -153,8 +157,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(157, 162); + this.textBox4.Location = new System.Drawing.Point(129, 156); this.textBox4.Margin = new System.Windows.Forms.Padding(5); + this.textBox4.MaxLength = 100; this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(148, 21); this.textBox4.TabIndex = 58; @@ -163,7 +168,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(555, 450); + this.ClientSize = new System.Drawing.Size(319, 280); this.Controls.Add(this.textBox4); this.Controls.Add(this.Precut); this.Controls.Add(this.WeightSlow); @@ -180,6 +185,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetage this.Text = "FrmMetage"; this.ResumeLayout(false); this.PerformLayout(); + } private System.Windows.Forms.Label label1; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs index ec38b14..3763080 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.Designer.cs @@ -63,25 +63,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // DrpType // this.DrpType.FormattingEnabled = true; - this.DrpType.Location = new System.Drawing.Point(164, 46); + this.DrpType.Location = new System.Drawing.Point(83, 44); this.DrpType.Name = "DrpType"; - this.DrpType.Size = new System.Drawing.Size(121, 20); + this.DrpType.Size = new System.Drawing.Size(129, 20); this.DrpType.TabIndex = 18; this.DrpType.SelectedIndexChanged += new System.EventHandler(this.DrpType_SelectedIndexChanged); // // comboBox1 // this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(164, 81); + this.comboBox1.Location = new System.Drawing.Point(83, 70); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.Size = new System.Drawing.Size(129, 20); this.comboBox1.TabIndex = 19; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(83, 51); + this.label3.Location = new System.Drawing.Point(16, 47); 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); @@ -91,7 +91,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(83, 84); + this.label1.Location = new System.Drawing.Point(16, 73); 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); @@ -101,7 +101,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(83, 117); + this.label2.Location = new System.Drawing.Point(239, 18); this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(59, 12); @@ -111,15 +111,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // comboBox2 // this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(164, 114); + this.comboBox2.Location = new System.Drawing.Point(306, 15); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(121, 20); + this.comboBox2.Size = new System.Drawing.Size(129, 20); this.comboBox2.TabIndex = 19; this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // // TxtWeight // - this.TxtWeight.Location = new System.Drawing.Point(164, 145); + this.TxtWeight.Location = new System.Drawing.Point(306, 43); this.TxtWeight.Margin = new System.Windows.Forms.Padding(5); this.TxtWeight.Name = "TxtWeight"; this.TxtWeight.Size = new System.Drawing.Size(129, 21); @@ -128,7 +128,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(83, 145); + this.label4.Location = new System.Drawing.Point(261, 46); this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(35, 12); @@ -138,7 +138,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(83, 184); + this.label5.Location = new System.Drawing.Point(261, 77); this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(35, 12); @@ -147,7 +147,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // // txtDifference // - this.txtDifference.Location = new System.Drawing.Point(164, 184); + this.txtDifference.Location = new System.Drawing.Point(306, 74); this.txtDifference.Margin = new System.Windows.Forms.Padding(5); this.txtDifference.Name = "txtDifference"; this.txtDifference.Size = new System.Drawing.Size(129, 21); @@ -156,7 +156,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(83, 9); + this.label6.Location = new System.Drawing.Point(16, 18); this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(59, 12); @@ -165,7 +165,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // // txtName // - this.txtName.Location = new System.Drawing.Point(164, 9); + this.txtName.Location = new System.Drawing.Point(83, 15); this.txtName.Margin = new System.Windows.Forms.Padding(5); this.txtName.Name = "txtName"; this.txtName.Size = new System.Drawing.Size(129, 21); @@ -174,7 +174,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // groupBox1 // this.groupBox1.Controls.Add(this.dataGridView1); - this.groupBox1.Location = new System.Drawing.Point(12, 276); + this.groupBox1.Location = new System.Drawing.Point(12, 193); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(611, 289); this.groupBox1.TabIndex = 22; @@ -186,7 +186,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.No, this.MaterialName, this.DeviceName, this.Weight, this.Difference }); + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.No, + this.MaterialName, + this.DeviceName, + this.Weight, + this.Difference}); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(3, 17); this.dataGridView1.Name = "dataGridView1"; @@ -195,6 +200,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(605, 269); this.dataGridView1.TabIndex = 0; + this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); // // No // @@ -241,9 +247,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // // button1 // - this.button1.Location = new System.Drawing.Point(81, 236); + this.button1.Location = new System.Drawing.Point(18, 126); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(98, 45); this.button1.TabIndex = 23; this.button1.Text = "添加物料"; this.button1.UseVisualStyleBackColor = true; @@ -251,9 +257,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // // button2 // - this.button2.Location = new System.Drawing.Point(295, 236); + this.button2.Location = new System.Drawing.Point(337, 126); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.Size = new System.Drawing.Size(98, 45); this.button2.TabIndex = 23; this.button2.Text = "删除物料"; this.button2.UseVisualStyleBackColor = true; @@ -262,7 +268,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(323, 645); + this.btnCancel.Location = new System.Drawing.Point(522, 490); this.btnCancel.Margin = new System.Windows.Forms.Padding(5); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(98, 45); @@ -273,7 +279,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // // btnOK // - this.btnOK.Location = new System.Drawing.Point(150, 645); + this.btnOK.Location = new System.Drawing.Point(15, 490); this.btnOK.Margin = new System.Windows.Forms.Padding(5); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(98, 45); @@ -286,7 +292,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(632, 764); + this.ClientSize = new System.Drawing.Size(635, 549); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnOK); this.Controls.Add(this.button2); @@ -310,6 +316,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); + } private System.Windows.Forms.Button btnCancel; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs index eab7417..2137912 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetageFormula/FrmMetageFormula.cs @@ -204,5 +204,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjMetageFormula this.DialogResult = System.Windows.Forms.DialogResult.OK; } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } } } \ No newline at end of file