No, there's no indication that Han knew or expected the outcome he got, let alone that he was intending to help Kylo Ren do it. Han confronted Kylo because that's what Leia asked him to do:
go out and bring their son back.
I'm sure Han knew he was talking a risk, but he seemed to genuinely believe he could turn Kylo away from the Dark Side, or at the very least, stall his progress and get him to reconsider his actions.
For Kylo's part, his conflict and the ultimate obligation he felt to go through with
killing his father
were laid out in a number of earlier scenes, including the initial exchange with Snoke when Kylo first learns that Han Solo is back in the picture, and later Kylo's monlogue with the Vader mask. Kylo is feeling conflicted over his decision to turn to the Dark -- not because he regrets it or wants to change it, but because he can't seem to get rid of the nagging "tug" pulling him back to the Light. He sincerely wants to obey Snoke and do what he feels is the "right" thing, but there's a small part of him that keeps telling him to repent.
When Kylo and Han face off, that conflict is brought up to the surface. Kylo now seems to recognize that
his father's presence in his life
is one of the key things holding him back from fully committing to the Dark Side, and he wants to eliminate that obstacle. The struggle on the bridge was, seemingly, the last ditch effort by his Light side to pull him back from the brink, which obviously didn't work.