@things-factory/warehouse-base 3.7.1 → 3.7.6

package/server/graphql/resolvers/inventory/inventories-by-strategy.ts

@@ -1,12 +1,25 @@
-import { getRepository, EntityManager } from 'typeorm'
+import { EntityManager } from 'typeorm'
+
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
+
 import { Inventory } from '../../../entities'
 
 export const inventoriesByStrategyResolver = {
   async inventoriesByStrategy(
     _: any,
-    { worksheetId, batchId, bizplaceId, productName, productSku, packingType, pickingStrategy, locationSortingRules },
+    {
+      worksheetId,
+      batchId,
+      bizplaceId,
+      productName,
+      productSku,
+      packingType,
+      packingSize,
+      uom,
+      pickingStrategy,
+      locationSortingRules
+    },
     context: any
   ) {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
@@ -24,7 +37,18 @@ export const inventoriesByStrategyResolver = {
     }
 
     return inventoriesByStrategy(
-      { worksheetId, batchId, bizplaceId, productName, productSku, packingType, pickingStrategy, locationSortingRules },
+      {
+        worksheetId,
+        batchId,
+        bizplaceId,
+        productName,
+        productSku,
+        packingType,
+        packingSize,
+        uom,
+        pickingStrategy,
+        locationSortingRules
+      },
       domain,
       tx
     )
@@ -32,7 +56,18 @@ export const inventoriesByStrategyResolver = {
 }
 
 export async function inventoriesByStrategy(
-  { worksheetId, batchId, bizplaceId, productName, productSku, packingType, pickingStrategy, locationSortingRules },
+  {
+    worksheetId,
+    batchId,
+    bizplaceId,
+    productName,
+    productSku,
+    packingType,
+    packingSize,
+    uom,
+    pickingStrategy,
+    locationSortingRules
+  },
   domain: Domain,
   trxMgr: EntityManager
 ) {
@@ -59,12 +94,16 @@ export async function inventoriesByStrategy(
     .andWhere('"PROD"."name" = :productName')
     .andWhere('"PROD"."sku" = :productSku')
     .andWhere('"INV"."packing_type" = :packingType')
+    .andWhere('"INV"."packing_size" = :packingSize')
+    .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
     .setParameters({
       domainId: domain.id,
       productName,
       productSku,
-      packingType
+      packingType,
+      packingSize,
+      uom
     })
 
   if (batchId !== '') {

package/server/graphql/resolvers/inventory/inventories.ts

@@ -1,8 +1,10 @@
+import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { buildQuery, Domain } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder, Brackets } from 'typeorm'
+
 import { Inventory, InventoryChange } from '../../../entities'
 
 export const inventoriesResolver = {
@@ -12,7 +14,7 @@ export const inventoriesResolver = {
     const productFilters = filters.find(x => x.name == 'product_info')
     filters = filters.filter(x => x.name != 'product_info')
     const params = { filters, pagination }
-    
+
     if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
       params.filters.push({
         name: 'bizplace',
@@ -67,20 +69,23 @@ export const inventoriesResolver = {
       qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0')
     }
 
-    if(productFilters){
+    if (productFilters) {
       let productFilterValue = `%${productFilters.value.toLowerCase()}%`
-      qb.andWhere((qb) => {
-        const subQuery = qb.subQuery()
-            .select()
-            .from(Product, `products`)
-            .where(`products.id = iv.product_id`)
-            .andWhere(new Brackets(qb => {
-              qb.where("Lower(products.sku) LIKE :productInfo", { productInfo: productFilterValue})
-                .orWhere("Lower(products.name) LIKE :productInfo", { productInfo: productFilterValue})
-                .orWhere("Lower(products.description) LIKE :productInfo", { productInfo: productFilterValue})
-            }))          
-            .getQuery();
-        return `EXISTS ${subQuery}`;
+      qb.andWhere(qb => {
+        const subQuery = qb
+          .subQuery()
+          .select()
+          .from(Product, `products`)
+          .where(`products.id = iv.product_id`)
+          .andWhere(
+            new Brackets(qb => {
+              qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
+                .orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
+                .orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
+            })
+          )
+          .getQuery()
+        return `EXISTS ${subQuery}`
       })
     }
 
@@ -115,6 +120,14 @@ export const inventoriesResolver = {
         const selectedQty = item.lockedQty ? item.lockedQty : 0
         const selectedUomValue = item.lockedUomValue ? item.lockedUomValue : 0
 
+        item.product['productDetails'] = await getRepository(ProductDetail).find({
+          where: {
+            product: item.product.id,
+            packingType: item.packingType,
+            packingSize: item.packingSize
+          }
+        })
+
         return {
           ...item,
           changeCount: inventoryChangeCount,

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

@@ -11,7 +11,7 @@ import { inventoryHistoryPalletReport } from './inventory-history-pallet-report'
 import { inventoryHistoryPalletDetailReport } from './inventory-history-pallet-detail-report'
 import { inventoryHistoryPalletStorageReport } from './inventory-history-pallet-storage-report'
 import { inventoryHistorySummaryReport } from './inventory-history-summary-report'
-import { onhandInventoriesResolver } from './onhand-inventories'
+import { onhandInventoriesResolver, onhandInventories } from './onhand-inventories'
 
 export const Query = {
   ...inventoryHistoriesResolver,
@@ -32,3 +32,6 @@ export const Mutation = {
   ...deleteInventoryHistory,
   ...deleteInventoryHistories
 }
+
+
+export { onhandInventories }

package/server/graphql/resolvers/inventory-history/onhand-inventories.ts

@@ -6,232 +6,239 @@ import { Domain } from '@things-factory/shell'
 
 export const onhandInventoriesResolver = {
   async onhandInventories(_: any, { filters, pagination, sortings, locationSortingRules }, context: any) {
-    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
-
-    // define all inputs
-    let userFilter = filters.find(data => data.name === 'user')
-    let product = filters.find(data => data.name === 'product')
-    let createdAt = filters.find(data => data.name === 'created_at')
-    let location = filters.find(data => data.name === 'location')
-    let batchId = filters.find(data => data.name === 'batchId')
-    let palletId = filters.find(data => data.name === 'palletId')
-    let cartonId = filters.find(data => data.name === 'cartonId')
-    let packingType = filters.find(data => data.name === 'packingType')
-    let timezoneOffset = filters.find(data => data.name === 'timezoneOffset').value + ' minutes'
-
-    // expiration date filter
-    let expiration = filters.find(data => data.name === 'expiration').value
-    let expFromDate = filters.find(data => data.name === 'expFromDate')
-    let expToDate = filters.find(data => data.name === 'expToDate')
-
-    let bizplaceFilter = { name: '', operator: '', value: [] }
-
-    // prepare query filters
-    if (userFilter) {
-      const user: User = await tx.getRepository(User).findOne({
-        where: { id: userFilter.value },
-        relations: ['bizplaces']
-      })
+    return await onhandInventories(filters, pagination, sortings, locationSortingRules, context)
+  }
+}
 
-      const bizplace: Bizplace = user.bizplaces[0]
-
-      if (!bizplace) throw 'Invalid input'
-
-      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
-          }
-        : {
-            ...filters.find(data => data.name === 'bizplace'),
-            value: [filters.find(data => data.name === 'bizplace').value]
-          }
-    }
+export async function onhandInventories(
+  filters,
+  pagination,
+  sortings,
+  locationSortingRules,
+  context,
+  setPagination = true
+) {
+  const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+
+  // define all inputs
+  let userFilter = filters.find(data => data.name === 'user')
+  let product = filters.find(data => data.name === 'product')
+  let createdAt = filters.find(data => data.name === 'created_at')
+  let location = filters.find(data => data.name === 'location')
+  let batchId = filters.find(data => data.name === 'batchId')
+  let palletId = filters.find(data => data.name === 'palletId')
+  let cartonId = filters.find(data => data.name === 'cartonId')
+  let packingType = filters.find(data => data.name === 'packingType')
+  let timezoneOffset = filters.find(data => data.name === 'timezoneOffset').value + ' minutes'
+
+  // expiration date filter
+  let expiration = filters.find(data => data.name === 'expiration').value
+  let expFromDate = filters.find(data => data.name === 'expFromDate')
+  let expToDate = filters.find(data => data.name === 'expToDate')
+
+  let bizplaceFilter = { name: '', operator: '', value: [] }
+
+  // prepare query filters
+  if (userFilter) {
+    const user: User = await tx.getRepository(User).findOne({
+      where: { id: userFilter.value },
+      relations: ['bizplaces']
+    })
 
-    let queryFilter = ``
-    let bizplaces = bizplaceFilter.value.map(id => `('${id}')`).join(',')
-
-    if (product) {
-      let products = product.value
-        .toLowerCase()
-        .split(',')
-        .map(prod => {
-          return "'%" + prod.trim().replace(/'/g, "''") + "%'"
-        })
-        .join(',')
-
-      queryFilter =
-        queryFilter +
-        ` and exists (
-            select prd.id as product_id from products prd
-            inner join bizplaces b on b.id = prd.bizplace_id 
-            inner join companies c on c.domain_id = b.domain_id 
-            inner join bizplaces b2 on b2.company_id = c.id
-            where exists (
-              SELECT * FROM tmp_bizfilter bizFilter
-              WHERE bizFilter.bizplace_id = "b2"."id"
-            )
-            and (lower(prd.name) like any(array[${products}])
-            or lower(prd.description) like any(array[${products}])
-            or lower(prd.sku) like any(array[${products}]))
-            and prd.id = rih.product_id
-            group by prd.id
-        )`
-    }
+    const bizplace: Bizplace = user.bizplaces[0]
 
-    if (location) {
-      let locations = location.value
-        .map(loc => {
-          return "'" + loc + "'"
-        })
-        .join(',')
-
-      queryFilter =
-        queryFilter +
-        `and exists (
-          select loc.id from locations loc where
-          loc.id = any(array[${locations}]::uuid[])
-          and loc.id = rih.location_id
-        )`
-    }
+    if (!bizplace) throw 'Invalid input'
 
-    // default sorting
-    let queryOrder = 'order by created_at desc'
-    if (sortings && sortings.length > 0) {
-      const arrObjectMap = [
-        { name: 'palletId', value: 'rih.pallet_id' },
-        { name: 'cartonId', value: 'rih.carton_id' },
-        { name: 'batchId', value: 'rih.batch_id' },
-        { name: 'initialInboundAt', value: 'rih.initial_inbound_at' },
-        { name: 'bizplace|name', value: 'bz.name' },
-        { name: 'product|name', value: 'prd.sku' },
-        { name: 'remainQty', value: 'rih.qty' },
-        { name: 'location|name', value: 'loc.name' }
-      ]
-      sortings.forEach((sorting, idx) => {
-        let itmIndex = arrObjectMap.findIndex(x => x.name === sorting.name)
-
-        queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${
-          itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name
-        } ${sorting.desc ? 'DESC' : 'ASC'}`
-      })
-    }
-
-    if (batchId) queryFilter = `${queryFilter} and lower(rih.batch_id) like '${batchId.value.toLowerCase()}' `
+    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
+        }
+      : {
+          ...filters.find(data => data.name === 'bizplace'),
+          value: [filters.find(data => data.name === 'bizplace').value]
+        }
+  }
 
-    if (palletId) queryFilter = `${queryFilter} and rih.pallet_id like '${palletId.value}' `
+  let queryFilter = ``
+  let bizplaces = bizplaceFilter.value.map(id => `('${id}')`).join(',')
 
-    if (cartonId) queryFilter = `${queryFilter} and rih.carton_id like '${cartonId.value}' `
+  if (product) {
+    let products = product.value
+      .toLowerCase()
+      .split(',')
+      .map(prod => {
+        return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+      })
+      .join(',')
+
+    queryFilter =
+      queryFilter +
+      ` and exists (
+          select prd.id as product_id from products prd
+          inner join bizplaces b on b.id = prd.bizplace_id 
+          inner join companies c on c.domain_id = b.domain_id 
+          inner join bizplaces b2 on b2.company_id = c.id
+          where exists (
+            SELECT * FROM tmp_bizfilter bizFilter
+            WHERE bizFilter.bizplace_id = "b2"."id"
+          )
+          and (lower(prd.name) like any(array[${products}])
+          or lower(prd.description) like any(array[${products}])
+          or lower(prd.sku) like any(array[${products}]))
+          and prd.id = rih.product_id
+          group by prd.id
+      )`
+  }
 
-    if (packingType) queryFilter = `${queryFilter} and rih.packing_type like '${packingType.value}' `
+  if (location) {
+    let locations = location.value
+      .map(loc => {
+        return "'" + loc + "'"
+      })
+      .join(',')
+
+    queryFilter =
+      queryFilter +
+      `and exists (
+        select loc.id from locations loc where
+        loc.id = any(array[${locations}]::uuid[])
+        and loc.id = rih.location_id
+      )`
+  }
 
-    let expirationQueryFilter = ``
-    if (expiration)
-      expirationQueryFilter = ` and iv.expiration_date >= '${expFromDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL and 
-      iv.expiration_date <= '${expToDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL + '1 day'::INTERVAL`
+  // default sorting
+  let queryOrder = 'order by created_at desc'
+  if (sortings && sortings.length > 0) {
+    const arrObjectMap = [
+      { name: 'palletId', value: 'rih.pallet_id' },
+      { name: 'cartonId', value: 'rih.carton_id' },
+      { name: 'batchId', value: 'rih.batch_id' },
+      { name: 'initialInboundAt', value: 'rih.initial_inbound_at' },
+      { name: 'bizplace|name', value: 'bz.name' },
+      { name: 'product|name', value: 'prd.sku' },
+      { name: 'remainQty', value: 'rih.qty' },
+      { name: 'location|name', value: 'loc.name' }
+    ]
+    sortings.forEach((sorting, idx) => {
+      let itmIndex = arrObjectMap.findIndex(x => x.name === sorting.name)
+
+      queryOrder = `${idx === 0 ? 'order by' : queryOrder + ','} ${
+        itmIndex >= 0 ? arrObjectMap[itmIndex].value : sorting.name
+      } ${sorting.desc ? 'DESC' : 'ASC'}`
+    })
+  }
 
-    // query the results
-    await tx.query(`
-      CREATE TEMP TABLE tmp_bizfilter AS (
-        SELECT bizplace_id::uuid FROM (VALUES ${bizplaces}) AS bizFilter(bizplace_id)
-      );
-    `)
-
-    await tx.query(
-      `
-      create temp table tmp_src as (
-        select domain_id, pallet_id, carton_id, seq, qty, uom_value, packing_type, batch_id, batch_id_ref, created_at, status,
-        product_id::uuid as product_id, bizplace_id::uuid as bizplace_id, location_id::uuid as location_id 
-        from reduced_inventory_histories rih 
-        where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
+  if (batchId) queryFilter = `${queryFilter} and lower(rih.batch_id) like '${batchId.value.toLowerCase()}' `
+
+  if (palletId) queryFilter = `${queryFilter} and rih.pallet_id like '${palletId.value}' `
+
+  if (cartonId) queryFilter = `${queryFilter} and rih.carton_id like '${cartonId.value}' `
+
+  if (packingType) queryFilter = `${queryFilter} and rih.packing_type like '${packingType.value}' `
+
+  let expirationQueryFilter = ``
+  if (expiration)
+    expirationQueryFilter = ` and iv.expiration_date >= '${expFromDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL and 
+    iv.expiration_date <= '${expToDate.value}'::timestamp + '${timezoneOffset}'::INTERVAL + '1 day'::INTERVAL`
+
+  // query the results
+  await tx.query(`
+    CREATE TEMP TABLE tmp_bizfilter on commit drop AS (
+      SELECT bizplace_id::uuid FROM (VALUES ${bizplaces}) AS bizFilter(bizplace_id)
+    );
+  `)
+
+  await tx.query(
+    `
+    create temp table tmp_src on commit drop as (
+      select domain_id, pallet_id, carton_id, seq, qty, uom_value, packing_type, batch_id, batch_id_ref, created_at, status,
+      product_id::uuid as product_id, bizplace_id::uuid as bizplace_id, location_id::uuid as location_id 
+      from reduced_inventory_histories rih 
+      where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
+    );
+  `,
+    [domain.id, createdAt.value, timezoneOffset]
+  )
+
+  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, iv.uom, 
+        iv.expiration_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
+        ) 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 and rih.status <> 'TERMINATED'
+        inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id
+        where exists (
+          SELECT * FROM tmp_bizfilter bizFilter
+          WHERE bizFilter.bizplace_id = "rih"."bizplace_id"
+        )
+        ${queryFilter}
+        ${expirationQueryFilter}
       );
-    `,
-      [domain.id, createdAt.value, timezoneOffset]
-    )
-
-    await tx.query(
-      `          
-        create temp table tmp_data 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, iv.uom, 
-          iv.expiration_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
-          ) 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 and rih.status <> 'TERMINATED'
-          inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id
-          where exists (
-            SELECT * FROM tmp_bizfilter bizFilter
-            WHERE bizFilter.bizplace_id = "rih"."bizplace_id"
-          )
-          ${queryFilter}
-          ${expirationQueryFilter}
-        );
-      `
-    )
-
-    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.initial_inbound_at as "initialInboundAt",
-          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,
-          prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
-          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.expiration_date as "expirationDate"
-          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
-          WHERE 1 = 1
-          ${queryOrder}
-          OFFSET $1 LIMIT $2;
-      `,
-      [(pagination.page - 1) * pagination.limit, pagination.limit]
-    )
-
-    tx.query(`
-      drop table tmp_src, tmp_data, tmp_bizfilter
-    `)
-
-    // map all results
-    let items = result.map(itm => {
-      return {
-        ...itm,
-        bizplace: {
-          id: itm.bizplace_id,
-          name: itm.bizplace_name
-        },
-        location: {
-          id: itm.location_id,
-          name: itm.location_name,
-          type: itm.location_type,
-          zone: itm.location_zone
-        },
-        product: {
-          id: itm.product_id,
-          name: itm.product_name,
-          description: itm.product_description,
-          sku: itm.product_sku
-        }
+    `
+  )
+
+  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.initial_inbound_at as "initialInboundAt",
+        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,
+        prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.description as product_description,
+        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.expiration_date as "expirationDate"
+        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
+        WHERE 1 = 1
+        ${queryOrder}
+        ${setPagination ? 'OFFSET ' + (pagination.page - 1) * pagination.limit + ' LIMIT ' + pagination.limit : ''}
+        ;
+    `
+  )
+
+  // map all results
+  let items = result.map(itm => {
+    return {
+      ...itm,
+      bizplace: {
+        id: itm.bizplace_id,
+        name: itm.bizplace_name
+      },
+      location: {
+        id: itm.location_id,
+        name: itm.location_name,
+        type: itm.location_type,
+        zone: itm.location_zone
+      },
+      product: {
+        id: itm.product_id,
+        name: itm.product_name,
+        description: itm.product_description,
+        sku: itm.product_sku
       }
-    })
+    }
+  })
 
-    return { items, total: total[0].count }
-  }
+  return { items, total: total[0].count }
 }

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

@@ -44,7 +44,7 @@ export const Query = /* GraphQL */ `
   inventory(palletId: String!): Inventory @privilege(category: "inventory", privilege: "query") 
   inventoryByPallet(palletId: String!): Inventory @privilege(category: "inventory", privilege: "query") 
   inventoriesByProduct(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InventoryList @privilege(category: "inventory", privilege: "query") @transaction
-  inventoriesByStrategy(worksheetId: String!, batchId: String!, bizplaceId: String, productName: String!, productSku: String!, packingType: String!, pickingStrategy: String! locationSortingRules: [Sorting]): InventoryList @transaction
+  inventoriesByStrategy(worksheetId: String!, batchId: String!, bizplaceId: String, productName: String!, productSku: String!, packingType: String!, packingSize: Float!, uom: String!, pickingStrategy: String! locationSortingRules: [Sorting]): InventoryList @transaction
   checkProductIdenticality(palletA: String!, palletB: String!): Boolean @transaction
   checkCartonIdenticality(cartonA: String!, palletA: String!, cartonB: String!): Boolean
   checkInventoryOwner(palletId: String!, bizplaceName: String!): Boolean

package/server/graphql/types/inventory/inventory-bundle-group.ts

@@ -20,6 +20,7 @@ export const InventoryBundleGroup = gql`
     releaseQty: Int
     remainUomValue: Float
     lockedUomValue: Float
+    uom: String
     releaseUomValue: Float
     releaseUomValueWithUom: String
     packingType: String

package/server/index.ts

@@ -3,5 +3,6 @@ export * from './entities'
 export * from './graphql'
 export { createLocation, deleteLocation, deleteLocations, updateLocation } from './graphql/resolvers/location'
 export { createWarehouse, deleteWarehouse, deleteWarehouses, updateWarehouse } from './graphql/resolvers/warehouse'
+export { onhandInventories } from './graphql/resolvers/inventory-history/onhand-inventories'
 export * from './migrations'
 export * from './utils'