@things-factory/operato-wms 3.7.2 → 3.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.7.2",
+  "version": "3.7.7",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -42,71 +42,71 @@
   },
   "dependencies": {
     "@operato/ghost-print": "0.1.14",
-    "@things-factory/apptool-ui": "^3.7.0",
-    "@things-factory/attachment-ui": "^3.7.0",
-    "@things-factory/auth-ui": "^3.7.0",
-    "@things-factory/barcode-ui": "^3.7.2",
-    "@things-factory/biz-ui": "^3.7.0",
-    "@things-factory/board-service": "^3.7.0",
-    "@things-factory/board-ui": "^3.7.0",
-    "@things-factory/code-ui": "^3.7.0",
-    "@things-factory/context-ui": "^3.7.0",
-    "@things-factory/export-ui": "^3.7.0",
-    "@things-factory/export-ui-csv": "^3.7.0",
-    "@things-factory/export-ui-excel": "^3.7.0",
-    "@things-factory/fav-base": "^3.7.0",
-    "@things-factory/form-ui": "^3.7.0",
-    "@things-factory/grist-ui": "^3.7.0",
-    "@things-factory/help": "^3.7.0",
-    "@things-factory/i18n-ui": "^3.7.0",
-    "@things-factory/id-rule-base": "^3.7.0",
-    "@things-factory/import-ui": "^3.7.0",
-    "@things-factory/import-ui-excel": "^3.7.0",
-    "@things-factory/menu-ui": "^3.7.0",
-    "@things-factory/more-ui": "^3.7.0",
-    "@things-factory/notification": "^3.7.0",
-    "@things-factory/pdf": "^3.7.0",
-    "@things-factory/print-proxy-service": "^3.7.0",
-    "@things-factory/print-service": "^3.7.0",
-    "@things-factory/print-ui": "^3.7.0",
-    "@things-factory/product-base": "^3.7.0",
-    "@things-factory/resource-ui": "^3.7.0",
-    "@things-factory/sales-ui": "^3.7.2",
-    "@things-factory/scene-chartjs": "^3.7.0",
-    "@things-factory/scene-clock": "^3.7.0",
-    "@things-factory/scene-clone": "^3.7.0",
-    "@things-factory/scene-compass": "^3.7.0",
-    "@things-factory/scene-data-transform": "^3.7.0",
-    "@things-factory/scene-excel": "^3.7.0",
-    "@things-factory/scene-firebase": "^3.7.0",
-    "@things-factory/scene-form": "^3.7.0",
-    "@things-factory/scene-gauge": "^3.7.0",
-    "@things-factory/scene-google-map": "^3.7.0",
-    "@things-factory/scene-graphql": "^3.7.0",
-    "@things-factory/scene-half-roundrect": "^3.7.0",
-    "@things-factory/scene-indoor-map": "^3.7.0",
-    "@things-factory/scene-label": "^3.7.2",
-    "@things-factory/scene-legend": "^3.7.0",
-    "@things-factory/scene-marker": "^3.7.0",
-    "@things-factory/scene-mqtt": "^3.7.0",
-    "@things-factory/scene-news-ticker": "^3.7.0",
-    "@things-factory/scene-progressbar": "^3.7.0",
-    "@things-factory/scene-random": "^3.7.0",
-    "@things-factory/scene-restful": "^3.7.0",
-    "@things-factory/scene-switch": "^3.7.0",
-    "@things-factory/scene-tab": "^3.7.0",
-    "@things-factory/scene-table": "^3.7.0",
-    "@things-factory/scene-visualizer": "^3.7.0",
-    "@things-factory/scene-wheel-sorter": "^3.7.0",
-    "@things-factory/setting-ui": "^3.7.0",
-    "@things-factory/system-ui": "^3.7.0",
-    "@things-factory/transport-base": "^3.7.0",
-    "@things-factory/tutorial-ui": "^3.7.0",
-    "@things-factory/warehouse-base": "^3.7.2",
-    "@things-factory/worksheet-base": "^3.7.2"
+    "@things-factory/apptool-ui": "^3.7.5",
+    "@things-factory/attachment-ui": "^3.7.5",
+    "@things-factory/auth-ui": "^3.7.7",
+    "@things-factory/barcode-ui": "^3.7.7",
+    "@things-factory/biz-ui": "^3.7.5",
+    "@things-factory/board-service": "^3.7.5",
+    "@things-factory/board-ui": "^3.7.5",
+    "@things-factory/code-ui": "^3.7.5",
+    "@things-factory/context-ui": "^3.7.5",
+    "@things-factory/export-ui": "^3.7.5",
+    "@things-factory/export-ui-csv": "^3.7.5",
+    "@things-factory/export-ui-excel": "^3.7.5",
+    "@things-factory/fav-base": "^3.7.5",
+    "@things-factory/form-ui": "^3.7.5",
+    "@things-factory/grist-ui": "^3.7.5",
+    "@things-factory/help": "^3.7.5",
+    "@things-factory/i18n-ui": "^3.7.5",
+    "@things-factory/id-rule-base": "^3.7.6",
+    "@things-factory/import-ui": "^3.7.5",
+    "@things-factory/import-ui-excel": "^3.7.5",
+    "@things-factory/menu-ui": "^3.7.5",
+    "@things-factory/more-ui": "^3.7.5",
+    "@things-factory/notification": "^3.7.5",
+    "@things-factory/pdf": "^3.7.5",
+    "@things-factory/print-proxy-service": "^3.7.5",
+    "@things-factory/print-service": "^3.7.5",
+    "@things-factory/print-ui": "^3.7.5",
+    "@things-factory/product-base": "^3.7.7",
+    "@things-factory/resource-ui": "^3.7.7",
+    "@things-factory/sales-ui": "^3.7.7",
+    "@things-factory/scene-chartjs": "^3.7.5",
+    "@things-factory/scene-clock": "^3.7.5",
+    "@things-factory/scene-clone": "^3.7.5",
+    "@things-factory/scene-compass": "^3.7.5",
+    "@things-factory/scene-data-transform": "^3.7.5",
+    "@things-factory/scene-excel": "^3.7.5",
+    "@things-factory/scene-firebase": "^3.7.5",
+    "@things-factory/scene-form": "^3.7.5",
+    "@things-factory/scene-gauge": "^3.7.5",
+    "@things-factory/scene-google-map": "^3.7.5",
+    "@things-factory/scene-graphql": "^3.7.5",
+    "@things-factory/scene-half-roundrect": "^3.7.5",
+    "@things-factory/scene-indoor-map": "^3.7.5",
+    "@things-factory/scene-label": "^3.7.7",
+    "@things-factory/scene-legend": "^3.7.5",
+    "@things-factory/scene-marker": "^3.7.5",
+    "@things-factory/scene-mqtt": "^3.7.5",
+    "@things-factory/scene-news-ticker": "^3.7.5",
+    "@things-factory/scene-progressbar": "^3.7.5",
+    "@things-factory/scene-random": "^3.7.5",
+    "@things-factory/scene-restful": "^3.7.5",
+    "@things-factory/scene-switch": "^3.7.5",
+    "@things-factory/scene-tab": "^3.7.5",
+    "@things-factory/scene-table": "^3.7.5",
+    "@things-factory/scene-visualizer": "^3.7.5",
+    "@things-factory/scene-wheel-sorter": "^3.7.5",
+    "@things-factory/setting-ui": "^3.7.5",
+    "@things-factory/system-ui": "^3.7.5",
+    "@things-factory/transport-base": "^3.7.5",
+    "@things-factory/tutorial-ui": "^3.7.5",
+    "@things-factory/warehouse-base": "^3.7.7",
+    "@things-factory/worksheet-base": "^3.7.7"
   },
   "devDependencies": {
-    "@things-factory/builder": "^3.7.0"
+    "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "b82cb916c52c767d69db36d8ee28ed3fdbf06f23"
+  "gitHead": "7e1cfc771ca9e8970d90493d3049d4d589e96f08"
 }

package/server/graphql/resolvers/custom/elccl/elccl-inventory-history-summary-report.ts

@@ -8,75 +8,13 @@ export const elcclInventoryHistorySummaryReport = {
     try {
       const { tx }: { tx: EntityManager } = context.state
 
-      let balanceOnlyFilter = params.filters.find(data => data.name === 'balanceOnly')
+      await inventoryHistorySummaryReportQuery(_, params, context)
 
-      let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
-
-      let fromDate = params.filters.find(data => data.name === 'fromDate')
-      let toDate = params.filters.find(data => data.name === 'toDate')
-
-      if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
-
-      const bizplace: Bizplace = await getRepository(Bizplace).findOne({
-        id: bizplaceFilter.value
-      })
-
-      let balanceOnlyQuery = ''
-      if (balanceOnlyFilter && balanceOnlyFilter.value) {
-        balanceOnlyQuery = 'and (opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty) > 0 '
-      }
-
-      await tx.query(
-        `
-        create temp table temp_inv_history on commit drop as (
-          select i2.pallet_id, ih.product_id::uuid, ih.packing_type, ih.batch_id,
-          ih.id as inventory_history_id, ih.seq, ih.status, ih.transaction_type, ih.qty, ih.opening_qty, ih.weight, ih.opening_weight, ih.created_at,
-          ih.ref_order_id::uuid as ref_order_id
-          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
-          and ih.created_at <= $3
-        )
-      `,
-        [context.state.domain.id, bizplace.id, toDate.value]
-      )
-
-      await tx.query(
-        `
-        create temp table temp_elccl_inventory_summary on commit drop as (
-          select src.*,
-          opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty as closing_qty,
-          prd.name as product_name, prd.sku as product_sku, prd.description as product_description 
-          from (
-            select ih.batch_id, ih.packing_type,
-            min(ih.created_at) as initial_date,
-            sum(case when (ih.transaction_type = 'UNLOADING' or ih.transaction_type = 'NEW') and rtn.id is null then qty else 0 end) as initial_qty,
-            sum(case when ih.created_at > $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) as adjustment_qty,
-            sum(case when ih.created_at < $1 then ih.qty else 0 end) as opening_qty,
-            sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
-            sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT')  or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
-            ih.product_id,
-            sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
-            from temp_inv_history ih
-            left join return_orders rtn on rtn.id = ih.ref_order_id
-            group by ih.batch_id, ih.product_id, ih.packing_type
-            order by batch_id
-          ) src
-          inner join products prd on prd.id = src.product_id
-          where (opening_qty > 0 or total_in_qty > 0 or adjustment_qty > 0)
-          ${balanceOnlyQuery}
-        )
-      `,
-        [fromDate.value]
-      )
-
-      const total: any = await tx.query(`select count(*) from temp_elccl_inventory_summary`)
+      const total: any = await tx.query(`select count(*) from temp_inventory_summary`)
 
       const result: any = await tx.query(
         ` 
-        select * from temp_elccl_inventory_summary ORDER BY initial_date OFFSET $1 LIMIT $2
+        select * from temp_inventory_summary ORDER BY initial_date OFFSET $1 LIMIT $2
       `,
         [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
       )
@@ -109,3 +47,75 @@ export const elcclInventoryHistorySummaryReport = {
     }
   }
 }
+
+export async function inventoryHistorySummaryReportQuery(_: any, params: ListParam, context: any): Promise<void> {
+  try {
+    const { tx }: { tx: EntityManager } = context.state
+
+    let balanceOnlyFilter = params.filters.find(data => data.name === 'balanceOnly')
+
+    let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
+
+    let fromDate = params.filters.find(data => data.name === 'fromDate')
+    let toDate = params.filters.find(data => data.name === 'toDate')
+
+    if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
+
+    const bizplace: Bizplace = await getRepository(Bizplace).findOne({
+      id: bizplaceFilter.value
+    })
+
+    let balanceOnlyQuery = ''
+    if (balanceOnlyFilter && balanceOnlyFilter.value) {
+      balanceOnlyQuery = 'and (opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty) > 0 '
+    }
+
+    await tx.query(
+      `
+      create temp table temp_inv_history on commit drop as (
+        select i2.pallet_id, ih.product_id::uuid, ih.packing_type, ih.batch_id,
+        ih.id as inventory_history_id, ih.seq, ih.status, ih.transaction_type, ih.qty, ih.opening_qty, ih.weight, ih.opening_weight, ih.created_at,
+        ih.ref_order_id::uuid as ref_order_id
+        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
+        and ih.created_at <= $3
+      )
+    `,
+      [context.state.domain.id, bizplace.id, toDate.value]
+    )
+
+    await tx.query(
+      `
+      create temp table temp_inventory_summary on commit drop as (
+        select src.*,
+        opening_qty + adjustment_qty + total_in_qty + total_out_qty + total_return_qty as closing_qty,
+        prd.name as product_name, prd.sku as product_sku, prd.description as product_description 
+        from (
+          select ih.batch_id, ih.packing_type,
+          min(ih.created_at) as initial_date,
+          sum(case when (ih.transaction_type = 'UNLOADING' or ih.transaction_type = 'NEW') and rtn.id is null then qty else 0 end) as initial_qty,
+          sum(case when ih.created_at > $1 and ih.transaction_type = 'ADJUSTMENT' then ih.qty else 0 end) as adjustment_qty,
+          sum(case when ih.created_at < $1 then ih.qty else 0 end) as opening_qty,
+          sum(case when ih.created_at > $1 then case when ih.qty > 0 and ih.transaction_type <> 'ADJUSTMENT' and ih.transaction_type <> 'RETURN' and rtn.id is null then ih.qty else 0 end else 0 end) as total_in_qty,
+          sum(case when ih.created_at > $1 then case when (ih.qty < 0 and ih.transaction_type <> 'ADJUSTMENT')  or ih.transaction_type = 'RETURN' then ih.qty else 0 end else 0 end) as total_out_qty,
+          ih.product_id,
+          sum(case when rtn.id is not null and ih.transaction_type <> 'ADJUSTMENT' and ih.created_at > $1 then qty else 0 end) as total_return_qty
+          from temp_inv_history ih
+          left join return_orders rtn on rtn.id = ih.ref_order_id
+          group by ih.batch_id, ih.product_id, ih.packing_type
+          order by batch_id
+        ) src
+        inner join products prd on prd.id = src.product_id
+        where (opening_qty > 0 or total_in_qty > 0 or adjustment_qty > 0)
+        ${balanceOnlyQuery}
+      )
+    `,
+      [fromDate.value]
+    )
+  } catch (error) {
+    throw error
+  }
+}

package/server/graphql/resolvers/extra/add-release-good-products.ts

@@ -1,17 +1,18 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
-import { OrderInventory, OrderNoGenerator, ORDER_INVENTORY_STATUS, ReleaseGood } from '@things-factory/sales-base'
+import { ORDER_INVENTORY_STATUS, OrderInventory, OrderNoGenerator, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, InventoryHistory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_TRANSACTION_TYPE, InventoryHistory } from '@things-factory/warehouse-base'
 import {
   generatePickingWorksheetDetail,
   Worksheet,
-  WorksheetDetail,
   WORKSHEET_STATUS,
-  WORKSHEET_TYPE
+  WORKSHEET_TYPE,
+  WorksheetDetail
 } from '@things-factory/worksheet-base'
-import { EntityManager } from 'typeorm'
 
 export const addReleaseGoodProducts = {
   async addReleaseGoodProducts(_: any, { name, orderInventories, existingOrderInventories }, context: any) {
@@ -56,13 +57,6 @@ export const addReleaseGoodProducts = {
               }
             })
 
-            if (foundPickingHistory) {
-              let pickedQty = Number(foundPickingHistory.qty.toString().replace('-', ''))
-
-              if (curOrderInv.releaseQty < pickedQty)
-                throw new Error(`${foundPickingHistory.palletId} has picked ${pickedQty}`)
-            }
-
             existingOrderInv = await tx.getRepository(OrderInventory).findOne({
               where: {
                 releaseGood,
@@ -73,6 +67,17 @@ export const addReleaseGoodProducts = {
               }
             })
 
+            if (foundInv && foundInv.lockedQty == 0) {
+              foundInv.qty += Number(existingOrderInv.releaseQty)
+              foundInv.uomValue += Number(existingOrderInv.releaseUomValue)
+              foundInv.lockedQty = Number(existingOrderInv.releaseQty)
+              foundInv.lockedUomValue = Number(existingOrderInv.releaseUomValue)
+            }
+
+            if (curOrderInv.releaseQty < existingOrderInv.pickedQty) {
+              throw new Error(`${curOrderInv.inventory.palletId} has already picked ${existingOrderInv.pickedQty}`)
+            }
+
             if (curOrderInv.releaseQty === 0) {
               foundInv.lockedQty = Number(foundInv.lockedQty) - Number(existingOrderInv.releaseQty)
               foundInv.lockedUomValue = Number(foundInv.lockedUomValue) - Number(existingOrderInv.releaseUomValue)
@@ -84,6 +89,7 @@ export const addReleaseGoodProducts = {
                 curOrderInv = {
                   ...existingOrderInv,
                   releaseQty: curOrderInv.releaseQty,
+                  releaseUomValue: curOrderInv.releaseUomValue,
                   lockedUomValue: curOrderInv.lockedUomValue,
                   status: ORDER_INVENTORY_STATUS.CANCELLED
                 }
@@ -103,19 +109,46 @@ export const addReleaseGoodProducts = {
                 await tx.getRepository(WorksheetDetail).save(existingWorksheetDetail)
                 await tx.getRepository(OrderInventory).save(curOrderInv)
               }
+            } else if (curOrderInv.releaseQty == existingOrderInv.pickedQty) {
+              curOrderInv = {
+                ...existingOrderInv,
+                releaseQty: curOrderInv.releaseQty,
+                releaseUomValue: curOrderInv.releaseUomValue,
+                lockedUomValue: curOrderInv.lockedUomValue,
+                status: ORDER_INVENTORY_STATUS.PICKED
+              }
+
+              let existingWorksheetDetail: WorksheetDetail = await tx.getRepository(WorksheetDetail).findOne({
+                where: {
+                  targetInventory: curOrderInv
+                }
+              })
+
+              existingWorksheetDetail = {
+                ...existingWorksheetDetail,
+                status: WORKSHEET_STATUS.PICKED
+              }
+
+              await tx.getRepository(WorksheetDetail).save(existingWorksheetDetail)
+              await tx.getRepository(OrderInventory).save(curOrderInv)
             } else {
-              foundInv.lockedQty = Number(curOrderInv.releaseQty)
-              foundInv.lockedUomValue = Number(curOrderInv.releaseUomValue)
               foundInv.updater = user
+              foundInv.lockedQty =
+                foundInv.lockedQty - Number(existingOrderInv.releaseQty) + Number(curOrderInv.releaseQty)
+              foundInv.lockedUomValue =
+                foundInv.lockedUomValue - Number(existingOrderInv.releaseUomValue) + Number(curOrderInv.releaseUomValue)
 
               await tx.getRepository(Inventory).save(foundInv)
 
               if (existingOrderInv) {
+                const orderInvStatus = ORDER_INVENTORY_STATUS.PICKING
+
                 // if found existing OrderInventory and worksheetDetail then qty, uomValue, and status are updated
                 curOrderInv = {
                   ...existingOrderInv,
                   releaseQty: curOrderInv.releaseQty,
-                  releaseUomValue: curOrderInv.releaseUomValue
+                  releaseUomValue: curOrderInv.releaseUomValue,
+                  status: orderInvStatus
                 }
 
                 let existingWorksheetDetail: WorksheetDetail = await tx.getRepository(WorksheetDetail).findOne({
@@ -268,6 +301,15 @@ export const addReleaseGoodProducts = {
             savedOrderInv.domain = domain
             savedOrderInv.creator = user
             savedOrderInv.updater = user
+
+            if (newOrderInv?.id) {
+              // newOrderInv will have id if it was updated from existingOrderInv
+              // this solution will remove ix_order-inventory_0 unique error
+              // ** please revise this resolver in future. looks like there's few
+              //    things that can refactor
+              savedOrderInv.id = newOrderInv.id
+            }
+
             savedOrderInv = await tx.getRepository(OrderInventory).save(savedOrderInv)
 
             if (!existingOrderInv && pickingWorksheet) {

package/server/graphql/resolvers/index.ts

@@ -5,6 +5,7 @@ import * as Dashboard from './dashboard'
 import * as Extra from './extra'
 import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
+import * as InventoryComparison from './inventory-comparison'
 
 export const queries = [
   BoardSetting.Query,
@@ -12,7 +13,8 @@ export const queries = [
   CustomKimeda.Query,
   Dashboard.Query,
   OpaMenu.Query,
-  Reports.Query
+  Reports.Query,
+  InventoryComparison.Query
 ]
 
 export const mutations = [Extra.Mutation]

package/server/graphql/resolvers/inventory-comparison/index.ts

@@ -0,0 +1,5 @@
+import { inventoryComparisonList } from './inventory-comparison-list'
+
+export const Query = {
+  ...inventoryComparisonList
+}

package/server/graphql/resolvers/inventory-comparison/inventory-comparison-list.ts

@@ -0,0 +1,99 @@
+import { onhandInventories } from '@things-factory/warehouse-base'
+import { ListParam } from '@things-factory/shell'
+import { EntityManager } from 'typeorm'
+import { inventoryHistorySummaryReportQuery } from '../custom/elccl/elccl-inventory-history-summary-report'
+
+export const inventoryComparisonList = {
+  async inventoryComparisonList(_: any, params: ListParam, context: any) {
+    try {
+      const { tx }: { tx: EntityManager } = context.state
+
+      let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
+
+      if (!bizplaceFilter) {
+        return
+      }
+
+      let toDateFilter = params.filters.find(data => data.name === 'toDate')
+      let toDateDate = new Date(toDateFilter.value)
+      let fromDate = toDateDate.setDate(toDateDate.getDate() - 1)
+      let fromDateISO = new Date(fromDate).toISOString()
+      let nonTallyFilter = params.filters.find(data => data.name === 'nonTally').value
+      let productFilter = params.filters.find(data => data.name === 'product')
+
+      params.filters.push({
+        name: 'fromDate',
+        operator: 'eq',
+        value: fromDateISO
+      })
+
+      params.filters.push(
+        { name: 'status', operator: 'notin', value: ['INTRANSIT', 'TERMINATED', 'DELETED'] },
+        { name: 'remainOnly', operator: 'eq', value: true },
+        { name: 'unlockOnly', operator: 'eq', value: true },
+        { name: 'created_at', operator: 'eq', value: toDateFilter.value },
+        { name: 'timezoneOffset', operator: 'eq', value: new Date().getTimezoneOffset() },
+        { name: 'expiration', operator: 'eq', value: false }
+      )
+
+      let productQueryFilter = ``
+
+      if (productFilter) {
+        let products = productFilter.value
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+
+        productQueryFilter =
+          productQueryFilter +
+          `
+          ${nonTallyFilter ? 'and' : 'where'} (lower(summ.product_name) like any(array[${products}])
+          or lower(summ.product_sku) like any(array[${products}]))`
+      }
+
+      await Promise.all([
+        inventoryHistorySummaryReportQuery(_, params, context),
+        onhandInventories(params.filters, params.pagination, params.sortings, [], context, false)
+      ])
+    
+      await tx.query(`
+        create temp table tmp_inv_comp on commit drop as (
+          select summ."batch_id", summ.product_id, summ.product_name, summ.product_sku, summ.packing_type, summ.closing_qty, coalesce(oh.qty, 0) as "onhand_qty" from temp_inventory_summary summ 
+          left join (	
+            select "batch_id" as "batch_id", product_id, sum("qty") as qty from tmp_data group by "batch_id", product_id
+          ) oh on oh.batch_id = summ.batch_id and oh.product_id = summ.product_id
+          ${nonTallyFilter ? 'where coalesce(oh.qty, 0) <> summ.closing_qty' : ''}
+          ${productQueryFilter}
+        );
+      `)
+
+      let sumData = await tx.query(`
+        select * from tmp_inv_comp
+        offset $1 limit $2
+      `, [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit])
+
+      const totalQuery: number = await tx.query(`select count(*) from tmp_inv_comp `)
+      
+      const total = parseInt(totalQuery[0].count)
+
+      const items: any[] = sumData.map(item => {
+        return {
+          productName: item.product_name,
+          productSku: item.product_sku,
+          packingType: item.packing_type,
+          closingQty: item.closing_qty,
+          remainQty: item.onhand_qty,
+          batchId: item.batch_id
+        }
+      })
+
+      return { items, total }
+
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/resolvers/reports/index.ts

@@ -1,7 +1,9 @@
 import { inboundOrderDetailsReport } from './inbound-order-details-report'
 import { outboundOrderDetailsReport } from './outbound-order-details-report'
+import { productLabelReport } from './product-label-report'
 
 export const Query = {
   ...inboundOrderDetailsReport,
-  ...outboundOrderDetailsReport
+  ...outboundOrderDetailsReport,
+  ...productLabelReport
 }

package/server/graphql/resolvers/reports/product-label-report.ts

@@ -0,0 +1,56 @@
+import { getRepository } from 'typeorm'
+
+import { Sequence, SEQUENCE_TYPE } from '@things-factory/id-rule-base'
+import { Domain, ListParam } from '@things-factory/shell'
+
+export const productLabelReport = {
+  async productLabelReport(_: any, params: ListParam, context: any) {
+    try {
+      const { domain }: { domain: Domain } = context.state
+      // const { domain }: { domain: Domain } = context.state
+      const bizplaceId = params.filters.find(data => data.name === 'bizplace').value
+      const type = params.filters.find(data => data.name === 'type')?.value
+      const fromDate = params.filters.find(data => data.name === 'fromDate').value
+      const toDate = params.filters.find(data => data.name === 'toDate').value
+
+      if (!bizplaceId || !fromDate || !toDate) throw new Error('Invalid input')
+
+      const items = await getRepository(Sequence).query(`
+        SELECT "date", "type", "count", "bizplace_id" FROM (
+          SELECT
+          "sq"."pattern"::JSONB ->> 'type' AS "type",
+          "sq"."pattern"::JSONB ->> 'date' AS "date",
+          "sq"."pattern"::JSONB ->> 'bizplaceId' AS "bizplace_id",
+          "sq"."seq" AS "count"
+          FROM "sequences" "sq" WHERE "sq"."type" = '${SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER}'
+          AND "sq"."domain_id" = '${domain.id}'
+        ) AS foo
+        WHERE "bizplace_id" = '${bizplaceId}'
+        ${type ? `AND "type" ilike '%${type}%'` : ''}
+        AND "date"::date BETWEEN '${fromDate}' AND '${toDate}'
+      `)
+
+      // @farishelmi any usage for this function? If no please remove.
+      /* 
+      need to transform into queryBuilder form
+      const qb: SelectQueryBuilder<Sequence> = tx
+        .getRepository(Sequence)
+        .createQueryBuilder('sq')
+        .select(`"sq"."pattern"::JSONB ->> 'type'`, 'type')
+        .addSelect(`"sq"."pattern"::JSONB ->> 'date'`, 'date')
+        .addSelect(`"sq"."pattern"::JSONB ->> 'bizplaceId'`, 'bizplace_id')
+        .addSelect(`"sq"."seq"`, 'count')
+        .where('"sq"."type" = :sequenceType', { sequenceType: SEQUENCE_TYPE.PRODUCT_LABEL_COUNTER })
+        .andWhere(`"sq"."pattern"::JSONB ->> 'bizplaceId' = :bizplaceId`, { bizplaceId })
+        .andWhere(`"sq"."domain_id" = :domainId`, { domainId: domain.id }) 
+      */
+
+      return {
+        items,
+        total: 0
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/types/index.ts

@@ -5,6 +5,7 @@ import * as Dashboard from './dashboard'
 import * as Extra from './extra'
 import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
+import * as InventoryComparison from './inventory-comparison'
 
 export const queries = [
   BoardSetting.Query,
@@ -12,7 +13,8 @@ export const queries = [
   CustomKimeda.Query,
   Dashboard.Query,
   OpaMenu.Query,
-  Reports.Query
+  Reports.Query,
+  InventoryComparison.Query
 ]
 
 export const mutations = [Extra.Mutation]
@@ -22,5 +24,6 @@ export const types = [
   ...CustomElccl.Types,
   ...Dashboard.Types,
   ...OpaMenu.Types,
-  ...Reports.Types
+  ...Reports.Types,
+  ...InventoryComparison.Types
 ]

package/server/graphql/types/inventory-comparison/index.ts

@@ -0,0 +1,11 @@
+import { InventoryComparison } from "./inventory-comparison";
+import { InventoryComparisonList } from "./inventory-comparison-list";
+
+export const Query = `
+  inventoryComparisonList(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InventoryComparisonList @privilege(category: "inventory_comparison", privilege: "query") @transaction
+`
+
+export const Types = [
+  InventoryComparison,
+  InventoryComparisonList
+]