@things-factory/worksheet-base 4.1.40 → 4.2.1

package/server/utils/inventory-util.ts

@@ -265,7 +265,9 @@ export async function inventoriesByStrategy(
     .andWhere('"INV"."packing_size" = :packingSize')
     .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
-    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', { locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE] })
+    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', {
+      locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+    })
     .setParameters({
       domainId: domain.id,
       productId,
@@ -289,12 +291,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -303,12 +300,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'DESC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -317,12 +309,16 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."expiration_date"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+        }
+      }
+      break
+
+    case 'FMFO':
+      qb.orderBy('"INV"."manufacture_date"', 'ASC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -338,10 +334,6 @@ export async function inventoriesByStrategy(
           ++locIdx
         }
       } else qb.orderBy('"LOC"."name"', 'DESC')
-      break
-    default:
-      qb.orderBy('"INV"."created_at"', 'ASC')
-
       break
   }