Merge pull request #16392 from nabinhait/mr_against_so

fix: Make material request from SO and raw material's rate as per UOM in BOM