@things-factory/worksheet-base 5.0.0-alpha.4 → 5.0.0-alpha.40

package/server/graphql/resolvers/worksheet/sorting/sorting-product.ts

@@ -4,9 +4,9 @@ import { EntityManager } from 'typeorm'
 import { SortingWorksheetController } from '../../../../controllers'
 
 export const sortingProductResolver = {
-  async sortingProduct(_: any, { taskNo, releaseGoodNo, productId, sortingQty }, context: any) {
+  async sortingProduct(_: any, { taskNo, releaseGoodNo, productId, sortingQty, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty)
+    await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty, serialNumber)
   }
 }
 
@@ -17,8 +17,9 @@ export async function sortingProduct(
   taskNo: string,
   releaseGoodNo: string,
   productId: string,
-  sortingQty: number
+  sortingQty: number,
+  serialNumber?: string
 ) {
   const worksheetController: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
-  await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty)
+  await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber)
 }

package/server/graphql/resolvers/worksheet/sorting-worksheet.ts

@@ -26,22 +26,26 @@ export const sortingWorksheetResolver = {
     const qb: SelectQueryBuilder<OrderInventory> = getRepository(OrderInventory).createQueryBuilder('OI')
     qb.select('SUM(OI.releaseQty)', 'releaseQty')
       .addSelect('SUM(OI.sortedQty)', 'sortedQty')
+      .addSelect(`string_agg(CONCAT(BIN.name, '(', OI.releaseQty, ')' ), ' ')`, 'binRemarks')
       .addSelect('PROD.id', 'productId')
       .addSelect('PROD.name', 'productName')
       .addSelect('PROD.sku', 'productSku')
       .addSelect('PROD.description', 'productDescription')
+      .addSelect('PROD.isRequireSerialNumberScanningOutbound', 'isRequireSerialNumberScanningOutbound')
       .addSelect('OI.batch_id', 'batchId')
       .addSelect('OI.packing_type', 'packingType')
       .addSelect('OI.packing_size', 'packingSize')
       .addSelect('INV.expiration_date', 'expirationDate')
       .leftJoin('OI.product', 'PROD')
       .leftJoin('OI.inventory', 'INV')
+      .leftJoin('OI.binLocation', 'BIN')
       .where('OI.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood?.id })
       .andWhere('OI.status <> :releaseGoodStatus', { releaseGoodStatus: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT })
       .groupBy('PROD.id')
       .addGroupBy('PROD.name')
       .addGroupBy('PROD.sku')
       .addGroupBy('PROD.description')
+      .addGroupBy('PROD.isRequireSerialNumberScanningOutbound')
       .addGroupBy('INV.expiration_date')
       .addGroupBy('OI.batch_id')
       .addGroupBy('OI.packing_type')
@@ -67,12 +71,14 @@ export const sortingWorksheetResolver = {
           productSku: item?.productSku,
           productName: item?.productName,
           productDescription: item?.productDescription,
+          isRequireSerialNumberScanningOutbound: item?.isRequireSerialNumberScanningOutbound,
           releaseQty: item.releaseQty,
           sortedQty: item.sortedQty,
           status: item.status,
           expirationDate: item?.expirationDate,
           packingType: item?.packingType,
           packingSize: item?.packingSize,
+          binRemarks: item?.binRemarks,
           releaseGood
         }
       })

package/server/graphql/resolvers/worksheet/unloaded-inventories.ts

@@ -1,7 +1,9 @@
+import { getRepository, In } from 'typeorm'
+
 import { ArrivalNotice, Bizplace, ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
-import { getRepository, In } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { WorksheetDetail } from '../../../entities'
 
@@ -46,9 +48,11 @@ export const unloadedInventories = {
       })
       const items = foundInv.map((inv: Inventory) => {
         const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null
+        const manufactureDate: Date = inv.manufactureDate ? new Date(inv.manufactureDate) : null
         return {
           ...inv,
-          expirationDate: expirationDate
+          expirationDate: expirationDate,
+          manufactureDate: manufactureDate
         }
       })
 

package/server/graphql/resolvers/worksheet/unloading/index.ts

@@ -3,14 +3,18 @@ import { completeProductScanUnloadResolver } from './complete-product-scan-unloa
 import { completeUnloadingResolver } from './complete-unloading'
 import { completeUnloadingPartiallyResolver } from './complete-unloading-partially'
 import { scanProductUnloadResolver } from './scan-product-unload'
+import { scanSerialNumberUnloadResolver } from './scan-serial-number-unload'
+import { undoSerialNumberUnloadResolver } from './undo-serial-number-unload'
 import { undoUnloadingResolver } from './undo-unloading'
 import { unloadResolver } from './unload'
 
 export const Mutations = {
   ...activateUnloadingResolver,
   ...scanProductUnloadResolver,
+  ...scanSerialNumberUnloadResolver,
   ...unloadResolver,
   ...undoUnloadingResolver,
+  ...undoSerialNumberUnloadResolver,
   ...completeProductScanUnloadResolver,
   ...completeUnloadingResolver,
   ...completeUnloadingPartiallyResolver

package/server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts

@@ -0,0 +1,26 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import { UnloadingWorksheetController } from '../../../../controllers'
+
+export const scanSerialNumberUnloadResolver = {
+  async scanSerialNumberUnload(_: any, { worksheetDetailName, serialNumber, inventory }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    await scanSerialNumberUnload(tx, domain, user, worksheetDetailName, serialNumber, inventory)
+  }
+}
+
+async function scanSerialNumberUnload(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetDetailName: string,
+  serialNumber: string,
+  inventory: Partial<Inventory>
+): Promise<void> {
+  const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
+  await worksheetController.scanSerialNumberUnload(worksheetDetailName, serialNumber, inventory)
+}

package/server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.ts

@@ -0,0 +1,24 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { UnloadingWorksheetController } from '../../../../controllers'
+
+export const undoSerialNumberUnloadResolver = {
+  async undoSerialNumberUnload(_: any, { worksheetDetailName, inventoryItemId }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    await undoSerialNumberUnload(tx, domain, user, worksheetDetailName, inventoryItemId)
+  }
+}
+
+async function undoSerialNumberUnload(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetDetailName: string,
+  inventoryItemId: string
+): Promise<void> {
+  const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
+  await worksheetController.undoSerialNumberUnload(worksheetDetailName, inventoryItemId)
+}

package/server/graphql/resolvers/worksheet/unloading/unload.ts

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const unloadResolver = {

package/server/graphql/resolvers/worksheet/unloading-worksheet.ts

@@ -59,6 +59,7 @@ export const unloadingWorksheetResolver = {
 
     return {
       worksheetInfo: {
+        arrivalNotice,
         bizplaceName: customerBizplace.name,
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
@@ -90,7 +91,8 @@ export const unloadingWorksheetResolver = {
           actualPackQty: targetProduct.actualPackQty,
           remark: targetProduct.remark,
           issue: productWSD.issue,
-          status: productWSD.status
+          status: productWSD.status,
+          manufactureDate: targetProduct.manufactureDate ? new Date(targetProduct.manufactureDate) : null
         }
       })
     }

package/server/graphql/resolvers/worksheet/worksheets.ts

@@ -99,6 +99,7 @@ export const worksheetsResolver = {
       const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking')
       const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption')
       const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption')
+      const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee')
       if (
         releaseGoodParam ||
         releaseGoodRefNoParam ||
@@ -252,6 +253,31 @@ export const worksheetsResolver = {
         }
       }
 
+      //find assignee
+
+      const assigneeParam = params.filters.find(param => param.name === 'assignee')
+      let assigneeFilter = []
+      if (assigneeParam) {
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'assignee'),
+          1
+        )
+        assigneeFilter.push({ ...assigneeParam, name: 'name' })
+
+        const foundAssignee: User[] = await getRepository(User).find({
+          ...convertListParams({ filters: assigneeFilter })
+        })
+
+        if (foundAssignee) {
+          params.filters.push({
+            name: 'assigneeId',
+            operator: 'in',
+            value: foundAssignee.map((foundIC: User) => foundIC.id),
+            relation: false
+          })
+        }
+      }
+
       ////Set default bizplace filter
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       if (!bizplaceFilter && typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING) {

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts

@@ -1,20 +1,19 @@
-import { Product } from '@things-factory/product-base'
-import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS, ORDER_TYPES } from '@things-factory/sales-base'
-import { Inventory } from '@things-factory/warehouse-base'
+import { EntityManager, getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { ORDER_INVENTORY_STATUS, ORDER_TYPES, OrderInventory, OrderNoGenerator } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
-import { EntityManager, In, getRepository } from 'typeorm'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { WorksheetNoGenerator, inventoriesByStrategy } from '../../../utils'
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { generateBatchPickingWorksheetDetailsResolver } from './generate-batch-picking-worksheet-details'
-import orderBy from 'lodash/orderBy'
+import { inventoriesByStrategy, WorksheetNoGenerator } from '../../../utils'
 
 export const generateBatchPickingWorksheetDetailsByBulkResolver = {
   async generateBatchPickingWorksheetDetailsByBulk(
     _: any,
-    { worksheetId, bizplaceId, selectedItems, pickingStrategy },
+    { worksheetId, bizplaceId, selectedItems },
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -50,7 +49,7 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
       })
 
       await Promise.all(
-        selectedItems.map(async (oi: OrderInventory) => {
+        selectedItems.map(async (oi: OrderInventory & { pickingStrategy: string }) => {
           try {
             let pOrderInventories = tx.getRepository(OrderInventory).find({
               where: {
@@ -72,7 +71,6 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
                 ...oi,
                 worksheetId: worksheet.id,
                 bizplaceId,
-                pickingStrategy,
                 locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false
               },
               domain,

package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts

@@ -20,7 +20,7 @@ import { WorksheetNoGenerator } from '../../../utils'
 export const generatePickingWorksheetDetailsResolver = {
   async generatePickingWorksheetDetails(
     _: any,
-    { bizplaceId, selectedItems, pickingStrategy, worksheetNo, locationSortingRules },
+    { bizplaceId, selectedItems, worksheetNo, locationSortingRules },
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -54,7 +54,6 @@ export const generatePickingWorksheetDetailsResolver = {
         bizplaceId,
         worksheetId,
         selectedItems,
-        pickingStrategy,
         locationSortingRules,
         tx
       )
@@ -162,6 +161,9 @@ function _composeWorksheetDetails(
 
   while (compReleaseQty < record.releaseQty) {
     const inv = inventories[idx]
+
+    if (!inv) break
+
     let releaseQty: number = 0
     let releaseUomValue: number = 0
 

package/server/graphql/types/worksheet/find-release-orders-by-task-no.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const FindReleaseOrdersByTaskNo = gql`
+  type FindReleaseOrdersByTaskNo {
+    taskNo: String
+    releaseGoods: [ReleaseGood]
+  }
+`

package/server/graphql/types/worksheet/index.ts

@@ -22,6 +22,7 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
+import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -164,10 +165,20 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: [String!]!
   ): [Worksheet] @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPacking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   activateBatchPicking (
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPicking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   unload (
     worksheetDetailName: String!
     inventory: InventoryPatch!
@@ -185,6 +196,12 @@ export const Mutation = /* GraphQL */ `
     inventory: InventoryPatch!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  scanSerialNumberUnload (
+    worksheetDetailName: String!
+    serialNumber: String!
+    inventory: InventoryPatch!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   cycleCountAdjustment (
     cycleCountNo: String!
   ): Boolean @transaction
@@ -195,6 +212,11 @@ export const Mutation = /* GraphQL */ `
     inventoryIds: [String]!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  undoSerialNumberUnload (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   completeUnloadingPartially (
     arrivalNoticeNo: String!
     worksheetDetail: [WorksheetDetailPatch!]
@@ -307,22 +329,26 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNo: String!
     productId: String!
     sortingQty: Float!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductSorting (
     taskNo: String!
     releaseGoodNo: String!
     productBarcode: String!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (
     worksheetDetailName: String!
     releaseQty: Int!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPacking (
     worksheetDetailName: String!
     productBarcode: String!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   batchPicking (
@@ -514,7 +540,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   assignPickingWorker (
-    worksheetId: String!
+    worksheetId: [String]!
     userId: String!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -655,16 +681,16 @@ export const Query = /* GraphQL */ `
   ): [Inventory] @privilege(category: "worksheet", privilege: "query")
 
   pickingAssignmentStatusByUsers(
-    bizplaceId: String!
-    name: String
-    email: String
+    filters: [Filter],
+    pagination: Pagination,
+    sortings: [Sorting]
   ): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")
 
   myPickingAssignmentStatus: MyPickingAssignmentStatus @privilege(category: "worksheet", privilege: "query")
   
   recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
 
-  findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
+  findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
 export const Types = /* GraphQL */ [
@@ -691,5 +717,6 @@ export const Types = /* GraphQL */ [
   ProductApproval,
   WorksheetWithPagination,
   PickingAssignmentStatus,
-  MyPickingAssignmentStatus
+  MyPickingAssignmentStatus,
+  FindReleaseOrdersByTaskNo
 ]

package/server/graphql/types/worksheet/picking-assignment-status.ts

@@ -3,7 +3,7 @@ import { gql } from 'apollo-server-koa'
 export const PickingAssignmentStatus = gql`
   type PickingAssignmentStatus {
     user: User
-    pending: [Worksheet]
-    picking: [Worksheet]
+    pending: String
+    picking: String
   }
 `

package/server/graphql/types/worksheet/worksheet-detail-info.ts

@@ -59,5 +59,8 @@ export const WorksheetDetailInfo = gql`
     releaseGood: ReleaseGood
     actualQty: Int
     actualUomValue: Float
+    manufactureDate: String
+    binRemarks: String
+    isRequireSerialNumberScanningOutbound: Boolean
   }
 `

package/server/graphql/types/worksheet/worksheet-info.ts

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const WorksheetInfo = gql`
   type WorksheetInfo {
+    arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
     returnOrder: ReturnOrder
     bizplaceName: String

package/server/graphql/types/worksheet/worksheet-patch.ts

@@ -11,6 +11,7 @@ export const WorksheetPatch = gql`
     initialBatchId: String
     status: String
     truckNo: String
+    transportDriver: ObjectRef
     palletQty: String
     ownCollection: Boolean
     cuFlag: String

package/server/graphql/types/worksheet-detail/index.ts

@@ -41,13 +41,11 @@ export const Mutation = /* GraphQL */ `
     bizplaceId: String
     locationSortingRules: [Sorting]
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
   ): Boolean @transaction
 
   generatePickingWorksheetDetails(
     bizplaceId: String!
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
     worksheetNo: String!
     locationSortingRules: [Sorting]
   ): Boolean @transaction

package/server/index.ts

@@ -5,4 +5,9 @@ export * from './entities'
 export * from './graphql'
 export * from './graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet'
 export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
+export * from './graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet'
+export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
+export * from './graphql/resolvers/worksheet/unloading/activate-unloading'
+export * from './graphql/resolvers/worksheet/picking/activate-picking'
 export * from './migrations'
+export * from './controllers'

package/server/routes.ts

@@ -8,7 +8,10 @@ import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
 import { renderRODO } from './controllers/render-ro-do'
 import { renderSeebuuGRN } from './controllers/render-seebuu-grn'
+import { renderFmGRN } from './controllers/render-fm-grn'
 import { renderInvoices } from './controllers/render-invoices'
+import { renderPO } from './controllers/render-po'
+
 
 process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_document_ro_do/:doNo', async (context, next) => {
@@ -43,6 +46,10 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.body = await renderSeebuuGRN(context.params, context)
   })
 
+  routes.get('/view_fm_grn/:grnNo/:timezoneOffSet', async (context, next) => {
+    context.body = await renderFmGRN(context.params, context)
+  })
+
   routes.get('/view_job_sheet/:ganNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderJobSheet(context.params, context)
   })
@@ -60,4 +67,14 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.type = 'application/json'
     context.body = data
   })
+
+  routes.post('/view_purchase_orders/:timezoneOffSet', async (context, next) => {
+    let req = context.request.body || {}
+    let timezoneOffSet = context.params.timezoneOffSet || 0
+
+    let data = await renderPO({ req, timezoneOffSet }, context)
+
+    context.type = 'application/json'
+    context.body = data
+  })
 })

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
   }