Advanced pricing 'basket' Order level discount

Is there a way to combine different 'order reprice groups' into one order level adjustment, similar to a basket. 

for example, I have some items that have order reprice group AA001, and I want those items to create a 10% discount.  Then I have items with an order reprice group of AA002, that today are receiving no special discount.  However, I want to use order reprice groups to generate a freight line.  So I want order reprice group AA001, and AA002, to group together to generate a freight line for the whole order.

Thanks