Best way to handle a rework?

Hey all,

Trying to figure out the best way to handle a product rework on serialized inventory. I'll give an example.

We get a product "widget" back from the customer on a return, we then need to take a circuit board out of widget and send it for rework (offsite), the circuit board returns and we rework the product as a "B" stock product (basically a refurb and it would be sold as "widget (B)") and have it for sale.

Currently, The only known way we know how to do this process is to receive the product as an A stock so that we capture the average cost/value of this product, unbuild the product, move that part to an offsite bin, do a rework work order on that component, and then rebuild the product. This has several big issues for me. First, since the widget's don't always come back complete from the customer, it means that we will show inventory for components we don't physically have, so this means I complete one work order to rebuild the widget, consuming inventory