@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/server/graphql/resolvers/dashboard/arrival-notices-by-status.ts

@@ -1,25 +1,34 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { ArrivalNotice } from '@things-factory/sales-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 export const arrivalNoticesByStatusResolver = {
-  async arrivalNoticesByStatus(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async arrivalNoticesByStatus(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user } = context.state
+    const bizplaceId: string = params.filters.find((filter: any) => filter.name === 'bizplace')?.value || 'ALL'
+    params.filters = params.filters.filter(filter => filter.name !== 'bizplace')
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i)
+    let bizplaceIds: string
 
-    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-      params.filters.push({
-        name: 'bizplaceId',
-        operator: 'in',
-        value: await getPermittedBizplaceIds(domain, user),
-        relation: false
-      })
-    }
+    if (bizplaceId && (bizplaceId == 'ALL' || bizplaceId.match(v4))) {
+      let bizplaces: string[] =
+        bizplaceId && bizplaceId != 'ALL' ? [bizplaceId] : await getPermittedBizplaceIds(domain, user)
+      bizplaceIds = bizplaces
+        .map(bizplace => {
+          return "'" + bizplace?.trim() + "'"
+        })
+        .join(',')
+    } else throw new Error('invalid bizplaceId')
 
     const qb: SelectQueryBuilder<ArrivalNotice> = getRepository(ArrivalNotice).createQueryBuilder('an')
     buildQuery(qb, params, context)
-    return qb.select('an.status', 'status').addSelect('COUNT(*) AS count').groupBy('an.status').getRawMany()
+    return qb
+      .select('an.status', 'status')
+      .addSelect('COUNT(*) AS count')
+      .andWhere(`an.bizplace_id IN (${bizplaceIds})`)
+      .groupBy('an.status')
+      .getRawMany()
   }
 }

package/server/graphql/resolvers/dashboard/collection-orders-by-status.ts

@@ -1,13 +1,12 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { CollectionOrder } from '@things-factory/sales-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 export const collectionOrdersByStatusResolver = {
-  async collectionOrdersByStatus(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async collectionOrdersByStatus(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user } = context.state
 
     if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
       params.filters.push({

package/server/graphql/resolvers/dashboard/delivery-orders-by-status.ts

@@ -1,13 +1,12 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { DeliveryOrder } from '@things-factory/sales-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 export const deliveryOrdersByStatusResolver = {
-  async deliveryOrdersByStatus(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async deliveryOrdersByStatus(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user } = context.state
 
     if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
       params.filters.push({

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

@@ -4,6 +4,7 @@ import { deliveryOrdersByStatusResolver } from './delivery-orders-by-status'
 import { inventoryExpiryMonitorResolver } from './inventory-expiry-monitor'
 import { outboundOrderByStatusResolver } from './outbound-order-by-status'
 import { releaseGoodsByStatusResolver } from './release-goods-by-status'
+import { unitInboundedOutboundedResolver } from './unit-inbounded-outbounded'
 
 export const Query = {
   ...arrivalNoticesByStatusResolver,
@@ -11,5 +12,6 @@ export const Query = {
   ...deliveryOrdersByStatusResolver,
   ...releaseGoodsByStatusResolver,
   ...outboundOrderByStatusResolver,
-  ...inventoryExpiryMonitorResolver
+  ...inventoryExpiryMonitorResolver,
+  ...unitInboundedOutboundedResolver
 }

package/server/graphql/resolvers/dashboard/inventory-expiry-monitor.ts

@@ -1,11 +1,22 @@
-import { EntityManager } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Domain, ListParam } from '@things-factory/shell'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ListParam } from '@things-factory/shell'
 
 export const inventoryExpiryMonitorResolver = {
-  async inventoryExpiryMonitor(_: any, params: ListParam, context: any) {
-    const { domain, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async inventoryExpiryMonitor(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user, tx } = context.state
+    const bizplaceId: string = params.filters.find((filter: any) => filter.name === 'bizplace')?.value || 'ALL'
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i)
+    let bizplaceIds: string
+
+    if (bizplaceId && (bizplaceId == 'ALL' || bizplaceId.match(v4))) {
+      let bizplaces: string[] =
+        bizplaceId && bizplaceId != 'ALL' ? [bizplaceId] : await getPermittedBizplaceIds(domain, user)
+      bizplaceIds = bizplaces
+        .map(bizplace => {
+          return "'" + bizplace?.trim() + "'"
+        })
+        .join(',')
+    } else throw new Error('invalid bizplaceId')
 
     const expInventories: {
       location: string
@@ -27,6 +38,7 @@ export const inventoryExpiryMonitorResolver = {
         AND i.expiration_date NOTNULL
         AND i.status = 'STORED'
         AND i.domain_id = $1
+        AND i.bizplace_id IN (${bizplaceIds})
       ) AS foo
       GROUP BY "location"
     `,

package/server/graphql/resolvers/dashboard/outbound-order-by-status.ts

@@ -1,93 +1,126 @@
-import { EntityManager } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Domain, ListParam } from '@things-factory/shell'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ListParam } from '@things-factory/shell'
 
 export const outboundOrderByStatusResolver = {
-  async outboundOrderByStatus(_: any, params: ListParam, context: any) {
-    const { domain, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+  async outboundOrderByStatus(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user, tx } = context.state
+    const bizplaceId: string = params.filters.find((filter: any) => filter.name === 'bizplace')?.value || 'ALL'
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i)
+    let bizplaceIds: string
+
+    if (bizplaceId && (bizplaceId == 'ALL' || bizplaceId.match(v4))) {
+      let bizplaces: string[] =
+        bizplaceId && bizplaceId != 'ALL' ? [bizplaceId] : await getPermittedBizplaceIds(domain, user)
+      bizplaceIds = bizplaces
+        .map(bizplace => {
+          return "'" + bizplace?.trim() + "'"
+        })
+        .join(',')
+    } else throw new Error('invalid bizplaceId')
 
     const orderStatus: { status: string; count: number }[] = await tx.query(
       `
-      WITH cte_list ("status", "count") as (
-        select 'DONE' as status, 0 as "count"
-        union
-        select 'CANCELLED' as status, 0 as "count"
-        union
-        select 'PICKING UNASSIGNED' as status, 0 as "count"
-        union
-        select 'PACKING' as status, 0 as "count"
-        union
-        select 'AWAITING DISPATCH' as status, 0 as "count"
-        union
-        select 'OUT FROM WAREHOUSE' as status, 0 as "count"
-        union
-        select 'PICKING ASSIGNED' as status, 0 as "count"
-        union
-        select 'OTHERS' as status, 0 as "count"
-      ) select l."status", coalesce(src."count", l."count") as "count" 
-      from cte_list l
-      left join (
-        SELECT "status", COUNT(*) AS "count" FROM (
-          SELECT 
-            CASE WHEN "status" = 'DONE' and rg.updated_at::date = CURRENT_DATE THEN 'DONE' 
-              WHEN "status" = 'CANCELLED' THEN 'CANCELLED' 
-              WHEN "status" IN('PENDING_RECEIVE', 'PENDING_WORKSHEET') THEN 'PICKING UNASSIGNED'
-              END AS "status" 
-          FROM release_goods rg
-          WHERE "domain_id" = $1
-          AND rg."status" IN ('CANCELLED','PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'READY_TO_PICK', 'PICKING', 'READY_TO_PACK', 'PACKING', 'DONE')
-        ) AS foo 
+      WITH cte_list ("status", "count") AS (
+        SELECT 'PICKING UNASSIGNED' AS status, 0 AS "count"
+        UNION
+        SELECT 'PICKING ASSIGNED' AS status, 0 AS "count"
+        UNION
+        SELECT 'BATCH PICKING ASSIGNED' AS status, 0 AS "count"
+        UNION
+        SELECT 'PACKING' AS status, 0 AS "count"
+        UNION
+        SELECT 'AWAITING DISPATCH' AS status, 0 AS "count"
+        UNION
+        SELECT 'OUT FROM WAREHOUSE' AS status, 0 AS "count"
+        UNION
+        SELECT 'PENDING MANIFEST CREATION' AS status, 0 AS "count"
+        UNION
+        SELECT 'DONE' AS status, 0 AS "count"
+        UNION
+        SELECT 'PENDING CANCEL' AS status, 0 AS "count"
+        UNION
+        SELECT 'CANCELLED' AS status, 0 AS "count"
+        UNION
+        SELECT 'OTHERS' AS status, 0 AS "count"
+        UNION
+        SELECT 'DRAFT' AS status, 0 AS "count"
+      ) SELECT l."status", coalesce(src."count", l."count") AS "count" 
+      FROM cte_list l
+      LEFT JOIN (
+        SELECT "status", SUM("count") AS count FROM (
+          SELECT "status", COUNT(*) AS "count" FROM (
+            SELECT 
+              CASE WHEN "status" = 'DONE' AND rg.updated_at::date = CURRENT_DATE THEN 'DONE' 
+                WHEN "status" = 'PENDING_CANCEL' THEN 'PENDING CANCEL' 
+                WHEN "status" = 'CANCELLED' AND rg.updated_at::date = CURRENT_DATE THEN 'CANCELLED'
+                WHEN "status" IN('PENDING_RECEIVE','PENDING_WORKSHEET') THEN 'PICKING UNASSIGNED'
+                END AS "status" 
+            FROM release_goods rg
+            WHERE "domain_id" = $1
+            AND rg."bizplace_id" IN (${bizplaceIds})
+            AND rg."status" IN ('PENDING','PENDING_RECEIVE','PENDING_WORKSHEET','READY_TO_PICK','PICKING','READY_TO_PACK','PACKING','PENDING_CANCEL','CANCELLED','DONE')
+          ) AS foo 
+          GROUP BY "status"
+          UNION ALL 
+          SELECT "status", COUNT(*) AS "count" FROM (
+            SELECT 
+              CASE WHEN "dispatchment_status" = 'DISPATCHED' AND rg.updated_at::date = CURRENT_DATE THEN 'OUT FROM WAREHOUSE' 
+                END AS "status" 
+            FROM release_goods rg
+            WHERE "domain_id" = $1
+            AND rg."bizplace_id" IN (${bizplaceIds})
+            AND rg."dispatchment_status" IN ('READY_TO_DISPATCH', 'DISPATCHED')
+            AND rg."tracking_no" NOTNULL
+            AND rg."type" = 'b2c'
+          ) AS foo 
+          GROUP BY "status"		
+          UNION ALL 
+          SELECT 'AWAITING DISPATCH' AS "status", count(*) FROM manifests m 
+          INNER JOIN release_goods rg ON rg.manifest_id = m.id
+          WHERE m."status" in ('OPEN', 'IN_QUEUE') 
+          AND m."domain_id" = $1
+          AND rg."bizplace_id" IN (${bizplaceIds})
+          UNION ALL
+          SELECT 'PICKING ASSIGNED' AS "status", count(*) FROM worksheets w 
+          WHERE w."domain_id" = $1 
+          AND w."bizplace_id" IN (${bizplaceIds})
+          AND w."type" = 'PICKING' 
+          AND w."status" IN ('DEACTIVATED','EXECUTING')
+          GROUP BY w."status"
+          UNION ALL
+          SELECT 'BATCH PICKING ASSIGNED' AS "status", count(*) FROM worksheets w 
+          WHERE w."domain_id" = $1 
+          AND w."bizplace_id" IN (${bizplaceIds})
+          AND w."type" = 'BATCH_PICKING' 
+          AND w."status" IN ('DEACTIVATED','EXECUTING')
+          GROUP BY w."status"
+          UNION ALL
+          SELECT 'PACKING' AS "status", count(*) FROM worksheets w 
+          WHERE w."domain_id" = $1 AND w."type" = 'PACKING' 
+          AND w."bizplace_id" IN (${bizplaceIds})
+          AND w."status" IN ('DEACTIVATED','EXECUTING')
+          GROUP BY w."status"
+          UNION ALL 
+          SELECT 'PENDING MANIFEST CREATION' AS "status", count(*) FROM release_goods rg
+          WHERE rg."domain_id" = $1
+          AND rg."bizplace_id" IN (${bizplaceIds})
+          AND rg."status" = 'DONE'
+          AND rg."manifest_id" ISNULL
+          AND rg."type" = 'b2c'
+          AND rg."updated_at" >= (CURRENT_DATE - 30)
+          UNION ALL
+          SELECT 'DRAFT' AS "status", count(*) FROM draft_release_goods drg 
+          WHERE drg."domain_id" = $1
+          AND drg."bizplace_id" IN (${bizplaceIds})
+          AND drg."status" = 'DRAFT'
+          AND drg."type" = 'b2c'
+        ) AS src
         GROUP BY "status"
-        UNION ALL 
-        SELECT "status", COUNT(*) AS "count" FROM (
-          SELECT 
-            CASE WHEN "dispatchment_status" = 'DISPATCHED' THEN 'OUT FROM WAREHOUSE' 
-              END AS "status" 
-          FROM release_goods rg
-          WHERE "domain_id" = $1
-          AND rg."dispatchment_status" IN ('READY_TO_DISPATCH', 'DISPATCHED')
-          AND rg."status" NOT IN ('CANCELLED', 'PENDING_CANCEL')
-          AND rg."tracking_no" NOTNULL
-        ) AS foo 
-        GROUP BY "status"		
-        union all 
-        select 'AWAITING DISPATCH' as "status", count(*) from manifests m 
-        inner join release_goods rg ON rg.manifest_id = m.id
-        where m."status" = 'OPEN' and m."domain_id" = $1
-        union all
-        select 'PICKING ASSIGNED' as "status", count(*) from worksheets w 
-        where w."domain_id" = $1 and w."type" ='PICKING' 
-        and w."status" in ('DEACTIVATED','EXECUTING','PENDING_CANCEL')
-        group by w."status"
-        union all
-        select 'PACKING' as "status", count(*) from worksheets w 
-        where w."domain_id" = $1 and w."type" ='PACKING' 
-        and w."status" in ('DEACTIVATED','EXECUTING','PENDING_CANCEL')
-        group by w."status"
-      ) src on src."status" = l."status"
+      ) src ON src."status" = l."status"
     `,
       [domain.id]
     )
 
-    const statusList: string[] = [
-      'PICKING UNASSIGNED',
-      'PICKING ASSIGNED',
-      'PACKING',
-      'AWAITING DISPATCH',
-      'OUT FROM WAREHOUSE',
-      'CANCELLED',
-      'DONE',
-      'OUT OF STOCK'
-    ]
-
-    return statusList.reduce((statusCounts: { status: string; count: number }[], status: string) => {
-      let foundItem = orderStatus.find(order => order.status == status)
-
-      if (foundItem) statusCounts.push({ status, count: foundItem.count })
-      else statusCounts.push({ status, count: 0 })
-
-      return statusCounts
-    }, [])
+    return orderStatus
   }
 }

package/server/graphql/resolvers/dashboard/release-goods-by-status.ts

@@ -1,25 +1,34 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { ReleaseGood } from '@things-factory/sales-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 export const releaseGoodsByStatusResolver = {
-  async releaseGoodsByStatus(_: any, params: ListParam, context: any) {
-    const { domain, user }: { domain: Domain; user: User } = context.state
+  async releaseGoodsByStatus(_: any, params: ListParam, context: ResolverContext) {
+    const { domain, user } = context.state
+    const bizplaceId: string = params.filters.find((filter: any) => filter.name === 'bizplace')?.value || 'ALL'
+    params.filters = params.filters.filter(filter => filter.name !== 'bizplace')
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i)
+    let bizplaceIds: string
 
-    if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-      params.filters.push({
-        name: 'bizplaceId',
-        operator: 'in',
-        value: await getPermittedBizplaceIds(domain, user),
-        relation: false
-      })
-    }
+    if (bizplaceId && (bizplaceId == 'ALL' || bizplaceId.match(v4))) {
+      let bizplaces: string[] =
+        bizplaceId && bizplaceId != 'ALL' ? [bizplaceId] : await getPermittedBizplaceIds(domain, user)
+      bizplaceIds = bizplaces
+        .map(bizplace => {
+          return "'" + bizplace?.trim() + "'"
+        })
+        .join(',')
+    } else throw new Error('invalid bizplaceId')
 
     const qb: SelectQueryBuilder<ReleaseGood> = getRepository(ReleaseGood).createQueryBuilder('rg')
     buildQuery(qb, params, context)
-    return qb.select('rg.status', 'status').addSelect('COUNT(*) AS count').groupBy('rg.status').getRawMany()
+    return qb
+      .select('rg.status', 'status')
+      .addSelect('COUNT(*) AS count')
+      .andWhere(`rg.bizplace_id IN (${bizplaceIds})`)
+      .groupBy('rg.status')
+      .getRawMany()
   }
 }

package/server/graphql/resolvers/dashboard/unit-inbounded-outbounded.ts

@@ -0,0 +1,61 @@
+import { getRepository, SelectQueryBuilder, EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+export const unitInboundedOutboundedResolver = {
+  async unitInboundedOutbounded(_: any, params: ListParam, context: any) {
+    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+    const bizplaceId: string = params.filters.find((filter: any) => filter.name === 'bizplace')?.value || 'ALL'
+    const fromDate: string = params.filters.find((filter: any) => filter.name === 'createdAt1')?.value
+    const toDate: string = params.filters.find((filter: any) => filter.name === 'createdAt2')?.value
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i)
+    let bizplaceIds: string
+
+    if (bizplaceId && (bizplaceId == 'ALL' || bizplaceId.match(v4))) {
+      let bizplaces: string[] =
+        bizplaceId && bizplaceId != 'ALL' ? [bizplaceId] : await getPermittedBizplaceIds(domain, user)
+      bizplaceIds = bizplaces
+        .map(bizplace => {
+          return "'" + bizplace?.trim() + "'"
+        })
+        .join(',')
+    } else throw new Error('invalid bizplaceId')
+
+    const orderStatus: { status: string; count: number }[] = await tx.query(
+      `
+        WITH cte_unit ("status", "count", "type") AS (
+          SELECT 'INBOUNDED' AS status, 0 AS "count", 'inbound' AS "type"
+          UNION
+          SELECT 'OUTBOUNDED' AS status, 0 AS "count", 'outbound' AS "type"
+        ) SELECT u."status", coalesce(src."count", u."count") AS "count", u."type"
+        FROM cte_unit u
+        LEFT JOIN (
+          SELECT "status", SUM("count") AS count, "type" FROM (
+            SELECT 'INBOUNDED' AS "status", SUM(coalesce(op.actual_pack_qty, op.pack_qty)) as "count", 'inbound' as "type" FROM order_products op
+            INNER JOIN arrival_notices an ON an.id = op.arrival_notice_id
+            WHERE an."status" in ('PUTTING_AWAY','DONE')
+            AND an."domain_id" = $1
+            AND an."bizplace_id" IN (${bizplaceIds})
+            AND an.created_at BETWEEN '${fromDate}' AND '${toDate}'
+            GROUP BY an."status"
+            UNION ALL
+            SELECT 'OUTBOUNDED' AS "status", SUM(coalesce(oi.release_qty , oi.picked_qty)) as "count", 'outbound' as "type" FROM order_inventories oi
+            INNER JOIN release_goods rg on rg.id = oi.release_good_id
+            WHERE rg."status" in ('DONE')
+            AND rg."domain_id" = $1
+            AND rg."bizplace_id" IN (${bizplaceIds})
+            AND rg.created_at BETWEEN '${fromDate}' AND '${toDate}'
+            GROUP BY rg."status"
+          ) AS src
+          GROUP BY "status", "type"
+        ) src ON src."status" = u."status"
+        order by "type", "status"
+      `,
+      [domain.id]
+    )
+
+    return orderStatus
+  }
+}

package/server/graphql/resolvers/index.ts

@@ -2,7 +2,7 @@ import * as BoardSetting from './board-setting'
 import * as CustomElccl from './custom/elccl'
 import * as CustomKimeda from './custom/kimeda'
 import * as Dashboard from './dashboard'
-import * as Extra from './extra'
+import * as Other from './other'
 import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
 import * as InventoryComparison from './inventory-comparison'
@@ -14,10 +14,11 @@ export const queries = [
   CustomElccl.Query,
   CustomKimeda.Query,
   Dashboard.Query,
+  InventoryComparison.Query,
   OpaMenu.Query,
+  Other.Query,
   Reports.Query,
-  InventoryComparison.Query,
-  ShippingProviders.Query,
+  ShippingProviders.Query
 ]
 
-export const mutations = [Extra.Mutation,WarehouseInventoryAdjustment.Mutation]
+export const mutations = [Other.Mutation, WarehouseInventoryAdjustment.Mutation]

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

@@ -1,12 +1,12 @@
-import { onhandInventories } from '@things-factory/warehouse-base'
 import { ListParam } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+import { onhandInventories } from '@things-factory/warehouse-base'
+
 import { inventoryHistorySummaryReportQuery } from '../custom/elccl/elccl-inventory-history-summary-report'
 
 export const inventoryComparisonList = {
-  async inventoryComparisonList(_: any, params: ListParam, context: any) {
+  async inventoryComparisonList(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       let bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
 
@@ -58,7 +58,7 @@ export const inventoryComparisonList = {
         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 
@@ -70,13 +70,16 @@ export const inventoryComparisonList = {
         );
       `)
 
-      let sumData = await tx.query(`
+      let sumData = await tx.query(
+        `
         select * from tmp_inv_comp
         offset $1 limit $2
-      `, [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit])
+      `,
+        [(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 => {
@@ -91,7 +94,6 @@ export const inventoryComparisonList = {
       })
 
       return { items, total }
-
     } catch (error) {
       throw error
     }

package/server/graphql/resolvers/opa-menu/opa-menus.ts

@@ -1,10 +1,11 @@
+import { In, SelectQueryBuilder } from 'typeorm'
+
 import { Role, User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import { Menu } from '@things-factory/menu-base'
-import { getRepository, SelectQueryBuilder, In } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
 
 export const opaMenusResolver = {
-  async opaMenus(_: any, _params: any, context: any) {
+  async opaMenus(_: any, _params: any, context: ResolverContext) {
     let menus: Menu[] = []
     if (context?.state?.domain?.id && context?.state?.user?.id) {
       try {
@@ -44,7 +45,7 @@ export const opaMenusResolver = {
 
 async function getNonRestrictedMenus(domain: Domain): Promise<Menu[]> {
   const menus: Menu[] = await getRepository(Menu).find({
-    where: { domain, hiddenFlag: false, menuType: 'MENU' },
+    where: { domain: { id: domain.id }, hiddenFlag: false, menuType: 'MENU' },
     relations: ['parent', 'children', 'children.roles'],
     order: { rank: 'ASC' }
   })
@@ -58,11 +59,11 @@ async function getNonRestrictedMenus(domain: Domain): Promise<Menu[]> {
 
 async function getRestrictedMenus(roleIds: string[], domain: Domain): Promise<Menu[]> {
   const menus: Menu[] = await getRepository(Menu).find({
-    where: { domain, hiddenFlag: false, menuType: 'MENU' },
+    where: { domain: { id: domain.id }, hiddenFlag: false, menuType: 'MENU' },
     relations: ['parent', 'children', 'children.roles'],
     order: { rank: 'ASC' }
   })
-  const userRoles: Role[] = await getRepository(Role).find({ where: { domain, id: In(roleIds) } })
+  const userRoles: Role[] = await getRepository(Role).find({ where: { domain: { id: domain.id }, id: In(roleIds) } })
 
   menus.forEach(menu => {
     menu.children = menu.children.filter(child => {