Rogue Device Discovery

We are making a big push to get all of our devices into JAMF and finally have purchasing controls in place but we would estimate about 30% of our devices are not in DEP/ASM and not in our JAMF. Does anyone know of a good way to do a network scan that would actually give you good device discovery and or detail about Apple Devices that are your network ?  We have tried some we have for our Windows MDM but it seems to think everything is an Ipod so that's not very helpful when hunting down the devices.