Fix Issue With Changing Usage Quantities

Previous commit resulted in duplicated code which wiped out catalog and
lotCode when updating usage quantity.

Also updated usage lists to be ordered by catalog number as requested by
client.