Transit visa condition when flying from Thailand to Japan via Shanghai Pudong

I'm a Thai citizen. I'll fly to Japan via Shanghai Pudong airport in May. I'll wait for transit in the Shanghai Pudong airport for 7-8 hours (overnight) and I have to do the baggages claim at the airport because it doesn't redirect to Japan automatically. Do I have to apply for a tourist L type for transiting in Shanghai?