Different shipping for products with different suppliers

[MeganStyle]

Hi,
In our store we have both products that are stored in our warehouse and products from dropshipping from another store that are stored in their warehouse. If a client buys their product we will just send them the order and they will ship it to the customer.
The problem right now is that if the client has in his cart both our products and their products we have to add another shipping cost, because there will be 2 separate packages - one sent from us and second sent from their storage. 
It would also be nice to group the products with storage label in the cart so the client can clearly see that some product are sent from different storage.

Do you have any suggestions which module could meet these requirements?
Thanks in advance