CoreObject getEntity refining

parent 2118af98
...@@ -216,9 +216,11 @@ class CoreObject(Process): ...@@ -216,9 +216,11 @@ class CoreObject(Process):
# perform preemption when required # perform preemption when required
# if the object is not Exit # if the object is not Exit
if activeObject.receiver: if activeObject.receiver:
# if the receiver has an operatorPool # if the receiver has an operatorPool and its operationType is Load
try: try:
if activeObject.receiver.operatorPool: if activeObject.receiver.operatorPool\
and (activeObject.receiver.type=='MachineJobShop'\
or activeObject.receiver.type=='MachineManagedJob'):
# and the operationType list contains Load, the receiver is operated # and the operationType list contains Load, the receiver is operated
if (activeObject.receiver.operatorPool!="None")\ if (activeObject.receiver.operatorPool!="None")\
and any(type=="Load" for type in activeObject.receiver.multOperationTypeList): and any(type=="Load" for type in activeObject.receiver.multOperationTypeList):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment