MYSQL Conditional Order By with Union

I have a table that has BayNumber, ShelfNumber and ShelfPosition.  When the BayNumber is odd it needs to sort that grouping one way, when the BayNumber is even it needs to sort that grouping another way.

I have tried to accomplish this by using a UNION ALL and having one query return all the EVEN rows and another all the ODD, sorting them correctly in each individual SELECT statement.  I have confirmed that each SELECT is working as intended.

When I mash the two together and attempt to do a GLOBAL order by the BayNumber it does the global but the individual query order is not maintained.  Here is the gist of the query to help.

I have tried some CASE statements in the global order but that isn't respecting the order of the individual.

It should return the following when correct

Bay | Shelf | Position
1 | A | 2
1 | A | 4
2 | A | 15
2 | A | 2

The Bay number needs to drive the Position order.

Hopefully that makes sense to all you experts, I am by far not a SQL expert and this one has me stumped.

(SELECT *, MOD(BayNumber,2) as EvenOdd
FROM orderdetails a
WHERE a.prodtype != 'P'
GROUP BY detailsId, detailproductid, detailoption1 
HAVING EvenOdd=0
ORDER BY BayNumber, ShelfNumber, ShelfPosition ASC
)
 
 
UNION ALL
 
(SELECT *, MOD(BayNumber,2) as EvenOdd
FROM orderdetails a
WHERE a.prodtype != 'P'
GROUP BY detailsId, detailproductid, detailoption1 
HAVING EvenOdd=1
ORDER BY BayNumber, ShelfNumber, ShelfPosition DESC
)
 
ORDER BY BayNumber

Select allOpen in new window