supervisor problems

I started working for this company in Aug of 2005 , In Nov the company hired back a supervisor from before I was with company from what I have been told the new supervisor and my supervisor had problems from before and they kind of over flowed when he returned , The returning supervisor on his first day back told me he was my boss and laid the law down to me I complained to my supervisor and it was handled from upper management I work on 2nd shift and my supervisor is not there I am the lead of our department.
Over the last 4 - 4/12 months there have been problems and my supervisor has done his best to help me. 2 weeks ago we found out our department was being moved out of state. I knew then I would have to change shifts and tonight was my last night on 2nd shift when I got to work there was no work in the department I work in so I had to go work under the returning supervisor all went well until the last 1 1/2 hours of the shift. This supervisor come to me and started complaining about me going outside and having a soda bottle at the machine I was at when I got to the machine there was a soda bottle already there he thought I was out side smoking but I had gone out to get air I got a new med from my doctor that makes my stomach upset. He would not listen to what I had to say he just went on bitching at me with 2 other people standing there hearing and watching this all go on.
the machine I was working on had very good numbers it was not like I was not doing my job.
what are my rights? I feel it was Harassment due to his dislike for me.should I take this to the HR department so it will be on file?