1. During my visit at the Hangzhou plant I’ve seen a warehouse for mid/small purchased items that I’d arrange in a vertical automatic magazine (https://www.kardex-remstar.com/en/storage-retrieval-systems/megamat-vertical-carousels.html ) rather than aisles & shelfs. We have four of those units here in Diemme and we saved a lot of space. I’d also consider to place these systems nearby the assembling area and as closer as possible to the exit gate because you might use them also for spare part inventory.2. You might move the surface treatment area just next to the welding/machining area because anything that goes to the assembling has to be treated first. One solution could be to swap the “Assembling area I” with the surface treatment. Although I don’t know if there are other constrains to consider.