경로로직
This commit is contained in:
@@ -123,7 +123,7 @@ namespace Project
|
||||
|
||||
switch (target.StationType)
|
||||
{
|
||||
case AGVNavigationCore.Models.StationType.Buffer:
|
||||
case AGVNavigationCore.Models.Station.Buffer:
|
||||
var lastPath = PUB._virtualAGV.CurrentPath.DetailedPath.LastOrDefault();
|
||||
if (lastPath.NodeId.Equals(PUB._virtualAGV.CurrentNode.Id))
|
||||
{
|
||||
@@ -139,19 +139,19 @@ namespace Project
|
||||
PUB.sm.SetNewRunStep(ERunStep.ERROR);
|
||||
}
|
||||
break;
|
||||
case AGVNavigationCore.Models.StationType.Charger:
|
||||
case AGVNavigationCore.Models.Station.Charger:
|
||||
|
||||
break;
|
||||
|
||||
case AGVNavigationCore.Models.StationType.Loader:
|
||||
case AGVNavigationCore.Models.Station.Loder:
|
||||
PUB.XBE.StepMC = Device.eDocStep.ReadyForEnter;
|
||||
break;
|
||||
|
||||
case AGVNavigationCore.Models.StationType.Plating:
|
||||
case AGVNavigationCore.Models.Station.Plating:
|
||||
PUB.XBE.StepMC = Device.eDocStep.ReadyForEnter;
|
||||
break;
|
||||
|
||||
case AGVNavigationCore.Models.StationType.Cleaner:
|
||||
case AGVNavigationCore.Models.Station.Cleaner:
|
||||
PUB.XBE.StepMC = Device.eDocStep.ReadyForEnter;
|
||||
break;
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace Project
|
||||
else if (PUB.sm.RunStepSeq == idx++)
|
||||
{
|
||||
//버퍼 노드 여부 확인
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.StationType.Buffer)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.Station.Buffer)
|
||||
{
|
||||
SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_BUFFERPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 버퍼가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})");
|
||||
return false;
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace Project
|
||||
else if (PUB.sm.RunStepSeq == idx++)
|
||||
{
|
||||
//버퍼 노드 여부 확인
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.StationType.Buffer)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.Station.Buffer)
|
||||
{
|
||||
SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_BUFFERPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 버퍼가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})");
|
||||
return false;
|
||||
|
||||
@@ -38,9 +38,9 @@ namespace Project
|
||||
else if (PUB.sm.RunStepSeq == idx++)
|
||||
{
|
||||
//장비 노드 여부 확인 (버퍼가 아닌 도킹 가능 노드여야 함)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != StationType.Loader &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != StationType.Plating &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != StationType.Cleaner)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != Station.Loder &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != Station.Plating &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != Station.Cleaner)
|
||||
{
|
||||
SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_EQUIPMENTPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 장비 노드가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})");
|
||||
return false;
|
||||
|
||||
@@ -39,9 +39,9 @@ namespace Project
|
||||
else if (PUB.sm.RunStepSeq == idx++)
|
||||
{
|
||||
//장비 노드 여부 확인 (버퍼가 아닌 도킹 가능 노드여야 함)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != StationType.Loader &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != StationType.Plating &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != StationType.Cleaner)
|
||||
if (PUB._virtualAGV.CurrentNode.StationType != Station.Loder &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != Station.Plating &&
|
||||
PUB._virtualAGV.CurrentNode.StationType != Station.Cleaner)
|
||||
{
|
||||
SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_EQUIPMENTPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 장비 노드가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})");
|
||||
return false;
|
||||
|
||||
@@ -319,7 +319,7 @@ namespace Project
|
||||
// 목적지 도착 여부 확인
|
||||
if (PUB.AGV.signal1.mark_sensor == false)
|
||||
{
|
||||
if (PUB._virtualAGV.TargetNode.StationType != StationType.Normal)
|
||||
if (PUB._virtualAGV.TargetNode.StationType != Station.Normal)
|
||||
{
|
||||
PUB.log.AddAT($"목표({PUB._virtualAGV.TargetNode.RfidId})도착되었으나 마크센서가 감지되지 않아 완료처리 하지않습니다");
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user