Refactoring mfg lot material for better mfg support later

--HG--
extra : source : 337bcb02433912ce9c6cf1bdcb1349b95819a93a