Projects and WIP jobs

Does anyone know a work around for the issue of WIP jobs being assigned a project/task and upon completion sending an item to inventory where the sublocator is the project/task and then if that item is a component/item is issued for the next wip job assigned to a different project/task credits go to the original project/task losing the costs on the original project/task.  The only work around I know of is to not use the item on the next wip job and make sure all the wip completed items in inventory are on the OM order.  Users either always forget to put the item