Material Use in Operations/Job Cards

In my current set up I have customised the operations to each have their own WIP warehouse which is then used in the job card for that operation. When manufacturing an item an operation has to be performed on some of the raw materials and then another operation is performed on all of the materials in the BOM, including those that have been used in operation 1, to create the finished product.

The problem that I am facing is that under the current functionality the materials from operation 1 all remain in the WIP warehouse for operation 1 and only the extra materials are transferred over for the job card for operation 2.

Is there a way that materials can be used in multiple operations? Or is there a way that I can easily transfer all of the material from operation 1 to the WIP warehouse for operation 2, so that I can track its location during manufacturing.

Any help would be appreciated!