If you are in US, filling I-129 is the way to get

H1b approval notice. If not in America, you need to get visa. Not waiver, you may not get the approval notice, i.e. I-797. However, you said you already have I-797, if you are in America, it will works for you based on that. But, you may have a problem for the next AOS. So, right now, you are not in US. is it right? If so, you need to apply for the visa, that is why I said you need to show you already work in China for two years.