completed attribute of the route steps, is now a list (setup and process have different fields)

parent 436de630
...@@ -60,7 +60,7 @@ class MergeSteps(plugin.InputPreparationPlugin): ...@@ -60,7 +60,7 @@ class MergeSteps(plugin.InputPreparationPlugin):
technologySequence.pop(-1) technologySequence.pop(-1)
stepToMerge = route[idxToMerge] stepToMerge = route[idxToMerge]
# parts needed # parts needed
step["partsneeded"] = stepToMerge["partsneeded"] step["requiredParts"] = stepToMerge["requiredParts"]
# technology # technology
step["technology"] = technology step["technology"] = technology
# setupTime # setupTime
...@@ -80,6 +80,12 @@ class MergeSteps(plugin.InputPreparationPlugin): ...@@ -80,6 +80,12 @@ class MergeSteps(plugin.InputPreparationPlugin):
step["operator"]["load"] = route[idxToMerge]["operator"]["load"] step["operator"]["load"] = route[idxToMerge]["operator"]["load"]
if tempOperator: if tempOperator:
step["operator"]["processing"] = tempOperator["processing"] step["operator"]["processing"] = tempOperator["processing"]
'''find out if the setup is completed, but no processing is performed yet; in that case the part should be placed in WIP (though the route is not split yet) '''
step["completed"] = [stepToMerge["completed"][0], step["completed"]]
else:
'''make the completed attribute a list '''
step["completed"] = [step["completed"]]
technologySequence.append(technology) technologySequence.append(technology)
# append the (updated) step to the temporary route # append the (updated) step to the temporary route
updatedRoute.append(step) updatedRoute.append(step)
......
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