Do we need transit visa on a 2 stop trip through China from South Korea to Sri Lanka

We are a Norwegian Family, living in South Korea, travelling through PRC later this year on or way to Sri Lanka. On the first trip we will land at PVG on a Friday at 18:20 - then take another flight to KMG where we will leave on Saturday at 14:35. As I understand this will be under the 24 hour limit, so we will hopefully manage through without an entry permit.

On the Return trip we will land at KMG on a Thursday at 07:20 - then another flight to NKG, where we will leave on Friday at 12:20. This seems to be well over a 24 hour limit, so if I have understood this correctly, we will then need a transit type for this trip. Could anyone confirm this?