Transit visa - 6 hour layover

Hi, I am travelling from the UK to Vietnam on a British passport. My passport is valid for over 9 years and I have a letter of acceptance for the Vietnamese entry permit. I have a 6 hour stop over in Shanghai Pudong. My Chinese friend would like to meet me there. Would I be correct in believing that I can get a transit G type entry permit for this short period?