Blanket releases created during Pick Release

We  are currently on Oracle 11.5.10.2. We use Blanket Purchase Agreements for two of our suppliers. In OM we determine the vendor of choice based on the item, but there are some items that are supplied by both vendors. The items for these vendors are consigned and are set up as non-reservable.

When the order is released for picking it appears the blanket release is created at the same time. This is fine until the warehouse is changed on the order. Sales will unschedule the original line, change the warehouse to the appropriate one for shipping, and reschedule the line. If this is done before the order is released there are no issues. However, more often than not, the order has already released for the original warehouse. The result is that we are not getting a release against the warehouse that actually shipped the product.