Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit eea6de9a 由 LN
选项

托盘编辑界面修改

1 个父辈 d6ec23b5
内嵌 并排
正在显示 3 个修改的文件 包含 193 行增加 和 161 行删除
source/AssemblyLineClient/FrmLineIO.Designer.cs
......@@ -42,36 +42,39 @@
this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lblMsg = new System.Windows.Forms.Label();
this.chbTray = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.numTrayNum = new System.Windows.Forms.NumericUpDown();
this.groupTray = new System.Windows.Forms.GroupBox();
this.txtTrayLoc = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.chbSmall = new System.Windows.Forms.CheckBox();
this.rdbCutreel = new System.Windows.Forms.RadioButton();
this.rdbUrg = new System.Windows.Forms.RadioButton();
this.lblSelTrayNum = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.cmbHeight = new System.Windows.Forms.ComboBox();
this.cmbWidth = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.txtTrayCode = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.chbInStoNG = new System.Windows.Forms.CheckBox();
this.cmbTrayType = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.txtTrayPosid = new System.Windows.Forms.TextBox();
this.cmbTray = new System.Windows.Forms.ComboBox();
this.btnUpdateTray = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.chbTray = new System.Windows.Forms.CheckBox();
this.btnClear = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.lblSelTrayNum = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox5.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numTrayNum)).BeginInit();
this.groupTray.SuspendLayout();
this.SuspendLayout();
//
......@@ -93,9 +96,9 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(573, 3);
this.groupBox1.Location = new System.Drawing.Point(573, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(475, 127);
this.groupBox1.Size = new System.Drawing.Size(475, 125);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -224,7 +227,7 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(289, 3);
this.groupBox4.Location = new System.Drawing.Point(289, 5);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(276, 360);
this.groupBox4.TabIndex = 104;
......@@ -252,7 +255,7 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 3);
this.groupBox3.Location = new System.Drawing.Point(6, 5);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(276, 360);
this.groupBox3.TabIndex = 103;
......@@ -283,9 +286,9 @@
this.groupBox5.Controls.Add(this.btnFrontStopDown);
this.groupBox5.Controls.Add(this.btnStopDown);
this.groupBox5.Controls.Add(this.HY_TopCylinder_Up);
this.groupBox5.Location = new System.Drawing.Point(573, 134);
this.groupBox5.Location = new System.Drawing.Point(573, 141);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(475, 130);
this.groupBox5.Size = new System.Drawing.Size(475, 119);
this.groupBox5.TabIndex = 246;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -367,7 +370,7 @@
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(262, 364);
this.lblTrayNum.Location = new System.Drawing.Point(262, 371);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
......@@ -378,9 +381,8 @@
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Controls.Add(this.chbTray);
this.panel1.Controls.Add(this.groupTray);
this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.lblTrayNum);
this.panel1.Controls.Add(this.groupBox4);
......@@ -393,79 +395,92 @@
this.panel1.Size = new System.Drawing.Size(1060, 611);
this.panel1.TabIndex = 248;
//
// lblMsg
//
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(3, 476);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(562, 131);
this.lblMsg.TabIndex = 279;
this.lblMsg.Text = "CID";
//
// chbTray
//
this.chbTray.AutoSize = true;
this.chbTray.Location = new System.Drawing.Point(942, 539);
this.chbTray.Name = "chbTray";
this.chbTray.Size = new System.Drawing.Size(99, 21);
this.chbTray.TabIndex = 278;
this.chbTray.Text = "托盘信息编辑";
this.chbTray.UseVisualStyleBackColor = true;
this.chbTray.CheckedChanged += new System.EventHandler(this.chbTray_CheckedChanged);
// groupBox2
//
this.groupBox2.Controls.Add(this.numTrayNum);
this.groupBox2.Controls.Add(this.groupTray);
this.groupBox2.Controls.Add(this.chbTray);
this.groupBox2.Controls.Add(this.btnClear);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.lblSelTrayNum);
this.groupBox2.Location = new System.Drawing.Point(571, 271);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(477, 327);
this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "托盘信息编辑";
//
// numTrayNum
//
this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTrayNum.Location = new System.Drawing.Point(78, 29);
this.numTrayNum.Maximum = new decimal(new int[] {
150,
0,
0,
0});
this.numTrayNum.Minimum = new decimal(new int[] {
101,
0,
0,
0});
this.numTrayNum.Name = "numTrayNum";
this.numTrayNum.Size = new System.Drawing.Size(71, 26);
this.numTrayNum.TabIndex = 283;
this.numTrayNum.Value = new decimal(new int[] {
101,
0,
0,
0});
this.numTrayNum.ValueChanged += new System.EventHandler(this.numTrayNum_ValueChanged);
//
// groupTray
//
this.groupTray.Controls.Add(this.btnClear);
this.groupTray.Controls.Add(this.txtTrayLoc);
this.groupTray.Controls.Add(this.label3);
this.groupTray.Controls.Add(this.chbSmall);
this.groupTray.Controls.Add(this.rdbCutreel);
this.groupTray.Controls.Add(this.rdbUrg);
this.groupTray.Controls.Add(this.lblSelTrayNum);
this.groupTray.Controls.Add(this.label9);
this.groupTray.Controls.Add(this.cmbHeight);
this.groupTray.Controls.Add(this.cmbWidth);
this.groupTray.Controls.Add(this.label8);
this.groupTray.Controls.Add(this.label7);
this.groupTray.Controls.Add(this.txtTrayCode);
this.groupTray.Controls.Add(this.label6);
this.groupTray.Controls.Add(this.label1);
this.groupTray.Controls.Add(this.chbInStoNG);
this.groupTray.Controls.Add(this.cmbTrayType);
this.groupTray.Controls.Add(this.label2);
this.groupTray.Controls.Add(this.txtTrayPosid);
this.groupTray.Controls.Add(this.cmbTray);
this.groupTray.Controls.Add(this.btnUpdateTray);
this.groupTray.Enabled = false;
this.groupTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupTray.Location = new System.Drawing.Point(573, 268);
this.groupTray.Location = new System.Drawing.Point(6, 66);
this.groupTray.Name = "groupTray";
this.groupTray.Size = new System.Drawing.Size(475, 255);
this.groupTray.Size = new System.Drawing.Size(463, 139);
this.groupTray.TabIndex = 277;
this.groupTray.TabStop = false;
this.groupTray.Text = "托盘信息编辑";
//
// txtTrayLoc
//
this.txtTrayLoc.Location = new System.Drawing.Point(241, 97);
this.txtTrayLoc.Location = new System.Drawing.Point(45, 98);
this.txtTrayLoc.Name = "txtTrayLoc";
this.txtTrayLoc.Size = new System.Drawing.Size(59, 23);
this.txtTrayLoc.Size = new System.Drawing.Size(105, 23);
this.txtTrayLoc.TabIndex = 281;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(190, 100);
this.label3.Location = new System.Drawing.Point(6, 101);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(47, 17);
this.label3.Size = new System.Drawing.Size(35, 17);
this.label3.TabIndex = 280;
this.label3.Text = "料架号:";
this.label3.Text = "料架:";
//
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 60);
this.chbSmall.Location = new System.Drawing.Point(316, 62);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
......@@ -475,7 +490,7 @@
// rdbCutreel
//
this.rdbCutreel.AutoSize = true;
this.rdbCutreel.Location = new System.Drawing.Point(395, 25);
this.rdbCutreel.Location = new System.Drawing.Point(386, 25);
this.rdbCutreel.Name = "rdbCutreel";
this.rdbCutreel.Size = new System.Drawing.Size(62, 21);
this.rdbCutreel.TabIndex = 278;
......@@ -494,21 +509,10 @@
this.rdbUrg.Text = "紧急料";
this.rdbUrg.UseVisualStyleBackColor = true;
//
// lblSelTrayNum
//
this.lblSelTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSelTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblSelTrayNum.Location = new System.Drawing.Point(5, 177);
this.lblSelTrayNum.Name = "lblSelTrayNum";
this.lblSelTrayNum.Size = new System.Drawing.Size(462, 72);
this.lblSelTrayNum.TabIndex = 276;
this.lblSelTrayNum.Text = "托盘编码：";
this.lblSelTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(111, 100);
this.label9.Location = new System.Drawing.Point(245, 64);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(16, 17);
this.label9.TabIndex = 213;
......@@ -518,7 +522,7 @@
//
this.cmbHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHeight.FormattingEnabled = true;
this.cmbHeight.Location = new System.Drawing.Point(128, 96);
this.cmbHeight.Location = new System.Drawing.Point(262, 60);
this.cmbHeight.Name = "cmbHeight";
this.cmbHeight.Size = new System.Drawing.Size(45, 25);
this.cmbHeight.TabIndex = 212;
......@@ -527,7 +531,7 @@
//
this.cmbWidth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWidth.FormattingEnabled = true;
this.cmbWidth.Location = new System.Drawing.Point(65, 96);
this.cmbWidth.Location = new System.Drawing.Point(199, 60);
this.cmbWidth.Name = "cmbWidth";
this.cmbWidth.Size = new System.Drawing.Size(45, 25);
this.cmbWidth.TabIndex = 211;
......@@ -535,7 +539,7 @@
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(24, 100);
this.label8.Location = new System.Drawing.Point(158, 64);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(35, 17);
this.label8.TabIndex = 210;
......@@ -544,7 +548,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(155, 62);
this.label7.Location = new System.Drawing.Point(6, 27);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(35, 17);
this.label7.TabIndex = 209;
......@@ -552,24 +556,15 @@
//
// txtTrayCode
//
this.txtTrayCode.Location = new System.Drawing.Point(195, 59);
this.txtTrayCode.Location = new System.Drawing.Point(45, 24);
this.txtTrayCode.Name = "txtTrayCode";
this.txtTrayCode.Size = new System.Drawing.Size(105, 23);
this.txtTrayCode.TabIndex = 208;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(16, 27);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 17);
this.label6.TabIndex = 207;
this.label6.Text = "托盘号:";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(4, 62);
this.label1.Location = new System.Drawing.Point(162, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(59, 17);
this.label1.TabIndex = 206;
......@@ -578,7 +573,7 @@
// chbInStoNG
//
this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(398, 60);
this.chbInStoNG.Location = new System.Drawing.Point(386, 62);
this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205;
......@@ -593,7 +588,7 @@
"无",
"入库",
"出库"});
this.cmbTrayType.Location = new System.Drawing.Point(65, 58);
this.cmbTrayType.Location = new System.Drawing.Point(223, 23);
this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.TabIndex = 204;
......@@ -601,7 +596,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(155, 27);
this.label2.Location = new System.Drawing.Point(6, 64);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(35, 17);
this.label2.TabIndex = 199;
......@@ -609,26 +604,16 @@
//
// txtTrayPosid
//
this.txtTrayPosid.Location = new System.Drawing.Point(195, 24);
this.txtTrayPosid.Location = new System.Drawing.Point(45, 61);
this.txtTrayPosid.Name = "txtTrayPosid";
this.txtTrayPosid.Size = new System.Drawing.Size(105, 23);
this.txtTrayPosid.TabIndex = 198;
//
// cmbTray
//
this.cmbTray.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbTray.FormattingEnabled = true;
this.cmbTray.Location = new System.Drawing.Point(65, 23);
this.cmbTray.Name = "cmbTray";
this.cmbTray.Size = new System.Drawing.Size(78, 25);
this.cmbTray.TabIndex = 194;
this.cmbTray.SelectedIndexChanged += new System.EventHandler(this.cmbTray_SelectedIndexChanged);
//
// btnUpdateTray
//
this.btnUpdateTray.BackColor = System.Drawing.Color.White;
this.btnUpdateTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateTray.Location = new System.Drawing.Point(336, 132);
this.btnUpdateTray.Location = new System.Drawing.Point(343, 92);
this.btnUpdateTray.Name = "btnUpdateTray";
this.btnUpdateTray.Size = new System.Drawing.Size(105, 35);
this.btnUpdateTray.TabIndex = 192;
......@@ -636,21 +621,22 @@
this.btnUpdateTray.UseVisualStyleBackColor = false;
this.btnUpdateTray.Click += new System.EventHandler(this.btnUpdateTray_Click);
//
// lblMoveInfo
// chbTray
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(12, 364);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 276;
this.lblMoveInfo.Text = "CID";
this.chbTray.AutoSize = true;
this.chbTray.Location = new System.Drawing.Point(329, 32);
this.chbTray.Name = "chbTray";
this.chbTray.Size = new System.Drawing.Size(99, 21);
this.chbTray.TabIndex = 278;
this.chbTray.Text = "托盘信息编辑";
this.chbTray.UseVisualStyleBackColor = true;
this.chbTray.CheckedChanged += new System.EventHandler(this.chbTray_CheckedChanged);
//
// btnClear
//
this.btnClear.BackColor = System.Drawing.Color.White;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.Location = new System.Drawing.Point(336, 91);
this.btnClear.Location = new System.Drawing.Point(187, 25);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(105, 35);
this.btnClear.TabIndex = 282;
......@@ -658,6 +644,46 @@
this.btnClear.UseVisualStyleBackColor = false;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(22, 34);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(47, 17);
this.label6.TabIndex = 207;
this.label6.Text = "托盘号:";
//
// lblSelTrayNum
//
this.lblSelTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSelTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblSelTrayNum.Location = new System.Drawing.Point(6, 208);
this.lblSelTrayNum.Name = "lblSelTrayNum";
this.lblSelTrayNum.Size = new System.Drawing.Size(463, 92);
this.lblSelTrayNum.TabIndex = 276;
this.lblSelTrayNum.Text = "托盘编码：";
this.lblSelTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblMsg
//
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(3, 476);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(562, 131);
this.lblMsg.TabIndex = 279;
this.lblMsg.Text = "CID";
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(12, 371);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 276;
this.lblMoveInfo.Text = "CID";
//
// FrmLineIO
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -679,6 +705,9 @@
this.groupBox5.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numTrayNum)).EndInit();
this.groupTray.ResumeLayout(false);
this.groupTray.PerformLayout();
this.ResumeLayout(false);
......@@ -720,7 +749,6 @@
private System.Windows.Forms.ComboBox cmbTrayType;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtTrayPosid;
private System.Windows.Forms.ComboBox cmbTray;
private System.Windows.Forms.Button btnUpdateTray;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtTrayCode;
......@@ -737,6 +765,8 @@
private System.Windows.Forms.CheckBox chbTray;
private System.Windows.Forms.Label lblMsg;
private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.NumericUpDown numTrayNum;
private System.Windows.Forms.GroupBox groupBox2;
}
}
source/AssemblyLineClient/FrmLineIO.cs
......@@ -112,12 +112,12 @@ namespace OnlineStore.AssemblyLine
ReadIOList();
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString();
if (cmbTray.SelectedIndex >= 0)
{
int trayNum = cmbTray.SelectedIndex + 101;
//if (cmbTray.SelectedIndex >= 0)
//{
int trayNum =(int) numTrayNum.Value + 101;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr();
}
//}
if (LineManager.Line.IOValue(IO_Type.HY_TopCylinder_Up).Equals(IO_VALUE.HIGH))
{
......@@ -219,11 +219,11 @@ namespace OnlineStore.AssemblyLine
private void LoadTray()
{
cmbTray.Items.Clear();
for (int i = 101; i <= 150; i++)
{
cmbTray.Items.Add(i.ToString());
}
//cmbTray.Items.Clear();
//for (int i = 101; i <= 150; i++)
//{
// cmbTray.Items.Add(i.ToString());
//}
cmbWidth.Items.Clear();
cmbHeight.Items.Clear();
......@@ -236,11 +236,12 @@ namespace OnlineStore.AssemblyLine
cmbHeight.SelectedIndex = 0;
cmbTrayType.SelectedIndex = 0;
cmbTray.SelectedIndex = 0;
//cmbTray.SelectedIndex = 0;
}
private void btnUpdateTray_Click(object sender, EventArgs e)
{
int num = cmbTray.SelectedIndex + 101;
//int num = cmbTray.SelectedIndex + 101;
int num = (int)numTrayNum.Value;
DialogResult resut = MessageBox.Show("确定手动更新托盘【" + num + "】的信息？", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
......@@ -398,11 +399,37 @@ namespace OnlineStore.AssemblyLine
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
}
private void cmbTray_SelectedIndexChanged(object sender, EventArgs e)
private void chbTray_CheckedChanged(object sender, EventArgs e)
{
if (!groupTray.Enabled.Equals(chbTray.Checked))
{
groupTray.Enabled = chbTray.Checked;
LogUtil.error("勾选 " + chbTray.Text + "=" + groupTray.Enabled);
}
}
private void btnClear_Click(object sender, EventArgs e)
{
//int num = cmbTray.SelectedIndex + 101;
int num = (int)numTrayNum.Value;
TrayInfo tray = TrayManager.GetTrayInfo(num);
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
TrayManager.ClearInstore( tray);
TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("界面点击手动清空托盘信息：" + info.ToStr());
}
}
private void numTrayNum_ValueChanged(object sender, EventArgs e)
{
if (cmbTray.SelectedIndex >= 0)
int trayNum = (int)numTrayNum.Value;
if (trayNum >= 0)
{
int trayNum = cmbTray.SelectedIndex + 101;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
cmbTrayType.SelectedIndex = tray.InOrOutStore;
......@@ -434,30 +461,5 @@ namespace OnlineStore.AssemblyLine
}
}
}
private void chbTray_CheckedChanged(object sender, EventArgs e)
{
if (!groupTray.Enabled.Equals(chbTray.Checked))
{
groupTray.Enabled = chbTray.Checked;
LogUtil.error("勾选 " + chbTray.Text + "=" + groupTray.Enabled);
}
}
private void btnClear_Click(object sender, EventArgs e)
{
int num = cmbTray.SelectedIndex + 101;
TrayInfo tray = TrayManager.GetTrayInfo(num);
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
TrayManager.ClearInstore( tray);
TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("界面点击手动清空托盘信息：" + info.ToStr());
}
}
}
}
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -328,9 +328,9 @@
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(294, 82);
this.groupBox1.Location = new System.Drawing.Point(339, 25);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(939, 69);
this.groupBox1.Size = new System.Drawing.Size(862, 69);
this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试";
......@@ -347,10 +347,9 @@
//
// btnUpdateStatus
//
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(637, 21);
this.btnUpdateStatus.Location = new System.Drawing.Point(629, 21);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195;
......@@ -1121,38 +1120,38 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Visible = false;
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator9.Visible = false;
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Visible = false;
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
......@@ -1160,36 +1159,36 @@
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
//
// iO模块状态ToolStripMenuItem
//
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
//
// 查看托盘信息ToolStripMenuItem
//
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
//
// 清空托盘信息ToolStripMenuItem
//
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
//
......@@ -1208,31 +1207,31 @@
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -1307,6 +1306,7 @@
this.自动保存托盘信息ToolStripMenuItem.Name = "自动保存托盘信息ToolStripMenuItem";
this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.自动保存托盘信息ToolStripMenuItem.Text = "保存托盘信息";
this.自动保存托盘信息ToolStripMenuItem.Visible = false;
this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click);
//
// toolStripSeparator24
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!