|
|
|
@@ -646,7 +646,7 @@ open fun getCompletedJobOrderLotsHierarchical(userId: Long): Map<String, Any?> { |
|
|
|
AND (jpo.match_status = 'pending' OR jpo.match_status = 'scanned') |
|
|
|
ORDER BY |
|
|
|
CASE WHEN sol.status = 'rejected' THEN 0 ELSE 1 END, |
|
|
|
COALESCE(w.`order`, 999999) ASC |
|
|
|
COALESCE(w.`order`, 999999) ASC, |
|
|
|
po.code ASC, |
|
|
|
i.code ASC, |
|
|
|
il.expiryDate ASC, |
|
|
|
|