Merge branch 'Sic8ToSic6' into 添加C2H4-C3H8可配置

This commit is contained in:
Han Qiang Qiang 2023-11-24 16:41:27 +08:00
commit 6b84ee3de3
2 changed files with 4 additions and 3 deletions

View File

@ -3074,7 +3074,7 @@ namespace SicRT.Modules
{
if (_trayRobot.Place(slotItem.Module, slotItem.Slot, Hand.Blade1))
{
_cassetteBL.WaitTransfer(ModuleName.TrayRobot);
_cassetteBL.WaitTransfer(ModuleName.TrayRobot, false, slotItem.Slot);
return;
}
}
@ -3115,7 +3115,7 @@ namespace SicRT.Modules
{
if (_trayRobot.Pick(slotItem.Module, slotItem.Slot, Hand.Blade1))
{
_cassetteBL.WaitTransfer(ModuleName.TrayRobot);
_cassetteBL.WaitTransfer(ModuleName.TrayRobot, true, slotItem.Slot);
return;
}
}

View File

@ -86,7 +86,8 @@ namespace SicRT.Modules.Schedulers
if (ret)
{
// 当Wafer返回到Cassette时触发警告响蜂鸣器
if (_lastTransferAction == TaskType.Place
if (robot == ModuleName.WaferRobot
&& _lastTransferAction == TaskType.Place
&& WaferManager.Instance.CheckHasWafer(_module, _lastTransferSlot))
{
EV.PostMessage(Module.ToString(), EventEnum.PJ_DONE, _module, (_lastTransferSlot + 1).ToString());