Issue #24002:fix uom conversions for supply orders