Skip to content

李娜 / SO908-XLRStore

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

存储机构-复位按钮

1 个父辈 4d308cee
内嵌 并排
正在显示 3 个修改的文件 包含 21 行增加 和 17 行删除
source/DeviceLibrary/storeBean/EquipBase.cs
...@@ -32,6 +32,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,6 +32,7 @@ namespace OnlineStore.DeviceLibrary
protected override void mainTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) protected override void mainTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{ {
AutoStartProcess();
TimerProcess(); TimerProcess();
} }
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -311,6 +311,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -311,6 +311,8 @@ namespace OnlineStore.DeviceLibrary
if (MoveAxis.IsInPosition(Config.MoveAxis_P2)) if (MoveAxis.IsInPosition(Config.MoveAxis_P2))
{ {
MoveInfo.NextMoveStep(StepEnum.BOX_H0101_CheckCurMoveAxisPos); MoveInfo.NextMoveStep(StepEnum.BOX_H0101_CheckCurMoveAxisPos);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P1, Config.XAxis_A_P1_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P1, Config.XAxis_B_P1_Speed);
LogInfo($"复位 {MoveInfo.SLog}：抽屉未在料屉轴上,行走机构在暂存区"); LogInfo($"复位 {MoveInfo.SLog}：抽屉未在料屉轴上,行走机构在暂存区");
} }
else else
...@@ -380,16 +382,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -380,16 +382,16 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.BOX_H0103_ToAInputHighPos: case StepEnum.BOX_H0103_ToAInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0104_ToAInputLowPos); MoveInfo.NextMoveStep(StepEnum.BOX_H0104_ToAInputLowPos);
if (UpdownAxis.GetAclPosition() >= Config.Updown_P5 && UpdownAxis.GetAclPosition() <= Config.Updown_P4) if (UpdownAxis.GetAclPosition() > Config.Updown_P3)
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上下暂存区低点P5");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.Updown_P5_Speed);
}
else if (UpdownAxis.GetAclPosition() >= Config.Updown_P3 && UpdownAxis.GetAclPosition() <= Config.Updown_P2)
{ {
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点P3"); LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点P3");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.Updown_P3_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.Updown_P3_Speed);
} }
else //if (UpdownAxis.GetAclPosition() >= Config.Updown_P5 && UpdownAxis.GetAclPosition() < Config.Updown_P3)
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点P5");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.Updown_P5_Speed);
}
break; break;
case StepEnum.BOX_H0104_ToAInputLowPos: case StepEnum.BOX_H0104_ToAInputLowPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0105_A_XAxisToP1); MoveInfo.NextMoveStep(StepEnum.BOX_H0105_A_XAxisToP1);
...@@ -414,16 +416,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -414,16 +416,16 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.BOX_H0105_ToBInputHighPos: case StepEnum.BOX_H0105_ToBInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0106_ToBInputLowPos); MoveInfo.NextMoveStep(StepEnum.BOX_H0106_ToBInputLowPos);
if (UpdownAxis.GetAclPosition() >= Config.Updown_P11 && UpdownAxis.GetAclPosition() <= Config.Updown_P10) if (UpdownAxis.GetAclPosition() > Config.Updown_P9)
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点P11");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.Updown_P11_Speed);
}
else if (UpdownAxis.GetAclPosition() >= Config.Updown_P9 && UpdownAxis.GetAclPosition() <= Config.Updown_P8)
{ {
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点P9"); LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点P9");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.Updown_P9_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.Updown_P9_Speed);
} }
else //if (UpdownAxis.GetAclPosition() >= Config.Updown_P11 && UpdownAxis.GetAclPosition() <= Config.Updown_P10)
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点P11");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.Updown_P11_Speed);
}
break; break;
case StepEnum.BOX_H0106_ToBInputLowPos: case StepEnum.BOX_H0106_ToBInputLowPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H01_CheckCurPullDownPos); MoveInfo.NextMoveStep(StepEnum.BOX_H01_CheckCurPullDownPos);
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -542,17 +542,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -542,17 +542,17 @@ namespace OnlineStore.DeviceLibrary
int res = AutoFindPos.GetMarkInfo(bitmap, $"{MoveInfo.MoveParam.PosInfo.PosId.Substring(0, 4)}", $"row{autoFindPos.CurRow}_col{autoFindPos.CurColumn}", out ocsFXYR); int res = AutoFindPos.GetMarkInfo(bitmap, $"{MoveInfo.MoveParam.PosInfo.PosId.Substring(0, 4)}", $"row{autoFindPos.CurRow}_col{autoFindPos.CurColumn}", out ocsFXYR);
if (res == 0) if (res == 0)
{ {
LogInfo($"存储机构-相机检查库位 {MoveInfo.SLog}：取图并检查Mark点[{MoveInfo.MoveParam.PosInfo.PosId}]"); LogInfo($"相机检查库位 {MoveInfo.SLog}：取图并检查Mark点[{MoveInfo.MoveParam.PosInfo.PosId}]");
} }
else if (res == -4) else if (res == -4)
{ {
SetWarnMsg($"存储机构-相机检查库位异常[code={res}]，未找到Mark点。库位号:{MoveInfo.MoveParam.PosInfo.PosId}"); SetWarnMsg($"相机检查库位异常[code={res}]，未找到Mark点。库位号:{MoveInfo.MoveParam.PosInfo.PosId}");
CamDetectError = true; CamDetectError = true;
return false; return false;
} }
else else
{ {
SetWarnMsg($"存储机构-相机检查库位异常[code={res}]，未找到Mark点。库位号:{MoveInfo.MoveParam.PosInfo.PosId}"); SetWarnMsg($"相机检查库位异常[code={res}]，未找到Mark点。库位号:{MoveInfo.MoveParam.PosInfo.PosId}");
CamDetectError = true; CamDetectError = true;
return false; return false;
} }
...@@ -564,12 +564,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -564,12 +564,11 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
SetWarnMsg($"存储机构-相机检查库位异常 {MoveInfo.SLog}：Mark点Y轴坐标{ocsFXYR.fY},模板Mark点Y轴坐标{Config.Drawer_Y},Y轴偏差{(Config.Drawer_Y - ocsFXYR.fY)};" + SetWarnMsg($"相机检查库位异常 {MoveInfo.SLog}：Mark点Y轴坐标{ocsFXYR.fY},模板Mark点Y轴坐标{Config.Drawer_Y},Y轴偏差{(Config.Drawer_Y - ocsFXYR.fY)};" +
$"Mark点X轴坐标{ ocsFXYR.fX},模板Mark点X轴坐标{ Config.Drawer_X},X轴偏差{ (Config.Drawer_X - ocsFXYR.fX)}，"); $"Mark点X轴坐标{ ocsFXYR.fX},模板Mark点X轴坐标{ Config.Drawer_X},X轴偏差{ (Config.Drawer_X - ocsFXYR.fX)}，");
} }
CamDetectError = true; CamDetectError = true;
return false; return false;
//return true;
} }
#endregion #endregion
#region 入库 #region 入库
...@@ -601,6 +600,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -601,6 +600,8 @@ namespace OnlineStore.DeviceLibrary
private bool InDoorCheck(InOutParam param) private bool InDoorCheck(InOutParam param)
{ {
return true; return true;
if (param.PosInfo == null)
return false;
//if (CheckASide(param)) //if (CheckASide(param))
//{ //{
// if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH) && param.PosInfo != null) // if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH) && param.PosInfo != null)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!