Could you please review material BOM in each shop order before ask us to add it by manually.
It will help us to reduce time and we can support JOHNAN in time.
For 3M site, I will discuss with PE team to review BOM to solve about manual adding for support JOHNAN reporting.