diff --git a/SicRT/Equipments/AutoTransfer.cs b/SicRT/Equipments/AutoTransfer.cs index c85af28d..1af76476 100644 --- a/SicRT/Equipments/AutoTransfer.cs +++ b/SicRT/Equipments/AutoTransfer.cs @@ -1001,19 +1001,11 @@ namespace SicRT.Modules public bool CheckAllJobDone() { - if (_controlJobList.Count == 0) - { - //条件满足状态由AutoRunning切换到AutoIdle状态 - if(_waferRobot.IsAvailable && _waferRobot.NoWafer(0) && _load.IsAvailable && _load.NoWafer(0) && _load.NoTray(0) && - _tmRobot.IsAvailable && _tmRobot.NoWafer(0) && _tmRobot.NoTray(0) && _buffer.NoWafer(0) && _buffer.NoWafer(1) && _buffer.NoWafer(2) && - _pm1.NoWafer(0) && _pm2.NoWafer(0) && _unload.IsAvailable && _unload.NoWafer(0) && _unload.NoTray(0) && - _aligner.IsAvailable && _aligner.NoWafer(0)) - { - return true; - } - } - - if (!_controlJobList.Exists(c => c.State == EnumControlJobState.Executing)) + //条件满足状态由AutoRunning切换到AutoIdle状态 + if (_waferRobot.IsAvailable && _waferRobot.NoWafer(0) && _load.IsAvailable && _load.NoWafer(0) && _load.NoTray(0) && + _tmRobot.IsAvailable && _tmRobot.NoWafer(0) && _tmRobot.NoTray(0) && _buffer.NoWafer(0) && _buffer.NoWafer(1) && _buffer.NoWafer(2) && + _pm1.NoWafer(0) && _pm2.NoWafer(0) && _unload.IsAvailable && _unload.NoWafer(0) && _unload.NoTray(0) && + _aligner.IsAvailable && _aligner.NoWafer(0) && !_controlJobList.Exists(c => c.State == EnumControlJobState.Executing)) { return true; }