Skip to content

李娜 / SO908-XLRStore

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

存储机构-屏蔽信号应用到出入库

1 个父辈 2b079498
内嵌 并排
正在显示 7 个修改的文件 包含 14 行增加 和 10 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns> /// <returns></returns>
private bool CheckInStoreOtherSideInfo() private bool CheckInStoreOtherSideInfo()
{ {
if(MoveInfo.MoveParam.PosInfoBack !=null) if (MoveInfo.MoveParam.PosInfoBack != null)
{ {
return true; return true;
} }
...@@ -54,7 +54,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -54,7 +54,7 @@ namespace OnlineStore.DeviceLibrary
if (!AutoInout.autoNext && !InDoorCheck(param)) if (!AutoInout.autoNext && !InDoorCheck(param))
{ {
if (param==null || param.PosInfo == null) if (param == null || param.PosInfo == null)
return false; return false;
SetWarnMsg(Name + $" 启动入库出错，入口料盘无入库信息[barcode={param.PosInfo.barcode},PosSide={param.PosInfo.GetPosSide()}], 任务取消"); SetWarnMsg(Name + $" 启动入库出错，入口料盘无入库信息[barcode={param.PosInfo.barcode},PosSide={param.PosInfo.GetPosSide()}], 任务取消");
SServerManager.cancelPutInTask(Name, param.PosInfo.barcode); SServerManager.cancelPutInTask(Name, param.PosInfo.barcode);
...@@ -87,13 +87,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -87,13 +87,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
private void ClearInDoorBuffer() private void ClearInDoorBuffer()
{ {
if(MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("A")) if (MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("A"))
{ {
BufferDataManager.AInStoreInfo = null; BufferDataManager.AInStoreInfo = null;
LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
} }
else if(MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("B")) else if (MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("B"))
{ {
BufferDataManager.BInStoreInfo = null; BufferDataManager.BInStoreInfo = null;
LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
...@@ -111,7 +111,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -111,7 +111,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (InDoorCheck(new InOutParam(BufferDataManager.AInStoreInfo))) if (InDoorCheck(new InOutParam(BufferDataManager.AInStoreInfo)))
{ {
inOutPosInfo= BufferDataManager.AInStoreInfo.ToCopy(); inOutPosInfo = BufferDataManager.AInStoreInfo.ToCopy();
return true; return true;
} }
...@@ -135,7 +135,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -135,7 +135,7 @@ namespace OnlineStore.DeviceLibrary
PullAxisToP1("入库"); PullAxisToP1("入库");
break; break;
case StepEnum.SI_01_PullAxis_Ready: case StepEnum.SI_01_PullAxis_Ready:
SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition); MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition);
if (!IsMoveAxisInSafePos()) if (!IsMoveAxisInSafePos())
{ {
...@@ -188,13 +188,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -188,13 +188,13 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.SI_03_VerifyBufferState: case StepEnum.SI_03_VerifyBufferState:
if(!CheckInputMiddleAxisInBuff()) if (!CheckInputMiddleAxisInBuff())
{ {
MoveInfo.NextMoveStep(StepEnum.SI_04_InOutToBuff); MoveInfo.NextMoveStep(StepEnum.SI_04_InOutToBuff);
LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到暂存区取放点P2[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到暂存区取放点P2[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
XAxis_To_P2(); XAxis_To_P2();
} }
else if(MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
SetWarnMsg($"等待上料机构旋转轴离开{MoveInfo.MoveParam.PosInfo.GetPosSide()}面暂存区超时"); SetWarnMsg($"等待上料机构旋转轴离开{MoveInfo.MoveParam.PosInfo.GetPosSide()}面暂存区超时");
} }
...@@ -252,7 +252,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -252,7 +252,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
break; break;
case StepEnum.SI_08_ToPosition: case StepEnum.SI_08_ToPosition:
if(CamCheckReelPosition()) if (CamCheckReelPosition())
{ {
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()}面]");
...@@ -291,7 +291,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -291,7 +291,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack); MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack);
LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
//入库完成 //入库完成
SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
UpdownAxisTo_P6_P12(); UpdownAxisTo_P6_P12();
break; break;
case StepEnum.SI_15_UpDownBack: case StepEnum.SI_15_UpDownBack:
...@@ -310,11 +310,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -310,11 +310,13 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (!GetShieldState(sheidAColmns[GetPosColumn()]))
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
} }
else else
{ {
LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (!GetShieldState(sheidBColmns[GetPosColumn()]))
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
} }
break; break;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -120,11 +120,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -120,11 +120,13 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (!GetShieldState(sheidAColmns[GetPosColumn()]))
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
} }
else else
{ {
LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (!GetShieldState(sheidBColmns[GetPosColumn()]))
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
} }
break; break;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!