correction in reading of SubBatches as wip

dream/simulation/Globals.py

@@ -191,6 +191,9 @@ def setWIP(entityList):
     for entity in entityList:
         # if the entity is of type Part
         if entity.type=='Part' or entity.type=='Batch' or entity.type=='SubBatch' or entity.type=='CapacityEntity': 
+            # these entities have to have a currentStation. 
+            # TODO apply a more generic approach so that all need to have
+            if entity.currentStation:   
                 object=entity.currentStation                        #identify the object
                 object.getActiveObjectQueue().append(entity)        #append the entity to its Queue
                 entity.schedule.append([object,G.env.now])              #append the time to schedule so that it can be read in the result
@@ -228,7 +231,7 @@ def setWIP(entityList):
             
             entity.remainingRoute.pop(0)                        # remove data from the remaining route.   
             entity.schedule.append([object,G.env.now])              #append the time to schedule so that it can be read in the result
-            entity.currentStation=object                        # update the current station of the entity 
+
         # if the currentStation of the entity is of type Machine then the entity 
         #     must be processed first and then added to the pendingEntities list
         #     Its hot flag is not raised        

dream/simulation/LineGenerationJSON.py

@@ -1186,9 +1186,9 @@ def createWIP():
                     batch.numberOfUnits+=numberOfUnits
                 else:     #if the parent batch was not found create it
                     batch=Batch(parentBatchId,parentBatchName, numberOfUnits)
-                    G.BatchList.append(B)   
-                    G.WipList.append(B)  
-                    G.EntityList.append(B)               
+                    G.BatchList.append(batch)   
+                    G.WipList.append(batch)  
+                    G.EntityList.append(batch)               
                            
                 SB=SubBatch(id,name, numberOfUnits=numberOfUnits, parentBatch=batch)
                 G.SubBatchList.append(SB)