yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 合并问题修改

Browse Source
dep_nodyang
wangsr 1 year ago
parent 75b3867d42
commit 6f79836a47
1 changed files with 6 additions and 192 deletions
Show Stats Download Patch File Download Diff File

198
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.Designer.cs generated
Unescape Escape View File

@ -238,7 +238,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
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); 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, 337);
this.tabPage3.TabIndex = 0; this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)"; this.tabPage3.Text = "糊化机(#A)";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
@ -350,7 +350,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
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); 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.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)"; this.tabPage4.Text = "糊化机(#B)";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
@ -526,193 +526,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方"; this.groupBox5.Text = "混合配方";
// //
// tabControl3
//
this.tabControl3.Controls.Add(this.tabPage5);
this.tabControl3.Controls.Add(this.tabPage6);
this.tabControl3.Location = new System.Drawing.Point(6, 431);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
this.tabControl3.Size = new System.Drawing.Size(709, 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(701, 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(689, 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(701, 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(695, 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 // tabControl1
// //
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
@ -729,7 +542,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
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); 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(569, 317);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "糊化机(#A)"; this.tabPage1.Text = "糊化机(#A)";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
@ -788,7 +601,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
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); 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.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)"; this.tabPage2.Text = "糊化机(#B)";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
@ -1103,7 +916,8 @@ 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, 848); this.ClientSize = new System.Drawing.Size(1063, 927);
this.Controls.Add(this.tabControl3);
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);

Write Preview
Loading…
Cancel
Save