BAQ or Report to See Total Scrap / Rework Cost against all Jobs

Im trying to create a BAQ that can report all of our scrap and rework cost against a site to compare with our turnover to see how much its costing us for KPIs. Im struggling to get and accurate measure however. We changed the label for added material on the JobMtl table so the guys could mark that to indicate new material added to a job to complete reworks with as well as training all the guys on the floor on how to clock through rework and scrap quantities.Ive also look at a BAQ linking the PartTran table to the DME head table but almost all of the DMRs appear not to have any cost (which I assumed would have come from the job?). Do any of you lovely people happen to have something that might be able to help me sort something out for the higher ups to look at?