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

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

@@ -1,10 +1,19 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Between, Brackets, EntityManager, getRepository, In, IsNull, Raw, SelectQueryBuilder } from 'typeorm'
+import { Between, Brackets, EntityManager, In, IsNull, Raw, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
+import {
+  buildQuery,
+  convertListParams,
+  Domain,
+  Filter,
+  getRepository,
+  ListParam,
+  Pagination,
+  Sorting
+} from '@things-factory/shell'
 
 import { RawInventoryHistoryList } from '../'
 import { InventoryList } from '../inventory/inventory-types'
@@ -22,8 +31,8 @@ import {
 @Resolver(InventoryHistory)
 export class InventoryHistoryQuery {
   @Query(returns => InventoryHistoryList)
-  async inventoryHistories(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryHistoryList> {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async inventoryHistories(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<InventoryHistoryList> {
+    const { domain, user } = context.state
 
     if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
       params.filters.push({
@@ -38,6 +47,7 @@ export class InventoryHistoryQuery {
       ...convertedParams,
       relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater'],
       order: {
+        ...convertedParams.order,
         palletId: 'DESC',
         createdAt: 'ASC'
       }
@@ -78,28 +88,29 @@ export class InventoryHistoryQuery {
   }
 
   @Query(returns => InventoryHistory)
-  async inventoryHistory(@Arg('name') name: string, @Ctx() context: any): Promise<InventoryHistory> {
-    const { domain }: { domain: Domain } = context.state
+  async inventoryHistory(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<InventoryHistory> {
+    const { domain } = context.state
 
     return await getRepository(InventoryHistory).findOne({
-      where: { domain: domain, name, relations: ['domain', 'creator', 'updater'] }
+      where: { domain: domain, name },
+      relations: ['domain', 'creator', 'updater']
     })
   }
 
   @Directive('@transaction')
   @Query(returns => InventoryHistoryList)
   async bizplaceInventoryHistories(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('inventoryHistory', type => InventoryHistoryPatch, { nullable: true })
     inventoryHistory?: InventoryHistoryPatch,
     @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<InventoryHistoryList> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     const ownerBizplace: Bizplace = await getMyBizplace(domain, user)
-    const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne(inventoryHistory.bizplace.id)
+    const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({ id: inventoryHistory.bizplace.id })
 
     const productFilters = filters.find(x => x.name == 'product_info')
     filters = filters.filter(x => x.name != 'product_info')
@@ -129,7 +140,7 @@ export class InventoryHistoryQuery {
     }
 
     if (inventoryHistory && inventoryHistory.warehouseName) {
-      const _warehouses: Warehouse[] = await tx.getRepository(Warehouse).find({
+      const _warehouses: Warehouse[] = await tx.getRepository(Warehouse).findBy({
         domain: domain,
         name: Raw(alias => `LOWER(${alias}) LIKE '${inventoryHistory.warehouseName.toLowerCase()}'`)
       })
@@ -168,11 +179,14 @@ export class InventoryHistoryQuery {
 
   @Directive('@transaction')
   @Query(returns => [InventoryHistory])
-  async inventoryHistoryReport(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryHistory[]> {
+  async inventoryHistoryReport(
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<InventoryHistory[]> {
     try {
-      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+      const { domain, tx } = context.state
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
@@ -183,10 +197,10 @@ export class InventoryHistoryQuery {
       let tzoffset = params.filters.find(data => data.name === 'tzoffset').value + ' seconds'
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -199,7 +213,7 @@ export class InventoryHistoryQuery {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -261,7 +275,7 @@ export class InventoryHistoryQuery {
         `
       create temp table temp_data_src AS
       (
-        SELECT prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
+        SELECT prd.sku as sku, prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
         invh.packing_type, invh.bizplace_id, invh.domain_id,
         invh.ref_order_id, invh.order_no, invh.order_ref_no, invh.transaction_type, invh.status, invh.created_at,
         invh.qty, invh.opening_qty, 
@@ -281,7 +295,7 @@ export class InventoryHistoryQuery {
       await tx.query(
         `
         create temp table temp_inv_history as (
-          SELECT src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
+          SELECT src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
           src.bizplace_id, src.domain_id,
           SUM(COALESCE(src.qty,0)) AS qty,
           SUM(COALESCE(src.opening_qty,0)) AS opening_qty,
@@ -294,14 +308,14 @@ export class InventoryHistoryQuery {
           $1::date AS created_date  
           FROM temp_data_src src
           WHERE src.created_at < $1::timestamp
-          GROUP BY src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
+          GROUP BY src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
           src.bizplace_id, src.domain_id
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, 
           order_name, ref_no, 1 AS rn, MIN(created_at) - $2::interval as created_at, (MIN(created_at) - $2::interval)::DATE as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.uom, invh.opening_uom_value,
             COALESCE(order_no, '-') AS order_name,
@@ -314,14 +328,14 @@ export class InventoryHistoryQuery {
             invh.transaction_type <>'NEW'
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           order_name, ref_no, 1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
             invh.transaction_type AS order_name,
@@ -334,14 +348,14 @@ export class InventoryHistoryQuery {
             invh.transaction_type = 'NEW')
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn, created_at
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(-opening_qty) as qty, sum(opening_qty) as opening_qty, sum(-opening_uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           order_name, ref_no, 1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
             invh.transaction_type AS order_name,
@@ -354,7 +368,7 @@ export class InventoryHistoryQuery {
             invh.status = 'MISSING'
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn, created_at
           
         )`,
@@ -363,18 +377,18 @@ export class InventoryHistoryQuery {
 
       const result: any = await tx.query(
         ` 
-        select product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+        select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
         domain_id, qty, opening_qty, round(uom_value::decimal,2) as uom_value, opening_uom_value, order_name, ref_no, created_at::date
         from temp_inv_history invh where
         exists (
           select * from (
-            select batch_id, product_name, packing_type, sum(qty) as totalQty, count(*) as totalRow from temp_inv_history ih2 
-            group by batch_id, product_name, packing_type
+            select sku, batch_id, product_name, packing_type, sum(qty) as totalQty, count(*) as totalRow from temp_inv_history ih2 
+            group by sku, batch_id, product_name, packing_type
           ) src 
-          where src.batch_id = invh.batch_id and src.product_name = invh.product_name and src.packing_type = invh.packing_type
+          where src.sku = invh.sku and src.batch_id = invh.batch_id and src.product_name = invh.product_name and src.packing_type = invh.packing_type
           ${hasTransactionOrBalanceQuery}
         )
-        ORDER BY invh.product_name asc, invh.product_description asc, invh.packing_type asc, invh.batch_id asc, invh.uom asc, invh.rn asc, invh.created_at asc
+        ORDER BY invh.sku asc, invh.product_name asc, invh.product_description asc, invh.packing_type asc, invh.batch_id asc, invh.uom asc, invh.rn asc, invh.created_at asc
       `
       )
 
@@ -392,6 +406,7 @@ export class InventoryHistoryQuery {
           packingType: item.packing_type,
           product: {
             id: item.product_id,
+            sku: item.sku,
             name:
               item.product_name +
               ' ( ' +
@@ -420,18 +435,21 @@ export class InventoryHistoryQuery {
 
   @Directive('@transaction')
   @Query(returns => [InventoryHistory])
-  async inventoryHistoryPalletReport(@Args() params: ListParam, @Ctx() context: any): Promise<InventoryHistory[]> {
+  async inventoryHistoryPalletReport(
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<InventoryHistory[]> {
     try {
-      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+      const { domain, tx } = context.state
       let userFilter = params.filters.find(data => data.name === 'user')
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -450,7 +468,7 @@ export class InventoryHistoryQuery {
 
       let bizplaceQuery = ''
       if (bizplaceFilter) {
-        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
           id: bizplaceFilter.value
         })
 
@@ -582,19 +600,19 @@ export class InventoryHistoryQuery {
   @Query(returns => [InventoryHistory])
   async inventoryHistoryPalletDetailReport(
     @Args() params: ListParam,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistory[]> {
     try {
-      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+      const { domain, tx } = context.state
       let userFilter = params.filters.find(data => data.name === 'user')
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -613,7 +631,7 @@ export class InventoryHistoryQuery {
 
       let bizplaceQuery = ''
       if (bizplaceFilter) {
-        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
           id: bizplaceFilter.value
         })
 
@@ -745,20 +763,20 @@ export class InventoryHistoryQuery {
   @Query(returns => InventoryHistoryPalletReportList)
   async inventoryHistoryPalletStorageReport(
     @Args() params: ListParam,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistoryPalletReportList> {
     try {
-      const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+      const { domain, tx } = context.state
 
       let userFilter = params.filters.find(data => data.name === 'user')
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -774,7 +792,7 @@ export class InventoryHistoryQuery {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -890,12 +908,12 @@ export class InventoryHistoryQuery {
   @Query(returns => InventoryHistorySummaryList)
   async inventoryHistorySummaryReport(
     @Args() params: ListParam,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistorySummaryList> {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
 
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
@@ -903,10 +921,10 @@ export class InventoryHistoryQuery {
       let byPallet = params.filters.find(data => data.name === 'byPallet')
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -919,7 +937,7 @@ export class InventoryHistoryQuery {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -963,14 +981,14 @@ export class InventoryHistoryQuery {
   @Directive('@transaction')
   @Query(returns => InventoryList)
   async onhandInventories(
-    @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('setPagination', type => Boolean, { defaultValue: true }) setPagination?: Boolean
   ): Promise<InventoryList> {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, user, tx } = context.state
 
     // define all inputs
     let userFilter = filters.find(data => data.name === 'user')
@@ -992,10 +1010,10 @@ export class InventoryHistoryQuery {
 
     // prepare query filters
     if (userFilter) {
-      const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+      const user = (await tx.getRepository(User).findOne({
         where: { id: userFilter.value },
         relations: ['bizplaces']
-      })) as any
+      })) as User & { bizplaces: Bizplace[] }
 
       const bizplace: Bizplace = user.bizplaces[0]
 
@@ -1004,12 +1022,12 @@ export class InventoryHistoryQuery {
       bizplaceFilter = { name: 'bizplace', operator: 'eq', value: [bizplace.id] }
     } else {
       bizplaceFilter = !filters.find((filter: any) => filter.name === 'bizplace')
-        ? {
+        ? ({
             name: 'bizplace',
             operator: 'in',
             value: await getPermittedBizplaceIds(domain, user),
             relation: true
-          }
+          } as any)
         : {
             ...filters.find(data => data.name === 'bizplace'),
             value: [filters.find(data => data.name === 'bizplace').value]
@@ -1118,21 +1136,31 @@ export class InventoryHistoryQuery {
       [domain.id, createdAt.value, timezoneOffset]
     )
 
-    //comment start
-    //detailed review needed 19 May 2022 by @ChrisLim-git
+    await tx.query(
+      `
+      CREATE TEMP TABLE tmp_src_group on commit drop AS (
+        select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
+        min(ih.created_at) as initial_inbound_at
+        from tmp_src ih
+        group by ih.domain_id, ih.pallet_id
+      );
+    `
+    )
+
     await tx.query(
       `          
         create temp table tmp_data on commit drop as (
           select dt.*, rih.carton_id, rih.batch_id, rih.batch_id_ref, rih.product_id, rih.packing_type, rih.bizplace_id, rih.location_id, rih.unit_cost,iv.id as inventory_id, iv.uom, 
-          iv.expiration_date, iv.manufacture_date, iv.reusable_pallet_id, iv.remark,iv.status
+          iv.expiration_date, iv.manufacture_date, iv.reusable_pallet_id, iv.remark
           from
           (
-            select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
-            min(ih.created_at) as initial_inbound_at
-            from tmp_src ih
-            group by ih.domain_id, ih.pallet_id
+            SELECT ih.*, ih2.status FROM tmp_src_group ih
+            INNER JOIN inventory_histories ih2 
+            ON ih.domain_id = ih2.domain_id 
+            AND ih.pallet_id = ih2.pallet_id
+            AND ih.last_seq = ih2.seq            
           ) dt
-          inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq
+          inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq and rih.status <> 'TERMINATED'
           inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id and iv.status <> 'MISSING'
           where exists (
             SELECT * FROM tmp_bizfilter bizFilter
@@ -1144,44 +1172,13 @@ export class InventoryHistoryQuery {
       `
     )
 
-    await tx.query(
-      `
-     create temp table tmp_result on commit drop as (
-      select 
-               rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
-               rih.initial_inbound_at as "initialInboundAt", rih.unit_cost as "unitCost",
-               case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
-               rih.batch_id_ref as "batchIdRef", rih.product_id as "productId", rih.packing_type as "packingType",
-               prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.brand as product_brand, prd.description as product_description, prd.volume as product_volume,
-               bz.id as bizplace_id, bz.name as bizplace_name, 
-               loc.id as location_id, loc.name as location_name, loc."zone" as location_zone, loc."row" as location_row, loc."column" as location_column, loc.shelf as location_shelf,
-               wh.name as warehouse_name, plt.name as reusable_pallet_name,
-               rih.remark,
-               rih.manufacture_date as "manufactureDate",
-               rih.expiration_date as "expirationDate"
-               ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then oi.release_qty else 0 end) as "nonLoadedQty"
-               ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then (oi.release_uom_value / oi.release_qty* oi.release_qty) else 0 end) as "nonLoadedUomValue" 
-               from tmp_data rih
-               left join pallets plt on plt.id = rih.reusable_pallet_id
-               inner join products prd on prd.id = rih.product_id
-               inner join bizplaces bz on bz.id = rih.bizplace_id
-               inner join locations loc on loc.id = rih.location_id
-               inner join warehouses wh on wh.id = loc.warehouse_id
-               left  join order_inventories oi on oi.inventory_id = rih.inventory_id
-               group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
-               rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
-               having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
-               order by created_at desc
-           );   
-     `
-    )
-
-    const total: any = await tx.query(`select count(*) from tmp_result`)
+    const total: any = await tx.query(`select count(*) from tmp_data`)
 
     const result: any = await tx.query(
       ` 
           select 
-          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
+          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", 
+          TRUNC(rih.uom_value::numeric,2) as "uomValue", rih.uom, rih.last_seq, rih.created_at,
           rih.initial_inbound_at as "initialInboundAt", rih.unit_cost as "unitCost",
           case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
           rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
@@ -1191,24 +1188,36 @@ export class InventoryHistoryQuery {
           wh.name as warehouse_name, plt.name as reusable_pallet_name,
           rih.remark,
           rih.manufacture_date as "manufactureDate",
-          rih.expiration_date as "expirationDate"
-          ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then oi.release_qty else 0 end) as "nonLoadedQty"
-          ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then (oi.release_uom_value / oi.release_qty* oi.release_qty) else 0 end) as "nonLoadedUomValue" 
+          rih.expiration_date as "expirationDate",
+          coalesce((
+            select sum(oi1.release_qty) as nonLoadedQty from order_inventories oi1
+            inner join release_goods rg1 on rg1.id = oi1.release_good_id 
+            where rg1.status in ('PICKING', 'LOADING') 
+            and oi1.inventory_id = rih.inventory_id 
+            and oi1.status in ('PICKED', 'LOADING')
+            and rg1.domain_id = '${domain.id}'
+            group by oi1.inventory_id
+          ),0) as "nonLoadedQty",
+          TRUNC(coalesce((
+            select sum(oi1.release_uom_value) as nonLoadedUomValue from order_inventories oi1
+            inner join release_goods rg1 on rg1.id = oi1.release_good_id 
+            where rg1.status in ('PICKING', 'LOADING') 
+            and oi1.inventory_id = rih.inventory_id 
+            and oi1.status in ('PICKED', 'LOADING')
+            and rg1.domain_id = '${domain.id}'
+            group by oi1.inventory_id
+          ),0)::numeric,2) as "nonLoadedUomValue"
           from tmp_data rih
           left join pallets plt on plt.id = rih.reusable_pallet_id
           inner join products prd on prd.id = rih.product_id
           inner join bizplaces bz on bz.id = rih.bizplace_id
           inner join locations loc on loc.id = rih.location_id
           inner join warehouses wh on wh.id = loc.warehouse_id
-          left join order_inventories oi on oi.inventory_id = rih.inventory_id
-          group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
-          rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
-          having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
+          WHERE 1 = 1
           ${queryOrder}
           ${setPagination ? 'OFFSET ' + (pagination.page - 1) * pagination.limit + ' LIMIT ' + pagination.limit : ''}
       `
     )
-    //comment end
 
     // map all results
     let items = result.map(itm => {
@@ -1241,14 +1250,14 @@ export class InventoryHistoryQuery {
   @Directive('@transaction')
   @Query(returns => RawInventoryHistoryList)
   async bizplaceInventoryHistoriesForExport(
-    @Ctx() context: any,
+    @Ctx() context: ResolverContext,
     @Arg('inventoryHistory', type => InventoryHistoryPatch, { nullable: true })
     inventoryHistory?: InventoryHistoryPatch,
     @Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[]
   ): Promise<RawInventoryHistoryList> {
-    const { domain, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const { domain, tx } = context.state
 
-    const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne(inventoryHistory.bizplace.id)
+    const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({ id: inventoryHistory.bizplace.id })
 
     const productFilters = filters.find(x => x.name == 'product_info')
     filters = filters.filter(x => x.name != 'product_info')
@@ -1279,7 +1288,7 @@ export class InventoryHistoryQuery {
     }
 
     if (inventoryHistory && inventoryHistory.warehouseName) {
-      const _warehouses: Warehouse[] = await tx.getRepository(Warehouse).find({
+      const _warehouses: Warehouse[] = await tx.getRepository(Warehouse).findBy({
         domain: domain,
         name: Raw(alias => `LOWER(${alias}) LIKE '${inventoryHistory.warehouseName.toLowerCase()}'`)
       })
@@ -1364,22 +1373,22 @@ export class InventoryHistoryQuery {
   @Query(returns => InventoryHistoryVolumeSummaryReportList)
   async inventoryHistoryVolumeSummaryReport(
     @Args() params: ListParam,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<InventoryHistoryVolumeSummaryReportList> {
     try {
-      const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+      const { domain, user, tx } = context.state
 
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
 
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
 
       if (userFilter) {
-        const user: User & { bizplaces: Bizplace[] } = (await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })) as any
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -1392,7 +1401,7 @@ export class InventoryHistoryQuery {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -1400,7 +1409,8 @@ export class InventoryHistoryQuery {
       let foundPermittedBizplace: Bizplace
 
       if (bizplace) {
-        foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(bizplace.id, {
+        foundPermittedBizplace = await tx.getRepository(Bizplace).findOne({
+          where: { id: bizplace.id },
           relations: ['company', 'company.domain']
         })
 
@@ -1529,21 +1539,26 @@ export class InventoryHistoryQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() inventoryHistory: InventoryHistory) {
-    return await getRepository(Domain).findOne(inventoryHistory.domainId)
+    return await getRepository(Domain).findOneBy({ id: inventoryHistory.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() inventoryHistory: InventoryHistory) {
-    return await getRepository(User).findOne(inventoryHistory.updaterId)
+    return await getRepository(User).findOneBy({ id: inventoryHistory.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() inventoryHistory: InventoryHistory) {
-    return await getRepository(User).findOne(inventoryHistory.creatorId)
+    return await getRepository(User).findOneBy({ id: inventoryHistory.creatorId })
   }
 }
 
-async function massageInventorySummary(tx: EntityManager, params: ListParam, bizplace: Bizplace, context: any) {
+async function massageInventorySummary(
+  tx: EntityManager,
+  params: ListParam,
+  bizplace: Bizplace,
+  context: ResolverContext
+) {
   await productsQuery(tx, params, bizplace)
   await filterInventoryQuery(tx, params, bizplace, context)
 
@@ -1590,7 +1605,12 @@ async function massageInventorySummary(tx: EntityManager, params: ListParam, biz
   return [result, total]
 }
 
-async function massageInventoryPalletSummary(tx: EntityManager, params: ListParam, bizplace: Bizplace, context: any) {
+async function massageInventoryPalletSummary(
+  tx: EntityManager,
+  params: ListParam,
+  bizplace: Bizplace,
+  context: ResolverContext
+) {
   await productsQuery(tx, params, bizplace)
   await filterInventoryQuery(tx, params, bizplace, context)
 
@@ -1751,7 +1771,12 @@ async function productsQuery(tx: EntityManager, params: ListParam, bizplace: Biz
   )
 }
 
-async function filterInventoryQuery(tx: EntityManager, params: ListParam, bizplace: Bizplace, context: any) {
+async function filterInventoryQuery(
+  tx: EntityManager,
+  params: ListParam,
+  bizplace: Bizplace,
+  context: ResolverContext
+) {
   let toDate = params.filters.find(data => data.name === 'toDate')
   let batchNo = params.filters.find(data => data.name === 'batchNo')
 
@@ -1777,8 +1802,8 @@ async function filterInventoryQuery(tx: EntityManager, params: ListParam, bizpla
       from inventories i2
       inner join reduced_inventory_histories ih on ih.pallet_id = i2.pallet_id and ih.domain_id = i2.domain_id
       where
-      i2.domain_id = $1
-      and i2.bizplace_id = $2
+      ih.domain_id = $1
+      and ih.bizplace_id = $2
       and ih.created_at <= $3
       ${batchNoQuery}
     )