Skip to content

李娜 / SO908-XLRStore

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

Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

2 个父辈 c308600f 6a0837d9
内嵌 并排
正在显示 5 个修改的文件 包含 54 行增加 和 9 行删除
source/DeviceLibrary/storeBean/EquipBase.cs
...@@ -707,6 +707,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -707,6 +707,13 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
protected void ClearSpecifiedAlarm(string msg)
{
if (WarnMsg.Contains(msg))
{
SetWarnMsg("");
}
}
protected void ClearTimeoutAlarm(string msg) protected void ClearTimeoutAlarm(string msg)
{ {
if (isInSuddenDown || isNoAirpressure_Check) if (isInSuddenDown || isNoAirpressure_Check)
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -439,7 +439,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -439,7 +439,7 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW) || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW) || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW))
{ {
MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos); MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos);
if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff)&& if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff) &&
(BufferDataManager.BOutStoreInfo == null || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW))) (BufferDataManager.BOutStoreInfo == null || IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2"); LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
...@@ -447,7 +447,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -447,7 +447,7 @@ namespace OnlineStore.DeviceLibrary
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed); XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
} }
else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff)&& else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff) &&
(BufferDataManager.BInStoreInfo == null || IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW))) (BufferDataManager.BInStoreInfo == null || IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2"); LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
...@@ -588,12 +588,44 @@ namespace OnlineStore.DeviceLibrary ...@@ -588,12 +588,44 @@ namespace OnlineStore.DeviceLibrary
private DateTime dtUpperA = DateTime.Now; private DateTime dtUpperA = DateTime.Now;
private DateTime dtUpperB = DateTime.Now; private DateTime dtUpperB = DateTime.Now;
int SigLastTime = 5;//5秒 int SigLastTime = 2;//5秒
protected override void OnTimerProcess() protected override void OnTimerProcess()
{ {
if (!runStatus.Equals(RunStatus.Runing)) if (!runStatus.Equals(RunStatus.Runing))
return; return;
TimeSpan timeSpanA = DateTime.Now - dtUpperA; TimeSpan timeSpanA = DateTime.Now - dtUpperA;
if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.LOW) && BufferDataManager.AInStoreInfo != null)
{
SetWarnMsg("A进料上暂存区有料盘，但信号未亮");
}
else
{
ClearSpecifiedAlarm("A进料上暂存区有料盘，但信号未亮");
}
if (IOValue(IO_Type.UnderArea_Check_A).Equals(IO_VALUE.LOW) && BufferDataManager.AOutStoreInfo != null)
{
SetWarnMsg("A出料下暂存区有料盘，但信号未亮");
}
else
{
ClearSpecifiedAlarm("A出料下暂存区有料盘，但信号未亮");
}
if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.LOW) && BufferDataManager.BInStoreInfo != null)
{
SetWarnMsg("B进料上暂存区有料盘，但信号未亮");
}
else
{
ClearSpecifiedAlarm("B进料上暂存区有料盘，但信号未亮");
}
if (IOValue(IO_Type.UnderArea_Check_B).Equals(IO_VALUE.LOW) && BufferDataManager.BOutStoreInfo != null)
{
SetWarnMsg("B出料下暂存区有料盘，但信号未亮");
}
else
{
ClearSpecifiedAlarm("B出料下暂存区有料盘，但信号未亮");
}
//检测A上暂存区是否有料盘 //检测A上暂存区是否有料盘
if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH))
{ {
...@@ -679,7 +711,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -679,7 +711,7 @@ namespace OnlineStore.DeviceLibrary
AutoFindPosProcess(); AutoFindPosProcess();
} }
BusyMoveProcess(); BusyMoveProcess();
IOTimeOutProcess();
if (NoErrorAlarm()) if (NoErrorAlarm())
{ {
CheckAxisAlarm(); CheckAxisAlarm();
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -200,11 +200,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -200,11 +200,10 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SI_06_InOutBackFromBuff); MoveInfo.NextMoveStep(StepEnum.SI_06_InOutBackFromBuff);
LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到料屉库位取放料点P3[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到料屉库位取放料点P3[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
XAxis_To_P3(); XAxis_To_P3();
//清空暂存区料盘信息
ClearInDoorBuffer();
break; break;
case StepEnum.SI_06_InOutBackFromBuff: case StepEnum.SI_06_InOutBackFromBuff:
//清空暂存区料盘信息
ClearInDoorBuffer();
//存储当前料叉信息 //存储当前料叉信息
if (MoveInfo.MoveParam.PosInfoBack == null) if (MoveInfo.MoveParam.PosInfoBack == null)
{ {
...@@ -247,6 +246,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -247,6 +246,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SI_09_ToTray); MoveInfo.NextMoveStep(StepEnum.SI_09_ToTray);
LogInfo($"入库 {MoveInfo.SLog}：到抽屉提取点，料斗拉取进出轴到料屉提取点P2/P4[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：到抽屉提取点，料斗拉取进出轴到料屉提取点P2/P4[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
ToTray(); ToTray();
CamDetectError = false;
IgnoreCamDect = false; IgnoreCamDect = false;
} }
break; break;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -65,6 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,6 +65,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SO_03_ToTray); MoveInfo.NextMoveStep(StepEnum.SO_03_ToTray);
LogInfo($"出库 {MoveInfo.SLog}：到抽屉提取点,料斗拉取进出轴到料屉提取点P2/P4[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}：到抽屉提取点,料斗拉取进出轴到料屉提取点P2/P4[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
ToTray(); ToTray();
CamDetectError = false;
IgnoreCamDect = false; IgnoreCamDect = false;
} }
break; break;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -19,6 +19,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,6 +19,12 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
//public bool InputMiddleAxisCanMove()
//{
// if()
// return false;
//}
/// <summary> /// <summary>
/// 忽略相机检测到的抽屉误差误差 /// 忽略相机检测到的抽屉误差误差
/// </summary> /// </summary>
...@@ -223,7 +229,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -223,7 +229,7 @@ namespace OnlineStore.DeviceLibrary
{ {
XAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.XAxis_AB_P3, Config.XAxis_B_P3_Speed); XAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.XAxis_AB_P3, Config.XAxis_B_P3_Speed);
} }
} }
/// <summary> /// <summary>
/// AB面移栽X轴到待机点 /// AB面移栽X轴到待机点
/// </summary> /// </summary>
...@@ -535,7 +541,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -535,7 +541,6 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IgnoreCamDect) if (IgnoreCamDect)
{ {
CamDetectError = false;
return true; return true;
} }
Bitmap bitmap = AcqImage(CamPosSide(MoveInfo.MoveParam.PosInfo.PosId)); Bitmap bitmap = AcqImage(CamPosSide(MoveInfo.MoveParam.PosInfo.PosId));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!