Skip to content

李娜 / SO664-AssemblyLine

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

接驳台优化

1 个父辈 8786baf1
内嵌 并排
正在显示 6 个修改的文件 包含 103 行增加 和 30 行删除
dll/CodeLibrary.dll
此文件类型无法预览
dll/eyemLib.dll
此文件类型无法预览
source/AssemblyLineClient/FrmLineIO.Designer.cs
......@@ -42,6 +42,7 @@
this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.btnT3Reset = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.numTrayNum = new System.Windows.Forms.NumericUpDown();
this.groupTray = new System.Windows.Forms.GroupBox();
......@@ -98,7 +99,7 @@
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, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(475, 125);
this.groupBox1.Size = new System.Drawing.Size(480, 125);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -288,7 +289,7 @@
this.groupBox5.Controls.Add(this.HY_TopCylinder_Up);
this.groupBox5.Location = new System.Drawing.Point(573, 141);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(475, 119);
this.groupBox5.Size = new System.Drawing.Size(480, 119);
this.groupBox5.TabIndex = 246;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -370,7 +371,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, 371);
this.lblTrayNum.Location = new System.Drawing.Point(3, 307);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
......@@ -381,10 +382,10 @@
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.btnT3Reset);
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.lblTrayNum);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox5);
......@@ -395,17 +396,30 @@
this.panel1.Size = new System.Drawing.Size(1060, 611);
this.panel1.TabIndex = 248;
//
// btnT3Reset
//
this.btnT3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnT3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnT3Reset.Location = new System.Drawing.Point(425, 371);
this.btnT3Reset.Name = "btnT3Reset";
this.btnT3Reset.Size = new System.Drawing.Size(140, 37);
this.btnT3Reset.TabIndex = 284;
this.btnT3Reset.Text = "T3-C1复位";
this.btnT3Reset.UseVisualStyleBackColor = false;
this.btnT3Reset.Click += new System.EventHandler(this.btnT3Reset_Click);
//
// groupBox2
//
this.groupBox2.Controls.Add(this.numTrayNum);
this.groupBox2.Controls.Add(this.groupTray);
this.groupBox2.Controls.Add(this.chbTray);
this.groupBox2.Controls.Add(this.lblTrayNum);
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.Size = new System.Drawing.Size(482, 327);
this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "托盘信息编辑";
......@@ -420,7 +434,7 @@
0,
0});
this.numTrayNum.Minimum = new decimal(new int[] {
101,
1,
0,
0,
0});
......@@ -457,7 +471,7 @@
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(6, 66);
this.groupTray.Name = "groupTray";
this.groupTray.Size = new System.Drawing.Size(463, 139);
this.groupTray.Size = new System.Drawing.Size(470, 139);
this.groupTray.TabIndex = 277;
this.groupTray.TabStop = false;
//
......@@ -465,7 +479,7 @@
//
this.txtTrayLoc.Location = new System.Drawing.Point(45, 98);
this.txtTrayLoc.Name = "txtTrayLoc";
this.txtTrayLoc.Size = new System.Drawing.Size(105, 23);
this.txtTrayLoc.Size = new System.Drawing.Size(122, 23);
this.txtTrayLoc.TabIndex = 281;
//
// label3
......@@ -480,7 +494,7 @@
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 62);
this.chbSmall.Location = new System.Drawing.Point(324, 62);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
......@@ -490,7 +504,7 @@
// rdbCutreel
//
this.rdbCutreel.AutoSize = true;
this.rdbCutreel.Location = new System.Drawing.Point(386, 25);
this.rdbCutreel.Location = new System.Drawing.Point(397, 25);
this.rdbCutreel.Name = "rdbCutreel";
this.rdbCutreel.Size = new System.Drawing.Size(62, 21);
this.rdbCutreel.TabIndex = 278;
......@@ -501,7 +515,7 @@
// rdbUrg
//
this.rdbUrg.AutoSize = true;
this.rdbUrg.Location = new System.Drawing.Point(317, 25);
this.rdbUrg.Location = new System.Drawing.Point(328, 25);
this.rdbUrg.Name = "rdbUrg";
this.rdbUrg.Size = new System.Drawing.Size(62, 21);
this.rdbUrg.TabIndex = 277;
......@@ -512,7 +526,7 @@
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(245, 64);
this.label9.Location = new System.Drawing.Point(256, 64);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(16, 17);
this.label9.TabIndex = 213;
......@@ -522,7 +536,7 @@
//
this.cmbHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHeight.FormattingEnabled = true;
this.cmbHeight.Location = new System.Drawing.Point(262, 60);
this.cmbHeight.Location = new System.Drawing.Point(273, 60);
this.cmbHeight.Name = "cmbHeight";
this.cmbHeight.Size = new System.Drawing.Size(45, 25);
this.cmbHeight.TabIndex = 212;
......@@ -531,7 +545,7 @@
//
this.cmbWidth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWidth.FormattingEnabled = true;
this.cmbWidth.Location = new System.Drawing.Point(199, 60);
this.cmbWidth.Location = new System.Drawing.Point(210, 60);
this.cmbWidth.Name = "cmbWidth";
this.cmbWidth.Size = new System.Drawing.Size(45, 25);
this.cmbWidth.TabIndex = 211;
......@@ -539,7 +553,7 @@
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(158, 64);
this.label8.Location = new System.Drawing.Point(169, 64);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(35, 17);
this.label8.TabIndex = 210;
......@@ -558,13 +572,13 @@
//
this.txtTrayCode.Location = new System.Drawing.Point(45, 24);
this.txtTrayCode.Name = "txtTrayCode";
this.txtTrayCode.Size = new System.Drawing.Size(105, 23);
this.txtTrayCode.Size = new System.Drawing.Size(122, 23);
this.txtTrayCode.TabIndex = 208;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(162, 27);
this.label1.Location = new System.Drawing.Point(173, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(59, 17);
this.label1.TabIndex = 206;
......@@ -573,7 +587,7 @@
// chbInStoNG
//
this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(386, 62);
this.chbInStoNG.Location = new System.Drawing.Point(394, 62);
this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205;
......@@ -588,7 +602,7 @@
"无",
"入库",
"出库"});
this.cmbTrayType.Location = new System.Drawing.Point(223, 23);
this.cmbTrayType.Location = new System.Drawing.Point(234, 23);
this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.TabIndex = 204;
......@@ -606,14 +620,14 @@
//
this.txtTrayPosid.Location = new System.Drawing.Point(45, 61);
this.txtTrayPosid.Name = "txtTrayPosid";
this.txtTrayPosid.Size = new System.Drawing.Size(105, 23);
this.txtTrayPosid.Size = new System.Drawing.Size(122, 23);
this.txtTrayPosid.TabIndex = 198;
//
// btnUpdateTray
//
this.btnUpdateTray.BackColor = System.Drawing.Color.White;
this.btnUpdateTray.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateTray.Location = new System.Drawing.Point(343, 92);
this.btnUpdateTray.Location = new System.Drawing.Point(354, 92);
this.btnUpdateTray.Name = "btnUpdateTray";
this.btnUpdateTray.Size = new System.Drawing.Size(105, 35);
this.btnUpdateTray.TabIndex = 192;
......@@ -767,6 +781,7 @@
private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.NumericUpDown numTrayNum;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button btnT3Reset;
}
}
source/AssemblyLineClient/FrmLineIO.cs
......@@ -114,7 +114,7 @@ namespace OnlineStore.AssemblyLine
lblTrayNum.Text = "T3-C1托盘号：" + LineManager.Line.T3C1_TrayNum.ToString();
//if (cmbTray.SelectedIndex >= 0)
//{
int trayNum =(int) numTrayNum.Value + 101;
int trayNum =(int) numTrayNum.Value ;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr();
//}
......@@ -412,7 +412,13 @@ namespace OnlineStore.AssemblyLine
{
//int num = cmbTray.SelectedIndex + 101;
int num = (int)numTrayNum.Value;
if (num < 100)
{
MessageBox.Show("请输入大于100的托盘号","提示", MessageBoxButtons.OK,MessageBoxIcon.Error,MessageBoxDefaultButton.Button1);
return;
}
TrayInfo tray = TrayManager.GetTrayInfo(num);
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
......@@ -420,7 +426,7 @@ namespace OnlineStore.AssemblyLine
TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("界面点击手动清空托盘信息：" + info.ToStr());
LogUtil.info("界面点击手动清空托盘，清空前【" + tray.ToStr() + "】，清空后：" + info.ToStr());
}
}
......@@ -461,5 +467,11 @@ namespace OnlineStore.AssemblyLine
}
}
}
private void btnT3Reset_Click(object sender, EventArgs e)
{
LogUtil.info(Name + "点击：" + btnT3Reset.Text);
LineManager.Line.T3C1_Stop();
}
}
}
source/AssemblyLineClient/记录.txt
......@@ -74,7 +74,17 @@
T4料架处理修改。
20210121
需要修改：
1.料仓调试模式下，不出入库，也不获取库位号。
2.料仓压紧点位置根据料盘厚度来判断。
3。仓门口，夹爪未抓起料后，判断料再下方，重新抓取一次
复位时，进仓夹爪有料，保存状态，复位完成后继续出入库。
大料入库时，夹爪上的料56寸时会撞
已修改：
料仓或者移栽调试状态时，不获取库位号。
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
......@@ -66,10 +66,32 @@ namespace OnlineStore.DeviceLibrary
//托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.Fixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_01_TrayCheck);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘");
ClearTrayRFID();
SecondMoveInfo.OneWaitCanEndStep = true;
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.HIGH));
if (IsNgPro())
{
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡检测到托盘");
ClearTrayRFID();
SecondMoveInfo.OneWaitCanEndStep = true;
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.HIGH));
}
else
{
if (IOValue(IO_Type.HY_TopCylinder_Up).Equals(IO_VALUE.LOW))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_03_StopDown);
LineStop();
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：前阻挡下降");
}
else
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_02_TopMove);
CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：顶升气缸下降 ");
IOMove(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW);
IOMove(IO_Type.HY_TopCylinder_Down, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW));
LineStop();
}
}
}
}
else
......@@ -251,8 +273,13 @@ namespace OnlineStore.DeviceLibrary
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待800ms,托盘检测无信号");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(800));
int time = 200;
if (IsNgPro())
{
time = 800;
}
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待"+ time + "ms,托盘检测无信号");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(time));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
}
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_13_TrayLeave))
......@@ -260,7 +287,16 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_14_TopDown);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降，横移电机 停止");
LineStop(SecondMoveInfo);
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
if (IsNgPro())
{
CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
else
{
IOMove(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW);
IOMove(IO_Type.HY_TopCylinder_Down, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TopCylinder_Up, IO_VALUE.LOW));
}
}
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!