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

Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907

Browse Source
dep_nodyang
wangsr 1 year ago
parent 3cda278e1d cd50514e00
commit ddf2e523be
4 changed files with 158 additions and 152 deletions
Show Stats Download Patch File Download Diff File

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

@ -49,7 +49,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.TxtSilo1WeightWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.TxtSilo1ToleranceWater = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CbSiloC = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label();
this.dataGridSilo1 = new System.Windows.Forms.DataGridView();
this.ComBoxSilo1Bin = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.TxtSilo1Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -93,8 +92,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxWeter2SetTolerance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.CbSiloH = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
this.dataGridSiloH1 = new System.Windows.Forms.DataGridView();
this.ComBoxSilo1Code = new System.Windows.Forms.DataGridViewComboBoxColumn();
this.ComBoxSilo1TimeInfo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -149,66 +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(12, 12);
this.groupBox1.Location = new System.Drawing.Point(16, 15);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(630, 46);
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(840, 58);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "配方";
//
// txtCpVersion
//
this.txtCpVersion.Location = new System.Drawing.Point(488, 15);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(5);
this.txtCpVersion.Location = new System.Drawing.Point(651, 19);
this.txtCpVersion.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.txtCpVersion.MaxLength = 100;
this.txtCpVersion.Name = "txtCpVersion";
this.txtCpVersion.Size = new System.Drawing.Size(129, 21);
this.txtCpVersion.Size = new System.Drawing.Size(171, 25);
this.txtCpVersion.TabIndex = 60;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(419, 19);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Location = new System.Drawing.Point(559, 24);
this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(59, 12);
this.label1.Size = new System.Drawing.Size(75, 15);
this.label1.TabIndex = 59;
this.label1.Text = "配方版本:";
//
// DrpCpType
//
this.DrpCpType.FormattingEnabled = true;
this.DrpCpType.Location = new System.Drawing.Point(282, 16);
this.DrpCpType.Location = new System.Drawing.Point(376, 20);
this.DrpCpType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.DrpCpType.Name = "DrpCpType";
this.DrpCpType.Size = new System.Drawing.Size(129, 20);
this.DrpCpType.Size = new System.Drawing.Size(171, 23);
this.DrpCpType.TabIndex = 58;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(215, 19);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Location = new System.Drawing.Point(287, 24);
this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.Size = new System.Drawing.Size(75, 15);
this.label4.TabIndex = 57;
this.label4.Text = "配方类别:";
//
// txtName
//
this.txtName.Location = new System.Drawing.Point(76, 15);
this.txtName.Margin = new System.Windows.Forms.Padding(5);
this.txtName.Location = new System.Drawing.Point(101, 19);
this.txtName.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.txtName.MaxLength = 100;
this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(129, 21);
this.txtName.Size = new System.Drawing.Size(171, 25);
this.txtName.TabIndex = 56;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(12, 19);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Location = new System.Drawing.Point(16, 24);
this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 12);
this.label3.Size = new System.Drawing.Size(75, 15);
this.label3.TabIndex = 53;
this.label3.Text = "配方名称:";
//
@ -216,9 +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(12, 76);
this.groupBox2.Location = new System.Drawing.Point(16, 95);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(445, 637);
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Size = new System.Drawing.Size(593, 796);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "称量配方";
@ -227,22 +229,23 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Controls.Add(this.tabPage4);
this.tabControl2.Location = new System.Drawing.Point(6, 212);
this.tabControl2.Location = new System.Drawing.Point(8, 265);
this.tabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(433, 419);
this.tabControl2.Size = new System.Drawing.Size(577, 524);
this.tabControl2.TabIndex = 1;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Controls.Add(this.CbSiloC);
this.tabPage3.Controls.Add(this.label5);
this.tabPage3.Controls.Add(this.dataGridSilo1);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Location = new System.Drawing.Point(4, 25);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(425, 393);
this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Size = new System.Drawing.Size(569, 495);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "糊化机(#A)";
this.tabPage3.UseVisualStyleBackColor = true;
@ -250,9 +253,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox6
//
this.groupBox6.Controls.Add(this.dataGridWater1);
this.groupBox6.Location = new System.Drawing.Point(6, 225);
this.groupBox6.Location = new System.Drawing.Point(8, 281);
this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(413, 162);
this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Size = new System.Drawing.Size(551, 202);
this.groupBox6.TabIndex = 71;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "水称";
@ -264,10 +269,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1BinWater,
this.TxtSilo1WeightWater,
this.TxtSilo1ToleranceWater});
this.dataGridWater1.Location = new System.Drawing.Point(6, 20);
this.dataGridWater1.Location = new System.Drawing.Point(8, 25);
this.dataGridWater1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridWater1.Name = "dataGridWater1";
this.dataGridWater1.RowTemplate.Height = 23;
this.dataGridWater1.Size = new System.Drawing.Size(401, 136);
this.dataGridWater1.Size = new System.Drawing.Size(535, 170);
this.dataGridWater1.TabIndex = 69;
this.dataGridWater1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater1_DefaultValuesNeeded);
//
@ -294,23 +300,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// CbSiloC
//
this.CbSiloC.AutoSize = true;
this.CbSiloC.Location = new System.Drawing.Point(6, 8);
this.CbSiloC.Location = new System.Drawing.Point(8, 10);
this.CbSiloC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.CbSiloC.Name = "CbSiloC";
this.CbSiloC.Size = new System.Drawing.Size(138, 16);
this.CbSiloC.Size = new System.Drawing.Size(207, 19);
this.CbSiloC.TabIndex = 70;
this.CbSiloC.Text = "复制糊化机A称量配方";
this.CbSiloC.Text = "糊化机B采用糊化机A的配方";
this.CbSiloC.UseVisualStyleBackColor = true;
this.CbSiloC.CheckedChanged += new System.EventHandler(this.CbSiloC_CheckedChanged);
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(150, 9);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(191, 12);
this.label5.TabIndex = 69;
this.label5.Text = "如果糊化机B采用相同的配方请勾选";
//
// dataGridSilo1
//
this.dataGridSilo1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@ -318,10 +316,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1Bin,
this.TxtSilo1Weight,
this.TxtSilo1Tolerance});
this.dataGridSilo1.Location = new System.Drawing.Point(6, 44);
this.dataGridSilo1.Location = new System.Drawing.Point(8, 55);
this.dataGridSilo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridSilo1.Name = "dataGridSilo1";
this.dataGridSilo1.RowTemplate.Height = 23;
this.dataGridSilo1.Size = new System.Drawing.Size(413, 175);
this.dataGridSilo1.Size = new System.Drawing.Size(551, 219);
this.dataGridSilo1.TabIndex = 63;
this.dataGridSilo1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo_DefaultValuesNeeded);
//
@ -350,10 +349,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, 22);
this.tabPage4.Location = new System.Drawing.Point(4, 25);
this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(425, 393);
this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage4.Size = new System.Drawing.Size(569, 495);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "糊化机(#B)";
this.tabPage4.UseVisualStyleBackColor = true;
@ -361,9 +361,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox4
//
this.groupBox4.Controls.Add(this.dataGridWater2);
this.groupBox4.Location = new System.Drawing.Point(7, 217);
this.groupBox4.Location = new System.Drawing.Point(9, 271);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(413, 132);
this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Size = new System.Drawing.Size(551, 165);
this.groupBox4.TabIndex = 73;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "水称";
@ -375,10 +377,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2BinWater,
this.TxtSilo2WeightWater,
this.TxtSilo2ToleranceWater});
this.dataGridWater2.Location = new System.Drawing.Point(6, 20);
this.dataGridWater2.Location = new System.Drawing.Point(8, 25);
this.dataGridWater2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridWater2.Name = "dataGridWater2";
this.dataGridWater2.RowTemplate.Height = 23;
this.dataGridWater2.Size = new System.Drawing.Size(400, 98);
this.dataGridWater2.Size = new System.Drawing.Size(533, 122);
this.dataGridWater2.TabIndex = 69;
this.dataGridWater2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWater2_DefaultValuesNeeded);
//
@ -409,10 +412,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2Bin,
this.TxtSilo2Weight,
this.TxtSilo2Tolerance});
this.dataGridSilo2.Location = new System.Drawing.Point(3, 8);
this.dataGridSilo2.Location = new System.Drawing.Point(4, 10);
this.dataGridSilo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridSilo2.Name = "dataGridSilo2";
this.dataGridSilo2.RowTemplate.Height = 23;
this.dataGridSilo2.Size = new System.Drawing.Size(420, 203);
this.dataGridSilo2.Size = new System.Drawing.Size(560, 254);
this.dataGridSilo2.TabIndex = 72;
this.dataGridSilo2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSilo2_DefaultValuesNeeded);
//
@ -441,9 +445,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox3
//
this.groupBox3.Controls.Add(this.dataGridDryer);
this.groupBox3.Location = new System.Drawing.Point(6, 20);
this.groupBox3.Location = new System.Drawing.Point(8, 25);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(433, 186);
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Size = new System.Drawing.Size(577, 232);
this.groupBox3.TabIndex = 0;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "干混机(#A)";
@ -456,10 +462,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.TxtDryer1Weight,
this.TxtDryer1Tolerance});
this.dataGridDryer.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridDryer.Location = new System.Drawing.Point(3, 17);
this.dataGridDryer.Location = new System.Drawing.Point(4, 22);
this.dataGridDryer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridDryer.Name = "dataGridDryer";
this.dataGridDryer.RowTemplate.Height = 23;
this.dataGridDryer.Size = new System.Drawing.Size(427, 166);
this.dataGridDryer.Size = new System.Drawing.Size(569, 206);
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);
@ -496,9 +503,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnSave
//
this.BtnSave.Location = new System.Drawing.Point(88, 719);
this.BtnSave.Location = new System.Drawing.Point(117, 899);
this.BtnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(119, 47);
this.BtnSave.Size = new System.Drawing.Size(159, 59);
this.BtnSave.TabIndex = 2;
this.BtnSave.Text = "保存配方";
this.BtnSave.UseVisualStyleBackColor = true;
@ -509,9 +517,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(463, 76);
this.groupBox5.Location = new System.Drawing.Point(617, 95);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(721, 692);
this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Size = new System.Drawing.Size(961, 865);
this.groupBox5.TabIndex = 3;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "混合配方";
@ -520,10 +530,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(6, 430);
this.tabControl3.Location = new System.Drawing.Point(8, 538);
this.tabControl3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
this.tabControl3.Size = new System.Drawing.Size(709, 256);
this.tabControl3.Size = new System.Drawing.Size(945, 320);
this.tabControl3.TabIndex = 5;
//
// tabPage5
@ -531,10 +542,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, 22);
this.tabPage5.Location = new System.Drawing.Point(4, 25);
this.tabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(701, 230);
this.tabPage5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage5.Size = new System.Drawing.Size(937, 291);
this.tabPage5.TabIndex = 0;
this.tabPage5.Text = "湿混机(#A)";
this.tabPage5.UseVisualStyleBackColor = true;
@ -542,9 +554,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// CbWeterH
//
this.CbWeterH.AutoSize = true;
this.CbWeterH.Location = new System.Drawing.Point(10, 14);
this.CbWeterH.Location = new System.Drawing.Point(13, 18);
this.CbWeterH.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.CbWeterH.Name = "CbWeterH";
this.CbWeterH.Size = new System.Drawing.Size(138, 16);
this.CbWeterH.Size = new System.Drawing.Size(169, 19);
this.CbWeterH.TabIndex = 70;
this.CbWeterH.Text = "复制湿混机A混合配方";
this.CbWeterH.UseVisualStyleBackColor = true;
@ -553,9 +566,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(154, 15);
this.label6.Location = new System.Drawing.Point(205, 19);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(191, 12);
this.label6.Size = new System.Drawing.Size(240, 15);
this.label6.TabIndex = 69;
this.label6.Text = "如果湿混机B采用相同的配方请勾选";
//
@ -569,10 +583,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxWeter1Speed,
this.ComBoxWeter1SetValue,
this.ComBoxWeter1SetTolerance});
this.dataGridWeter1.Location = new System.Drawing.Point(6, 36);
this.dataGridWeter1.Location = new System.Drawing.Point(8, 45);
this.dataGridWeter1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridWeter1.Name = "dataGridWeter1";
this.dataGridWeter1.RowTemplate.Height = 23;
this.dataGridWeter1.Size = new System.Drawing.Size(689, 188);
this.dataGridWeter1.Size = new System.Drawing.Size(919, 235);
this.dataGridWeter1.TabIndex = 64;
this.dataGridWeter1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter1_DefaultValuesNeeded_1);
//
@ -618,10 +633,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// tabPage6
//
this.tabPage6.Controls.Add(this.dataGridWeter2);
this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Location = new System.Drawing.Point(4, 25);
this.tabPage6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(701, 230);
this.tabPage6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage6.Size = new System.Drawing.Size(937, 291);
this.tabPage6.TabIndex = 1;
this.tabPage6.Text = "湿混机(#B)";
this.tabPage6.UseVisualStyleBackColor = true;
@ -637,10 +653,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxWeter2SetValue,
this.ComBoxWeter2SetTolerance});
this.dataGridWeter2.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridWeter2.Location = new System.Drawing.Point(3, 3);
this.dataGridWeter2.Location = new System.Drawing.Point(4, 4);
this.dataGridWeter2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridWeter2.Name = "dataGridWeter2";
this.dataGridWeter2.RowTemplate.Height = 23;
this.dataGridWeter2.Size = new System.Drawing.Size(695, 224);
this.dataGridWeter2.Size = new System.Drawing.Size(929, 283);
this.dataGridWeter2.TabIndex = 65;
this.dataGridWeter2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridWeter2_DefaultValuesNeeded);
//
@ -687,45 +704,25 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(6, 232);
this.tabControl1.Location = new System.Drawing.Point(8, 290);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(709, 197);
this.tabControl1.Size = new System.Drawing.Size(945, 246);
this.tabControl1.TabIndex = 4;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.CbSiloH);
this.tabPage1.Controls.Add(this.label2);
this.tabPage1.Controls.Add(this.dataGridSiloH1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Location = new System.Drawing.Point(4, 25);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(701, 171);
this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Size = new System.Drawing.Size(937, 217);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "糊化机(#A)";
this.tabPage1.UseVisualStyleBackColor = true;
//
// CbSiloH
//
this.CbSiloH.AutoSize = true;
this.CbSiloH.Location = new System.Drawing.Point(10, 7);
this.CbSiloH.Name = "CbSiloH";
this.CbSiloH.Size = new System.Drawing.Size(138, 16);
this.CbSiloH.TabIndex = 68;
this.CbSiloH.Text = "复制糊化机A混合配方";
this.CbSiloH.UseVisualStyleBackColor = true;
this.CbSiloH.CheckedChanged += new System.EventHandler(this.CbSiloH_CheckedChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(154, 8);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(191, 12);
this.label2.TabIndex = 67;
this.label2.Text = "如果糊化机B采用相同的配方请勾选";
//
// dataGridSiloH1
//
this.dataGridSiloH1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@ -734,10 +731,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo1TimeInfo,
this.ComBoxSilo1Temp,
this.ComBoxSilo1Speed});
this.dataGridSiloH1.Location = new System.Drawing.Point(6, 29);
this.dataGridSiloH1.Location = new System.Drawing.Point(8, 36);
this.dataGridSiloH1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridSiloH1.Name = "dataGridSiloH1";
this.dataGridSiloH1.RowTemplate.Height = 23;
this.dataGridSiloH1.Size = new System.Drawing.Size(689, 136);
this.dataGridSiloH1.Size = new System.Drawing.Size(919, 170);
this.dataGridSiloH1.TabIndex = 66;
this.dataGridSiloH1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH1_DefaultValuesNeeded);
//
@ -771,10 +769,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// tabPage2
//
this.tabPage2.Controls.Add(this.dataGridSiloH2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Location = new System.Drawing.Point(4, 25);
this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(701, 171);
this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage2.Size = new System.Drawing.Size(937, 217);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "糊化机(#B)";
this.tabPage2.UseVisualStyleBackColor = true;
@ -788,10 +787,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxSilo2Temp,
this.ComBoxSilo2Speed});
this.dataGridSiloH2.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridSiloH2.Location = new System.Drawing.Point(3, 3);
this.dataGridSiloH2.Location = new System.Drawing.Point(4, 4);
this.dataGridSiloH2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridSiloH2.Name = "dataGridSiloH2";
this.dataGridSiloH2.RowTemplate.Height = 23;
this.dataGridSiloH2.Size = new System.Drawing.Size(695, 165);
this.dataGridSiloH2.Size = new System.Drawing.Size(929, 209);
this.dataGridSiloH2.TabIndex = 64;
this.dataGridSiloH2.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridSiloH2_DefaultValuesNeeded);
//
@ -825,9 +825,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
// groupBox7
//
this.groupBox7.Controls.Add(this.dataGridDryer1Action);
this.groupBox7.Location = new System.Drawing.Point(6, 20);
this.groupBox7.Location = new System.Drawing.Point(8, 25);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(709, 208);
this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Size = new System.Drawing.Size(945, 260);
this.groupBox7.TabIndex = 0;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "干混机(#A)";
@ -840,10 +842,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
this.ComBoxDryer1TimeInfo,
this.ComBoxDryer1Temp,
this.ComBoxDryer1Speed});
this.dataGridDryer1Action.Location = new System.Drawing.Point(3, 17);
this.dataGridDryer1Action.Location = new System.Drawing.Point(4, 21);
this.dataGridDryer1Action.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridDryer1Action.Name = "dataGridDryer1Action";
this.dataGridDryer1Action.RowTemplate.Height = 23;
this.dataGridDryer1Action.Size = new System.Drawing.Size(702, 189);
this.dataGridDryer1Action.Size = new System.Drawing.Size(936, 236);
this.dataGridDryer1Action.TabIndex = 63;
this.dataGridDryer1Action.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridDryer1Action_DefaultValuesNeeded);
//
@ -877,9 +880,10 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// BtnCanel
//
this.BtnCanel.Location = new System.Drawing.Point(258, 719);
this.BtnCanel.Location = new System.Drawing.Point(344, 899);
this.BtnCanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BtnCanel.Name = "BtnCanel";
this.BtnCanel.Size = new System.Drawing.Size(119, 47);
this.BtnCanel.Size = new System.Drawing.Size(159, 59);
this.BtnCanel.TabIndex = 2;
this.BtnCanel.Text = "取消配方";
this.BtnCanel.UseVisualStyleBackColor = true;
@ -887,14 +891,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
//
// FrmWeiRecipeDataAdd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1196, 773);
this.ClientSize = new System.Drawing.Size(1595, 966);
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.Name = "FrmWeiRecipeDataAdd";
this.Text = "配方名称";
this.groupBox1.ResumeLayout(false);
@ -921,7 +926,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
((System.ComponentModel.ISupportInitialize)(this.dataGridWeter2)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH1)).EndInit();
this.tabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridSiloH2)).EndInit();
@ -957,14 +961,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private TabControl tabControl1;
private TabPage tabPage1;
private TabPage tabPage2;
private CheckBox CbSiloH;
private Label label2;
private DataGridView dataGridSiloH1;
private DataGridView dataGridSiloH2;
private TabControl tabControl2;
private TabPage tabPage3;
private CheckBox CbSiloC;
private Label label5;
private TabPage tabPage4;
private GroupBox groupBox6;
private DataGridView dataGridWater1;

16
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.cs
Unescape Escape View File

@ -176,7 +176,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
&& x.Machine == "A").ToList();
dataGridSiloH1.DataSource = new BindingList<LjFormulaDetail>(data1SiloH);//DataGridView的行可以添加删除（只有允许添加行、删除行）
CbSiloH.Checked = cbSiloH;
CbSiloC.Checked = cbSiloH;
if (!cbSiloH)
{
var data2SiloH = detail.Where(x => x.MachineType == "Silo" && x.FormulaType == 2
@ -512,7 +512,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
List<ChEntity> dataGridSiloH1List = GetChEnity(dataGridSiloH1);
List<ChEntity> dataGridSiloH2List = new List<ChEntity>();
if (CbSiloH.Checked)
if (CbSiloC.Checked)
{
dataGridSiloH2List.AddRange(dataGridSiloH1List);
}
@ -731,7 +731,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{
cbSiloC = 1;
}
if(CbSiloH.Checked)
if(CbSiloC.Checked)
{
cbSiloH = 1;
}
@ -1119,11 +1119,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
tabControl2.TabPages.Add(this.tabPage4);
this.tabPage4.Enabled = true;
}
}
private void CbSiloH_CheckedChanged(object sender, EventArgs e)
{
if (CbSiloH.Checked == true)
if (CbSiloC.Checked == true)
{
this.tabPage2.Parent = null;
this.tabPage2.Enabled = false; // no casting required.
@ -1135,6 +1132,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
}
}
private void CbSiloH_CheckedChanged(object sender, EventArgs e)
{
}
private void CbWeterH_CheckedChanged(object sender, EventArgs e)
{
if (CbWeterH.Checked == true)

36
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/FrmWeiRecipeDataAdd.resx
Unescape Escape View File

@ -117,13 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ComBoxSilo1BinWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1Bin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1WeightWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="TxtSilo1Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1ToleranceWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="TxtSilo1Tolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1BinWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -135,13 +135,13 @@
<metadata name="TxtSilo1ToleranceWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Bin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ComBoxSilo1BinWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="TxtSilo1WeightWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="TxtSilo1Tolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="TxtSilo1ToleranceWater.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Bin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -207,6 +207,18 @@
<metadata name="TxtDryer1Tolerance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxWeter1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -291,18 +303,6 @@
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1TimeInfo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Temp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo1Speed.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ComBoxSilo2Code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

3
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save