How to add tax invoice cum bill of supply in gstr1.

I have sold goods to party which include both taxable and tax free goods. I have issued B2B invoice against this supply. Please tell me how to enter this bill in GSTR1? There are two scenario:

Total Bill value= 3,49,350/-

@ 12%= 57,679 IGST= 6921.48

@ Exempt= 2,84,377.50

Scenario (1)  I put taxable supply in B2B Invoice (4A, 4B, 4C, 6B, 6C - B2B Invoices) and Exempt in Exempt Supply made to registered person (8A, 8B, 8C, 8D - Nil Rated Supplies).

Scenario (2) Image attached.

Please tell which way is correct. TIA