@things-factory/warehouse-base 5.0.14 → 6.0.0-alpha.0

package/server/service/inventory/inventory-query.ts

@@ -1,69 +1,64 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  Directive,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root,
-} from 'type-graphql';
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import {
   Brackets,
   EntityManager,
   Equal,
   getRepository,
   Not,
+  OrderByCondition,
   Repository,
-  SelectQueryBuilder,
-} from 'typeorm';
+  SelectQueryBuilder
+} from 'typeorm'
 
-import { User } from '@things-factory/auth-base';
-import {
-  Bizplace,
-  getPartnersCompanyBizplaces,
-  getPermittedBizplaceIds,
-} from '@things-factory/biz-base';
-import {
-  Product,
-  ProductBundleSetting,
-  ProductDetail,
-} from '@things-factory/product-base';
-import { Setting } from '@things-factory/setting-base';
-import {
-  buildQuery,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting,
-} from '@things-factory/shell';
-
-import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants';
-import { InventoryChange } from '../inventory-change/inventory-change';
-import { Inventory } from './inventory';
-import { InventoryBundleGroupDetail, InventoryList } from './inventory-types';
+import { User } from '@things-factory/auth-base'
+import { Bizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { logger } from '@things-factory/env'
+import { Product, ProductBundleSetting } from '@things-factory/product-base'
+import { Setting } from '@things-factory/setting-base'
+import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+
+import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
+import { InventoryChange } from '../inventory-change/inventory-change'
+import { Inventory } from './inventory'
+import { InventoryBundleGroupDetail, InventoryList } from './inventory-types'
 
 @Resolver(Inventory)
 export class InventoryQuery {
+  /**
+   * Combined single query resolver to perform extraction of data with or without pagination
+   * @param context
+   * @param filters
+   * @param pagination
+   * @param sortings
+   * @param locationSortingRules
+   * @param exportItem
+   * @returns
+   */
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryList)
   async inventories(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
-    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
+    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[],
+    @Arg('exportItem', type => Boolean, { nullable: true }) exportItem?: Boolean
   ): Promise<InventoryList> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
+    const { page, limit } = pagination || {}
 
     try {
-      const productFilters = filters.find(x => x.name == 'product_info')
-      filters = filters.filter(x => x.name != 'product_info')
+      //Define special filters
+      const productFilters = filters.find((filter: any) => filter.name == 'productInfo')
+      const remainOnlyParam = filters.find((filter: any) => filter.name == 'remainOnly')
+      const bizplace = filters.find((filter: any) => filter.name === 'bizplace')
+
+      filters = filters.filter(x => ['productInfo', 'remainOnly'].indexOf(x.name) < 0)
+
       const params = { filters, pagination }
 
-      if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
+      if (!bizplace) {
         params.filters.push({
           name: 'bizplace',
           operator: 'in',
@@ -72,56 +67,49 @@ export class InventoryQuery {
         })
       }
 
-      const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-      )
-
-      let remainOnly: boolean = false
-      if (typeof remainOnlyParam?.value !== 'undefined') {
-        remainOnly = remainOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly'
-        )
-      }
-
-      const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-      )
-
-      let unlockOnly: boolean = false
-      if (typeof unlockOnlyParam?.value !== 'undefined') {
-        unlockOnly = unlockOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly'
-        )
-      }
+      const remainOnly: boolean = remainOnlyParam?.value || false
 
-      const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
+      // Define Query data
+      const qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('inventory')
       buildQuery(qb, params, context, {
         searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId']
       })
 
-      qb.leftJoinAndSelect('iv.bizplace', 'bizplace')
-        .leftJoinAndSelect('iv.product', 'product')
-        .leftJoinAndSelect('iv.warehouse', 'warehouse')
-        .leftJoinAndSelect('iv.location', 'location')
-        .leftJoin('iv.inventoryItems', 'ivi')
-        .loadRelationCountAndMap('iv.inventoryItemCount', 'iv.inventoryItems', 'ivic', qb =>
-          qb.andWhere('ivic.status = :ivicStatus', {
-            ivicStatus: INVENTORY_STATUS.STORED
-          })
+      qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
+        .leftJoinAndSelect('inventory.product', 'product')
+        .leftJoinAndSelect('product.productDetails', 'productDetail', 'productDetail.id = inventory.product_detail_id')
+        .leftJoinAndSelect('inventory.warehouse', 'warehouse')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('inventory.creator', 'creator')
+        .leftJoinAndSelect('inventory.updater', 'updater')
+
+        // To get aggregated serial number in csv and total number of stored serial number
+        .leftJoinAndSelect(
+          subQuery => {
+            return subQuery
+              .select('inventoryItems.inventory_id', 'inventory_item_inventory_id')
+              .addSelect(
+                `SUM(case when "inventoryItems"."status" = 'STORED' then 1 else 0 end)`,
+                'inventory_item_count'
+              )
+              .addSelect(`string_agg(inventoryItems.serial_number, ', ')`, 'serial_numbers')
+              .from('inventory_items', 'inventoryItems')
+              .where(`inventoryItems.domain_id = :domainId`, { domainId: domain.id })
+              .andWhere(`inventoryItems.status = :ivicStatus`, { ivicStatus: INVENTORY_STATUS.STORED })
+              .groupBy('inventoryItems.inventory_id')
+          },
+          'inventoryItems',
+          '"inventoryItems"."inventory_item_inventory_id" = "inventory"."id"'
         )
 
+      // To get inventory with remaining qty
       if (remainOnly) {
-        qb.andWhere('iv.qty > 0')
-          .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-          .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
-      }
-
-      if (unlockOnly) {
-        qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0')
+        qb.andWhere('inventory.qty > 0')
+          .andWhere('CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END >= 0')
+          .andWhere('inventory.qty - CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END > 0')
       }
 
+      // Filter based on multiple product parameters and allow to search in csv format
       if (productFilters) {
         let productFilterValue = `%${productFilters.value.toLowerCase()}%`
         qb.andWhere(qb => {
@@ -129,7 +117,7 @@ export class InventoryQuery {
             .subQuery()
             .select()
             .from(Product, `products`)
-            .where(`products.id = iv.product_id`)
+            .where(`products.id = Inventory.product_id`) // @chrislim Does the uppercase I in Inventory affect? I can see the rest are in lowercase i
             .andWhere(
               new Brackets(qb => {
                 qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
@@ -143,12 +131,13 @@ export class InventoryQuery {
         })
       }
 
+      // Apply sorting based on child data
       if (sortings?.length !== 0) {
         const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
-        const sort = (sortings || []).reduce(
+        const sort: OrderByCondition = (sortings || []).reduce(
           (acc, sort) => ({
             ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
+            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'inventory.' + sort.name]: sort.desc
               ? 'DESC'
               : 'ASC'
           }),
@@ -158,53 +147,38 @@ export class InventoryQuery {
       }
 
       if (locationSortingRules?.length > 0) {
-        locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
+        locationSortingRules.forEach(rule => {
           qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       }
 
-      let [items, total] = await qb.getManyAndCount()
-      items = await Promise.all(
-        items.map(async (item: Inventory) => {
-          let [productDetails, inventoryItems] = await Promise.all([
-            getRepository(ProductDetail).find({
-              where: {
-                product: item.product.id,
-                packingType: item.packingType,
-                packingSize: item.packingSize
-              }
-            }),
-            tx.query(
-              `
-              SELECT string_agg(ii.serial_number, ', ') AS "serialNumbers"
-              FROM inventory_items ii
-              WHERE ii.inventory_id = $1
-              GROUP BY ii.inventory_id 
-            `,
-              [item.id]
-            )
-          ])
+      // Fetch all row for exporting
+      if (exportItem != true && page && limit) {
+        qb.offset((page - 1) * limit).limit(limit)
+      }
 
-          item.product['productDetails'] = productDetails
-          return {
-            ...item,
-            remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0),
-            remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0),
-            serialNumbers: inventoryItems[0]?.serialNumbers
-          }
-        })
-      )
+      let items = (await qb.getRawMany()).map(item => {
+        return {
+          ...new Inventory(item),
+          serialNumbers: item.serial_numbers
+        }
+      })
+      let total = await qb.getCount()
 
-      return { items, total }
+      return {
+        items,
+        total
+      }
     } catch (error) {
+      logger.error(`inventory-query[inventories]: ${error}`)
       throw error
     }
   }
 
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Query(returns => Inventory)
-  async inventory(@Arg('palletId') palletId: string, @Ctx() context: any): Promise<Inventory> {
-    const { domain }: { domain: Domain } = context.state
+  async inventory(@Arg('palletId') palletId: string, @Ctx() context: ResolverContext): Promise<Inventory> {
+    const { domain } = context.state
 
     return await getRepository(Inventory).findOne({
       where: { domain: domain, palletId },
@@ -214,11 +188,11 @@ export class InventoryQuery {
 
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Query(returns => Inventory)
-  async inventoryByPallet(@Arg('palletId') palletId: string, @Ctx() context: any): Promise<Inventory> {
-    const { domain }: { domain: Domain } = context.state
+  async inventoryByPallet(@Arg('palletId') palletId: string, @Ctx() context: ResolverContext): Promise<Inventory> {
+    const { domain } = context.state
 
     return await getRepository(Inventory).findOne({
-      where: { domain, palletId, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) },
+      where: { domain: { id: domain.id }, palletId, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) },
       relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater']
     })
   }
@@ -226,9 +200,9 @@ export class InventoryQuery {
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryList)
-  async inventoriesByProduct(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryList> {
+  async inventoriesByProduct(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<InventoryList> {
     try {
-      const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+      const { domain, user, tx } = context.state
       let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
       const partnersCompanyBizplaces: Bizplace[] = await getPartnersCompanyBizplaces(domain, user)
 
@@ -237,10 +211,13 @@ export class InventoryQuery {
 
       let bizplaceFilter = params.filters.find(filter => filter.name == 'bizplace')
       let productFilter = params.filters.find(filter => filter.name == 'product')
-      let productTypeFilter = params.filters.find(filter => filter.name == 'type')
+      let packingTypeFilter = params.filters.find(filter => filter.name == 'packingType')
       let availableStockFilter = params.filters.find(filter => filter.name == 'availableStock')
       let lowStockFilter = params.filters.find(filter => filter.name == 'lowStock')
       let overStockFilter = params.filters.find(filter => filter.name == 'overStock')
+      let quarantineStockFilter = params.filters.find(filter => filter.name == 'quarantineStock')
+      let reserveStockFilter = params.filters.find(filter => filter.name == 'reserveStock')
+      let productTypeFilter = params.filters.find(filter => filter.name == 'type')
 
       if (bizplaceFilter) {
         const bizplaceQueryBuilder: SelectQueryBuilder<Bizplace> = getRepository(Bizplace).createQueryBuilder('b')
@@ -304,31 +281,111 @@ export class InventoryQuery {
         )`
       }
 
+      let qtyStockQuery = ''
+
       let availableStockQuery = ''
+
+      if (reserveStockFilter?.value) {
+        qtyStockQuery += `\nAND SUM("reserveQty") > 0`
+      }
+
+      if (quarantineStockFilter?.value) {
+        qtyStockQuery += `\nAND SUM("quarantineQty") > 0`
+      }
+
+      if (availableStockFilter?.value) {
+        qtyStockQuery += ` AND SUM("availableQty") > 0`
+      }
+
       if (availableStockFilter?.value) {
         availableStockQuery = ` AND SUM("Inventory"."qty") > 0`
       }
 
-      let thresholdQuery = ''
-      if (lowStockFilter?.value) {
-        thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) > SUM("Inventory"."qty")`
+      if (availableStockFilter?.value && quarantineStockFilter?.value) {
+        qtyStockQuery = ''
+        qtyStockQuery += `\nAND (SUM("availableQty") > 0 \n OR SUM("quarantineQty") > 0)`
       }
 
-      if (overStockFilter?.value) {
-        thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0)  > 0 AND 
-          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0)  < SUM("Inventory"."qty")`
+      if (availableStockFilter?.value && reserveStockFilter?.value) {
+        qtyStockQuery = ''
+        qtyStockQuery += `\nAND (SUM("availableQty") > 0 \n OR SUM("reserveQty") > 0)`
+      }
+
+      if (quarantineStockFilter?.value && reserveStockFilter?.value) {
+        qtyStockQuery = ''
+        qtyStockQuery += `\nAND (SUM("quarantineQty") > 0 \n OR SUM("reserveQty") > 0)`
+      }
+
+      let inventoryQuery = ''
+      if (packingTypeFilter) {
+        let packingTypeValue = packingTypeFilter.value
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+
+        inventoryQuery =
+          inventoryQuery +
+          ` AND (
+          Lower("Inventory"."packing_type") LIKE ANY(ARRAY[${packingTypeValue}])
+        )`
+      }
+
+      let thresholdQuery = ''
+      if (lowStockFilter?.value && overStockFilter?.value) {
+        throw new Error('invalid filter combination')
+      } else if (lowStockFilter?.value && !overStockFilter?.value) {
+        thresholdQuery = `AND SUM(COALESCE("minQty", 0)) > SUM("availableQty")`
+      } else if (!lowStockFilter?.value && overStockFilter?.value) {
+        thresholdQuery = `AND SUM(COALESCE("maxQty", 0)) > 0 AND SUM(COALESCE("maxQty", 0)) < SUM("availableQty")`
       }
 
+      await tx.query(
+        `
+        CREATE TEMP TABLE order_inventories_by_products AS (
+          SELECT "product_id", "packing_type", sum("release_qty") AS "total_release_qty" FROM order_inventories oi 
+          WHERE "type" = 'RELEASE_OF_GOODS'
+          AND "domain_id" = $1
+          AND "inventory_id" ISNULL
+          AND "status" IN ('PENDING','PENDING_RECEIVE','PENDING_WORKSHEET','READY_TO_PICK'/*, 'PENDING_SPLIT' kiv sebab kalau pending split, ada yang dah assign tapi belum delete*/)
+          GROUP BY "product_id", "packing_type"
+        )`,
+        [domain.id]
+      )
+
       await tx.query(
         `
         create temp table temp_inv_history AS 
         (
           SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description", 
+          "Inventory"."packing_type" AS "packingType",
           "Product"."weight" AS "weight", "ProductRef"."id" AS "productRefId", 
           "ProductRef"."description" AS "productRefDesciption", "Bizplace"."id" AS "bizplaceId", "Bizplace"."name" AS "bizplaceName", SUM("Inventory"."qty") AS "qty" ,
           CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
           COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) AS "minQty", 
-          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) AS "maxQty"
+          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) AS "maxQty",
+          CASE WHEN "Location"."type" NOT IN ('${LOCATION_TYPE.QUARANTINE}','${LOCATION_TYPE.RESERVE}') 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "availableQty",
+          SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0)) AS "releaseQty",
+          CASE WHEN "Location"."type" = '${LOCATION_TYPE.QUARANTINE}' 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "quarantineQty",
+          CASE WHEN "Location"."type" = '${LOCATION_TYPE.RESERVE}' 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "reserveQty",
+          CASE WHEN "Location"."type" = '${LOCATION_TYPE.BIN}' THEN SUM("Inventory"."qty") ELSE 0 END AS "binQty"
           FROM "inventories" "Inventory" 
           LEFT JOIN "products" "Product" ON "Product"."id"="Inventory"."product_id" 
           LEFT JOIN "product_details" "ProductDetails" ON "ProductDetails"."product_id" = "Product"."id" 
@@ -337,31 +394,53 @@ export class InventoryQuery {
             AND "ProductDetailBizplaceSetting"."domain_id" = "Inventory"."domain_id"
           LEFT JOIN "products" "ProductRef" ON "ProductRef"."id"="Product"."product_ref_id" 
           INNER JOIN "bizplaces" "Bizplace" ON "Bizplace"."id"="Inventory"."bizplace_id"
+          INNER JOIN "locations" "Location" ON "Location"."id" = "Inventory"."location_id"
+          LEFT JOIN "order_inventories_by_products" "OrderInventoriesByProduct" 
+          ON "OrderInventoriesByProduct"."product_id" = "Inventory"."product_id"
+          AND "OrderInventoriesByProduct"."packing_type" = "Inventory"."packing_type"
           WHERE "Inventory"."qty" >= 0
           AND "Inventory"."status" <> 'MISSING'
           AND "Inventory"."domain_id" = $1
           ${bizplaceQuery}
           ${productQuery}
-          GROUP BY "Product"."id", "ProductRef"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id"
+          GROUP BY "Product"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id", "Inventory"."packing_type", "Location"."type", "ProductRef"."id"
           HAVING 1 = 1
           ${availableStockQuery}
-          ${thresholdQuery}
         )`,
         [domain.id]
       )
 
+      await tx.query(
+        `
+          CREATE TEMP TABLE grouped_inventories_product AS (
+            SELECT "id", "sku", "brand", "name", "description",
+             "packingType", "bizplaceId", "bizplaceName", sum("averageUnitCost") AS "averageUnitCost",
+		              sum("minQty") AS "minQty", sum("maxQty") AS "maxQty", 
+		              sum("availableQty") AS "availableQty", 
+		              sum("quarantineQty") AS "quarantineQty",
+		              sum("reserveQty") AS "reserveQty", 
+		              sum("releaseQty") AS "releaseQty",
+		              sum("availableQty" + "quarantineQty"  + "releaseQty" +  "reserveQty" - "binQty") AS "warehouseQty" 
+	            FROM temp_inv_history
+	            GROUP BY "id", "sku", "brand", "name", "description", "packingType", "bizplaceId", "bizplaceName"
+	            HAVING 1=1  
+            ${qtyStockQuery}
+            ${thresholdQuery}
+          )
+        `
+      )
       const results: any = await tx.query(
         `
-          SELECT * FROM temp_inv_history
-          ORDER BY "bizplaceName", "sku" 
+          SELECT * FROM grouped_inventories_product
+          ORDER BY "bizplaceName", "sku"
           OFFSET $1 LIMIT $2
         `,
         [(page - 1) * limit, limit]
       )
 
-      const total: any = await tx.query(`SELECT COUNT(*) FROM temp_inv_history`)
+      const total: any = await tx.query(`SELECT COUNT(*) FROM grouped_inventories_product`)
 
-      tx.query(`drop table temp_inv_history`)
+      await tx.query(`drop table temp_inv_history, order_inventories_by_products, grouped_inventories_product`)
 
       return {
         items: results.map((item: any) => {
@@ -372,15 +451,20 @@ export class InventoryQuery {
               sku: item.sku,
               brand: item.brand,
               description: item.description,
-              type: item.type,
-              weight: item.weight,
-              productRefId: item.productRefId,
-              bizplaceId: item.bizplaceId,
               minQty: item.minQty,
               maxQty: item.maxQty
             },
+            bizplace: {
+              id: item.bizplaceId,
+              name: item.bizplaceName
+            },
+            packingType: item.packingType,
             averageUnitCost: item.averageUnitCost,
-            qty: item.qty
+            availableQty: item.availableQty,
+            releaseQty: item.releaseQty,
+            quarantineQty: item.quarantineQty,
+            reserveQty: item.reserveQty,
+            warehouseQty: item.warehouseQty
           }
         }),
         total: total[0].count
@@ -393,7 +477,7 @@ export class InventoryQuery {
   @Directive('@transaction')
   @Query(returns => InventoryList)
   async inventoriesByStrategy(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('worksheetId') worksheetId: string,
     @Arg('batchId') batchId: string,
     @Arg('productName') productName: string,
@@ -405,10 +489,10 @@ export class InventoryQuery {
     @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[],
     @Arg('bizplaceId', { nullable: true }) bizplaceId?: string
   ): Promise<InventoryList> {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { domain, tx } = context.state
 
     const inventoryAssignmentSetting: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-inventory-assignment' }
+      where: { domain: { id: domain.id }, name: 'rule-for-inventory-assignment' }
     })
 
     if (!locationSortingRules && inventoryAssignmentSetting) {
@@ -441,17 +525,17 @@ export class InventoryQuery {
   async checkProductIdenticality(
     @Arg('palletA') palletA: string,
     @Arg('palletB') palletB: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Boolean> {
-    const { tx }: { tx: EntityManager } = context.state
+    const { tx } = context.state
     const invRepo: Repository<Inventory> = tx.getRepository(Inventory)
     const invA: Inventory = await invRepo.findOne({
-      where: { domain: context.state.domain, palletId: palletA, status: INVENTORY_STATUS.STORED },
+      where: { domain: { id: context.state.domain.id }, palletId: palletA, status: INVENTORY_STATUS.STORED },
       relations: ['product']
     })
 
     const invB: Inventory = await invRepo.findOne({
-      where: { domain: context.state.domain, palletId: palletB, status: INVENTORY_STATUS.STORED },
+      where: { domain: { id: context.state.domain.id }, palletId: palletB, status: INVENTORY_STATUS.STORED },
       relations: ['product']
     })
 
@@ -467,11 +551,16 @@ export class InventoryQuery {
     @Arg('cartonA') cartonA: string,
     @Arg('palletA') palletA: string,
     @Arg('cartonB') cartonB: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ) {
     const invRepo: Repository<Inventory> = getRepository(Inventory)
     const invA: Inventory = await invRepo.findOne({
-      where: { domain: context.state.domain, palletId: palletA, cartonId: cartonA, status: INVENTORY_STATUS.STORED },
+      where: {
+        domain: { id: context.state.domain.id },
+        palletId: palletA,
+        cartonId: cartonA,
+        status: INVENTORY_STATUS.STORED
+      },
       relations: ['product']
     })
 
@@ -499,13 +588,13 @@ export class InventoryQuery {
   async checkInventoryOwner(
     @Arg('palletId') palletId: string,
     @Arg('bizplaceName') bizplaceName: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Boolean> {
     const invRepo: Repository<Inventory> = getRepository(Inventory)
     const bizRepo: Repository<Bizplace> = getRepository(Bizplace)
 
     const inventory: Inventory = await invRepo.findOne({
-      where: { domain: context.state.domain, palletId, status: INVENTORY_STATUS.STORED },
+      where: { domain: { id: context.state.domain.id }, palletId, status: INVENTORY_STATUS.STORED },
       relations: ['bizplace']
     })
 
@@ -523,12 +612,12 @@ export class InventoryQuery {
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Query(returns => InventoryBundleGroupDetail)
   async inventoriesByBundle(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
     @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
     @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[]
   ): Promise<InventoryBundleGroupDetail> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+    const { domain, user } = context.state
 
     const params = { filters, pagination }
 
@@ -551,7 +640,7 @@ export class InventoryQuery {
       })
     }
 
-    const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
+    const remainOnlyParam = params?.filters?.find(
       (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
     )
 
@@ -563,7 +652,7 @@ export class InventoryQuery {
       )
     }
 
-    const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
+    const unlockOnlyParam = params?.filters?.find(
       (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
     )
 
@@ -687,151 +776,12 @@ export class InventoryQuery {
     return { bundleGroup, bundleSetting }
   }
 
-  @Directive('@privilege(category: "inventory", privilege: "query")')
-  @Query(returns => InventoryList)
-  async inventoriesForExport(
-    @Ctx() context: any,
-    @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
-    @Arg('pagination', type => Pagination, { nullable: true }) pagination?: Pagination,
-    @Arg('sortings', type => [Sorting], { nullable: true }) sortings?: Sorting[],
-    @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[]
-  ): Promise<InventoryList> {
-    const { domain, user } = context.state
-    const { page, limit } = pagination
-
-    try {
-      const productFilters = filters.find(x => x.name == 'product_info')
-      filters = filters.filter(x => x.name != 'product_info')
-      const params = { filters, pagination }
-
-      if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-        throw new Error('Please select a customer for export.')
-      }
-
-      const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-      )
-
-      let remainOnly: boolean = false
-      if (typeof remainOnlyParam?.value !== 'undefined') {
-        remainOnly = remainOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly'
-        )
-      }
-
-      const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-        (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-      )
-
-      let unlockOnly: boolean = false
-      if (typeof unlockOnlyParam?.value !== 'undefined') {
-        unlockOnly = unlockOnlyParam.value
-        params.filters = params.filters.filter(
-          (f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly'
-        )
-      }
-
-      const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('Inventory')
-      buildQuery(qb, params, context)
-
-      qb.leftJoinAndSelect('Inventory.bizplace', 'Bizplace')
-        .leftJoinAndSelect('Inventory.product', 'Product')
-        .leftJoinAndSelect('Inventory.warehouse', 'Warehouse')
-        .leftJoinAndSelect('Inventory.location', 'Location')
-        .leftJoinAndSelect('Inventory.creator', 'Creator')
-        .leftJoinAndSelect('Inventory.updater', 'Updater')
-        .leftJoinAndSelect(
-          subQuery => {
-            return subQuery
-              .select('ii.inventory_id', 'inventory_id')
-              .addSelect(`string_agg(ii.serial_number, ', ')`, 'serial_numbers')
-              .from('inventory_items', 'ii')
-              .where(`ii.domain_id = :domainId`, { domainId: domain.id })
-              .groupBy('ii.inventory_id')
-          },
-          'ii2',
-          'ii2.inventory_id = Inventory.id'
-        )
-
-      if (remainOnly) {
-        qb.andWhere('Inventory.qty > 0')
-          .andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END >= 0')
-          .andWhere('Inventory.qty - CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END > 0')
-      }
-
-      if (unlockOnly) {
-        qb.andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END = 0')
-      }
-
-      if (productFilters) {
-        let productFilterValue = `%${productFilters.value.toLowerCase()}%`
-        qb.andWhere(qb => {
-          const subQuery = qb
-            .subQuery()
-            .select()
-            .from(Product, `products`)
-            .where(`products.id = Inventory.product_id`)
-            .andWhere(
-              new Brackets(qb => {
-                qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
-                  .orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue })
-              })
-            )
-            .getQuery()
-          return `EXISTS ${subQuery}`
-        })
-      }
-
-      if (sortings?.length !== 0) {
-        const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
-        const sort = (sortings || []).reduce(
-          (acc, sort) => ({
-            ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'Inventory.' + sort.name]: sort.desc
-              ? 'DESC'
-              : 'ASC'
-          }),
-          {}
-        )
-        qb.orderBy(sort)
-      }
-
-      if (locationSortingRules?.length > 0) {
-        locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
-          qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-        })
-      }
-
-      let items = await qb
-        .offset((page - 1) * limit)
-        .limit(limit)
-        .getRawMany()
-
-      let total = await qb.getCount()
-
-      return {
-        items: items.map(item => {
-          return {
-            ...new Inventory(item),
-            serialNumbers: item.serial_numbers
-          }
-        }),
-        total
-      }
-    } catch (error) {
-      throw error
-    }
-  }
-
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryList)
-  async inventoriesGroupByProduct(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryList> {
+  async inventoriesGroupByProduct(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<InventoryList> {
     try {
-      const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+      const { domain, user, tx } = context.state
       let permittedBizplaceIds: string[] = await getPermittedBizplaceIds(domain, user)
       const partnersCompanyBizplaces: Bizplace[] = await getPartnersCompanyBizplaces(domain, user)
 
@@ -1002,17 +952,17 @@ export class InventoryQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() inventory: Inventory): Promise<Domain> {
-    return await getRepository(Domain).findOne(inventory.domainId)
+    return await getRepository(Domain).findOneBy({ id: inventory.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() inventory: Inventory): Promise<User> {
-    return await getRepository(User).findOne(inventory.updaterId)
+    return await getRepository(User).findOneBy({ id: inventory.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() inventory: Inventory): Promise<User> {
-    return await getRepository(User).findOne(inventory.creatorId)
+    return await getRepository(User).findOneBy({ id: inventory.creatorId })
   }
 
   /*
@@ -1022,7 +972,7 @@ export class InventoryQuery {
   @FieldResolver(type => Number)
   async changeCount(@Root() inventory: Inventory): Promise<Number> {
     return await getRepository(InventoryChange).count({
-      where: { inventory }
+      where: { inventory: { id: inventory.id } }
     })
   }
 
@@ -1071,6 +1021,19 @@ export class InventoryQuery {
 
     return items[0]?.arrivalNoticeRefNo || ''
   }
+
+  @FieldResolver(type => String)
+  async arrivalNoticeNo(@Root() inventory: Inventory): Promise<String> {
+    if (!inventory.refOrderId) return ''
+
+    let items: any = await getRepository(Inventory).query(`
+      SELECT an.name as "arrivalNoticeNo" FROM arrival_notices an
+      WHERE an.id = '${inventory.refOrderId}'
+      LIMIT 1
+    `)
+
+    return items[0]?.arrivalNoticeNo || ''
+  }
 }
 
 export async function inventoriesByStrategy(
@@ -1153,6 +1116,7 @@ export async function inventoriesByStrategy(
 
     case 'FEFO':
       qb.orderBy('"INV"."expiration_date"', 'ASC')
+      qb.addOrderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
           qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
@@ -1162,6 +1126,7 @@ export async function inventoriesByStrategy(
 
     case 'FMFO':
       qb.orderBy('"INV"."manufacture_date"', 'ASC')
+      qb.addOrderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
           qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')