For job satisfaction, please see Lambert, Qureshi et al. as attached below.
For OCB, there are multiple measures. You could use a global measure, or use the various components. My dissertation is based on OCBs in the police and I have examined most dimensions of OCB used in the literature. You can have a look at the attached copy of dissertation for measures I used.
Thesis A Study of Organizational Citizenship Behaviors (OCB) and it...
Article The Effects of Perceptions of Organizational Structure on Jo...