I will be arriving from Canada to Shanghai & have a 15 hour transit.

I arrive mid day and would like to go into the city and have a quick look around and go for dinner etc. Do I need to apply for anything in advance? I did this a number of years ago and was scolded from the immigration counter for not having any documents and had to wait about 4 hours before they would give me the temporary stay permit.