Did Morocco win the war against Western-Sahara?

Yes. There are not much Sahrawi soldiers. The total Sahrawi population is 500,000, while Morocco is more then 38 milllion and probably their population is much bigger.

The ongoing situation is that they just have every year some small clashes.