Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 71344179 由 张东亮
选项

只有出库取完料才检查料叉情况

1 个父辈 3d5d7ae7
内嵌 并排
正在显示 7 个修改的文件 包含 47 行增加 和 38 行删除
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -116,13 +116,13 @@ namespace DeviceLibrary
case MoveStep.Wait:
break;
case MoveStep.StoreTS01:
if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (!IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
Msg.add(crc.GetString(L.out_store_detect_material, "取料前料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause("出库时料叉X30检测到有物料无法继续,请检查");
}
else
//if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
//{
// // if (!IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
// //Msg.add(crc.GetString(L.out_store_detect_material, "取料前料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
// //RobotManage.UserPause("出库时料叉X30检测到有物料无法继续,请检查");
//}
//else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
......@@ -179,7 +179,7 @@ namespace DeviceLibrary
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{
Msg.add(crc.GetString(L.out_store_not_detect_material, "取料前料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(crc.GetString(L.out_store_not_detect_material, "取料后料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause(crc.GetString(L.out_store_not_detect_material, "取料前料叉X30没有检测到有物料无法继续,请检查."));
}
else
......@@ -237,7 +237,7 @@ namespace DeviceLibrary
var fixpos = "fix#" + To.Reel.PlateW.ToString();
int camPos = ConfigHelper.Config.Get($"CamPos_{fixpos}", Fix.UpDown_PL);
Comp_Axis.AbsMove(MoveInfo, 0, Config.Comp_P1_speed);
UpDown_Axis.AbsMove(MoveInfo, camPos, Config.UpDown_P3_speed/2);
UpDown_Axis.AbsMove(MoveInfo, camPos, Config.UpDown_P3_speed / 2);
MoveInfo.log($"{storeMoveType}:压紧轴回到待机点");
MoveInfo.log($"{storeMoveType}:升降轴到拍照点");
break;
......@@ -298,7 +298,7 @@ namespace DeviceLibrary
case MoveStep.StoreFIX07:
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{
Msg.add(crc.GetString(L.out_store_not_detect_material, "取料前料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(crc.GetString(L.out_store_not_detect_material, "取料后料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause(crc.GetString(L.out_store_not_detect_material, "取料前料叉X30没有检测到有物料无法继续,请检查."));
}
else
......@@ -328,7 +328,7 @@ namespace DeviceLibrary
MoveInfo.log($"等待料串准备好放料");
return false;
}
else if(MoveInfo.IsTimeOut(10))
else if (MoveInfo.IsTimeOut(10))
{
mainMachine.TurnToOut();
}
......@@ -366,12 +366,12 @@ namespace DeviceLibrary
break;
case MoveStep.StoreTS15:
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(To.posid, WareCode, storeMoveType, FixtureState.ToOut));
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上任然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause("入库后料叉X30上任然检测到物料,请检查");
}
else
//if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
//{
// Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上任然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
// //RobotManage.UserPause("入库后料叉X30上任然检测到物料,请检查");
//}
//else
{
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
......
DeviceLibrary/theMachine/MainMachine_Store.cs
......@@ -63,13 +63,14 @@ namespace DeviceLibrary
if (!boxTransport.IgnoreX09 && IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 1000))
{
Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause("收到出库任务,但料叉上有料,无法启动,请检查");
}
else
//if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 1000))
//{
// Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
// //RobotManage.UserPause(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"));
//}
//else
Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.warning);
RobotManage.UserPause(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"));
return;
}
else
......@@ -94,13 +95,14 @@ namespace DeviceLibrary
if (!boxTransport.IgnoreX09 && IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 1000))
{
Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
//RobotManage.UserPause("收到出库任务,但料叉上有料,无法启动,请检查");
}
else
//if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 1000))
//{
// Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
// //RobotManage.UserPause("收到出库任务,但料叉上有料,无法启动,请检查");
//}
//else
Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.warning);
RobotManage.UserPause(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"));
return;
}
else
......
TheMachine/Form1.Designer.cs
......@@ -45,6 +45,7 @@ namespace TheMachine
this.tabc = new System.Windows.Forms.TabControl();
this.tabP1 = new System.Windows.Forms.TabPage();
this.pnl = new System.Windows.Forms.Panel();
this.panelVideo = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.stateView = new System.Windows.Forms.ListView();
this.btn_releasestring = new System.Windows.Forms.Button();
......@@ -57,7 +58,6 @@ namespace TheMachine
this.listView1 = new System.Windows.Forms.ListView();
this.btn_stop = new System.Windows.Forms.Button();
this.btn_run = new System.Windows.Forms.Button();
this.panelVideo = new System.Windows.Forms.Panel();
this.menuStrip1.SuspendLayout();
this.tabc.SuspendLayout();
this.tabP1.SuspendLayout();
......@@ -210,6 +210,13 @@ namespace TheMachine
this.pnl.Size = new System.Drawing.Size(1000, 560);
this.pnl.TabIndex = 273;
//
// panelVideo
//
this.panelVideo.Location = new System.Drawing.Point(21, 258);
this.panelVideo.Name = "panelVideo";
this.panelVideo.Size = new System.Drawing.Size(436, 271);
this.panelVideo.TabIndex = 273;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.stateView);
......@@ -301,7 +308,6 @@ namespace TheMachine
this.btn_IgnoreX09.TabIndex = 6;
this.btn_IgnoreX09.Text = "忽略X30错误,并继续运行";
this.btn_IgnoreX09.UseVisualStyleBackColor = false;
this.btn_IgnoreX09.Visible = false;
this.btn_IgnoreX09.Click += new System.EventHandler(this.btn_IgnoreX09_Click);
//
// btn_PauseBuzzer
......@@ -355,13 +361,6 @@ namespace TheMachine
this.btn_run.UseVisualStyleBackColor = true;
this.btn_run.Click += new System.EventHandler(this.btn_run_Click);
//
// panelVideo
//
this.panelVideo.Location = new System.Drawing.Point(21, 258);
this.panelVideo.Name = "panelVideo";
this.panelVideo.Size = new System.Drawing.Size(436, 271);
this.panelVideo.TabIndex = 273;
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F);
......
TheMachine/Form1.cs
......@@ -548,10 +548,15 @@ namespace TheMachine
private void btn_IgnoreX09_Click(object sender, EventArgs e)
{
DialogResult rtn = MessageBox.Show(crc.GetString("confirm_no_reel_in_com", "请确保料盘已从库位中取出")+"!", crc.GetString("title","Warning"), MessageBoxButtons.YesNo);
if (rtn.Equals(DialogResult.Yes))
{
RobotManage.mainMachine.IgnoreX09();
btn_IgnoreX09.Visible = false;
}
}
private void btn_releasestring_Click(object sender, EventArgs e)
{
if (RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait)
......
TheMachine/resources/en-US.lngres
......@@ -399,3 +399,4 @@ Res0020 升降轴位置调试： Updown-Axis Debug Location
l_flipDoor_no_work 左侧翻板水平信号未亮 The left flap horizontal signal is not lit
r_flipDoor_no_work 右侧翻板水平信号未亮 The right flap horizontal signal is not lit
reel_not_in_right_status 料盘放置异常 The reel is placed abnormally
confirm_no_reel_in_com 请确保料盘已从库位中取出 Make sure that the reel has been removed from the location
\ No newline at end of file
TheMachine/resources/ja-JP.lngres
......@@ -401,3 +401,4 @@ Res0021 请输入正确的速度 正しい速度を入力してください正
l_flipDoor_no_work 左侧翻板水平信号未亮 左フラップ水平信号が点灯していない
r_flipDoor_no_work 右侧翻板水平信号未亮 右フラップ水平信号が点灯しない
reel_not_in_right_status 料盘放置异常 リールが異常に配置されている
confirm_no_reel_in_com 请确保料盘已从库位中取出 リールがその場所から取り外されていることを確認してください
\ No newline at end of file
TheMachine/resources/zh-CN.lngres
......@@ -389,3 +389,4 @@ sureDelete 确定删除文件： 确定删除文件：
l_flipDoor_no_work 左侧翻板水平信号未亮 左侧翻板水平信号未亮
r_flipDoor_no_work 右侧翻板水平信号未亮 右侧翻板水平信号未亮
reel_not_in_right_status 料盘放置异常 料盘放置异常
confirm_no_reel_in_com 请确保料盘已从库位中取出 请确保料盘已从库位中取出
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!