Are you sure it wasn’t another show with Simon Oakland or some other? I don’t remember such an episode. Wait, maybe one of the two full-length Kolchack movies? None there I recall.
You’re right. It might have been Baa Baa Black Sheep. I’m always getting Robert Conrad and Ruth McDevitt confused.
But then how can a marine fighter wing in the Solomons during WW2 take the weekend off to build a barn?