"two different basis...."  States have different laws from Federal. So different tax basis schedules are needed.

Form 7203 is the perfect place to learn about tax basis.

Is your beginning basis correct?

Enter cash distributions made from the Corp.

Enter property contributions made to the Corp.

Enter cash contributions made to the Corp