|
|
@@ -54,7 +54,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
Hand.Blade1,Flip.Upper,Flip.Upper);
|
|
|
SchedulerSequence efemRobotSequence = CreateEfemRobotSequence(moveItem, null, sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(efemRobotSequence);
|
|
|
- SchedulerSequence alignerSequence = CreateAlignerSequence(sequenceRecipe, ref index);
|
|
|
+ SchedulerSequence alignerSequence = CreateAlignerSequence(sequenceRecipe,sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(alignerSequence);
|
|
|
MoveItem alignerToMoveItem = new MoveItem(ModuleName.Aligner1, 0, vpw, 0,Hand.Blade1, Flip.Upper, Flip.Upper);
|
|
|
SchedulerSequence alignerRobotSequence = CreateEfemRobotSequence(alignerToMoveItem, null, sequenceRecipe.SubstrateSize, ref index);
|
|
|
@@ -100,7 +100,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
lastToSrdItem.PlaceRobotFlip = Flip.Upper;
|
|
|
SchedulerSequence lastToSrdSequence = CreateEfemRobotSequence(lastToSrdItem, null,sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(lastToSrdSequence);
|
|
|
- SchedulerSequence srdSequence = CreateSRDSequence(srdRecipe, ref index);
|
|
|
+ SchedulerSequence srdSequence = CreateSRDSequence(srdRecipe,sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(srdSequence);
|
|
|
//SRD完成后回至LoadPort
|
|
|
MoveItem srdToLoadPortItem = new MoveItem();
|
|
|
@@ -153,7 +153,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
Hand.Blade1, Flip.Upper, Flip.Upper);
|
|
|
SchedulerSequence efemRobotSequence = CreateEfemRobotSequence(moveItem, null, sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(efemRobotSequence);
|
|
|
- SchedulerSequence alignerSequence = CreateAlignerSequence(sequenceRecipe, ref index);
|
|
|
+ SchedulerSequence alignerSequence = CreateAlignerSequence(sequenceRecipe,sequenceRecipe.SubstrateSize, ref index);
|
|
|
schedulerSequences.Add(alignerSequence);
|
|
|
MoveItem alignerToMoveItem = new MoveItem(ModuleName.Aligner1, 0, vpw, 0, Hand.Blade1, Flip.Upper, Flip.Upper);
|
|
|
SchedulerSequence alignerRobotSequence = CreateEfemRobotSequence(alignerToMoveItem, null, sequenceRecipe.SubstrateSize, ref index);
|
|
|
@@ -360,7 +360,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
/// </summary>
|
|
|
/// <param name="index"></param>
|
|
|
/// <returns></returns>
|
|
|
- private SchedulerSequence CreateAlignerSequence(SequenceRecipe recipe,ref int index)
|
|
|
+ private SchedulerSequence CreateAlignerSequence(SequenceRecipe recipe,int waferSize,ref int index)
|
|
|
{
|
|
|
SchedulerSequence sequence = new SchedulerSequence();
|
|
|
sequence.SchedulerModule = SchedulerManager.Instance.GetScheduler(ModuleName.Aligner1);
|
|
|
@@ -371,7 +371,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
sequence.ModuleType = ModuleType.Aligner;
|
|
|
sequence.Parameters = null;
|
|
|
sequence.MaterialType = MaterialType.Wafer;
|
|
|
- sequence.WaferSize = sequence.WaferSize;
|
|
|
+ sequence.WaferSize = waferSize;
|
|
|
index++;
|
|
|
return sequence;
|
|
|
}
|
|
|
@@ -380,7 +380,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
/// </summary>
|
|
|
/// <param name="index"></param>
|
|
|
/// <returns></returns>
|
|
|
- private SchedulerSequence CreateSRDSequence(SrdRecipe recipe,ref int index)
|
|
|
+ private SchedulerSequence CreateSRDSequence(SrdRecipe recipe,int waferSize,ref int index)
|
|
|
{
|
|
|
SchedulerSequence sequence = new SchedulerSequence();
|
|
|
sequence.SequenceIndex = index;
|
|
|
@@ -388,6 +388,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
sequence.Recipe = recipe;
|
|
|
sequence.ModuleType = ModuleType.SRD;
|
|
|
sequence.MaterialType = MaterialType.Wafer;
|
|
|
+ sequence.WaferSize= waferSize;
|
|
|
index++;
|
|
|
return sequence;
|
|
|
}
|
|
|
@@ -525,7 +526,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
}
|
|
|
foreach (PlatingCellItem subItem in reservoirItem.PlatingCells)
|
|
|
{
|
|
|
- PlatingCellEntity entity = Singleton<RouteManager>.Instance.GetModule<PlatingCellEntity>($"PlatingCell{subItem.PlatingCellID}");
|
|
|
+ PlatingCellEntity entity = Singleton<RouteManager>.Instance.GetModule<PlatingCellEntity>(subItem.ModuleName);
|
|
|
if (!CheckAvaibleModule(entity, ModuleType.PlatingCell, sequenceType))
|
|
|
{
|
|
|
continue;
|
|
|
@@ -534,7 +535,7 @@ namespace PunkHPX8_RT.Schedulers
|
|
|
{
|
|
|
continue;
|
|
|
}
|
|
|
- if (!isEmpty || (isEmpty && entity.WaferInfo == null))
|
|
|
+ if (!isEmpty || (isEmpty && entity.WaferInfo.IsEmpty))
|
|
|
{
|
|
|
metals.Add(entity);
|
|
|
}
|