@things-factory/warehouse-base 7.0.0-alpha.9 → 7.0.0-y.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "7.0.0-alpha.9",
+  "version": "7.0.0-y.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^7.0.0-alpha.9",
-    "@things-factory/id-rule-base": "^7.0.0-alpha.9",
-    "@things-factory/integration-sellercraft": "^7.0.0-alpha.9",
-    "@things-factory/marketplace-base": "^7.0.0-alpha.9",
-    "@things-factory/product-base": "^7.0.0-alpha.9",
-    "@things-factory/setting-base": "^7.0.0-alpha.9"
+    "@things-factory/biz-base": "^7.0.0-alpha.22",
+    "@things-factory/id-rule-base": "^7.0.0-alpha.22",
+    "@things-factory/integration-sellercraft": "^7.0.0-y.0",
+    "@things-factory/marketplace-base": "^7.0.0-y.0",
+    "@things-factory/product-base": "^7.0.0-alpha.22",
+    "@things-factory/setting-base": "^7.0.0-alpha.22"
   },
-  "gitHead": "99fc5aead211b3c82e3ebbf76e8d5d1db01b1ddc"
+  "gitHead": "4fce83c3ef32c7f5c06309d05eb5917a095983b6"
 }

package/server/index.ts

@@ -1,14 +1,9 @@
 export * from './constants'
 export { createLocation, deleteLocation, deleteLocations, updateLocation } from './service/location/location-mutation'
-export {
-  createWarehouse,
-  deleteWarehouse,
-  deleteWarehouses,
-  updateWarehouse
-} from './service/warehouse/warehouse-mutation'
+export { createWarehouse, deleteWarehouse, deleteWarehouses, updateWarehouse } from './service/warehouse/warehouse-mutation'
 export * from './migrations'
 export * from './utils'
 export * from './service'
 export * from './service/inventory/inventory-query'
-
+export { updateMultipleInventory } from './service/inventory/inventory-mutation'
 export { approveInventoryChanges } from './service/inventory-change/inventory-change-mutation'

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

@@ -88,224 +88,7 @@ export class InventoryMutation {
   @Directive('@transaction')
   @Mutation(returns => [Inventory])
   async updateMultipleInventory(@Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[], @Ctx() context: ResolverContext): Promise<Inventory[]> {
-    const { domain, user, tx } = context.state
-
-    let results = []
-    const _createRecords = patches.filter((patch: any) => !patch.id)
-    const _updateRecords = patches.filter((patch: any) => patch.id)
-
-    const inventoryRepo = tx.getRepository(Inventory)
-    if (_createRecords.length > 0) {
-      let today = new Date()
-      let year = today.getFullYear()
-      let month = today.getMonth()
-      let date = today.getDate()
-
-      for (let i = 0; i < _createRecords.length; i++) {
-        const total = await tx.getRepository(Inventory).countBy({
-          createdAt: MoreThan(new Date(year, month, date))
-        })
-
-        const newRecord = _createRecords[i]
-
-        if (newRecord.location && newRecord.location.id) {
-          var location = await tx.getRepository(Location).findOne({
-            where: { id: newRecord.location.id },
-            relations: ['warehouse']
-          })
-          newRecord.location = location
-          newRecord.zone = location.zone
-          newRecord.warehouse = location.warehouse
-        }
-
-        if (newRecord.bizplace && newRecord.bizplace.id) {
-          newRecord.bizplace = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.bizplace.id })) as any
-        }
-
-        if (newRecord.product && newRecord.product.id) {
-          var product = (await tx.getRepository(Product).findOneBy({ id: newRecord.product.id })) as any
-          newRecord.product = product
-        }
-
-        let palletId =
-          'P' +
-          year.toString().substr(year.toString().length - 2) +
-          ('0' + (month + 1).toString()).substr(('0' + (month + 1).toString()).toString().length - 2) +
-          ('0' + date.toString()).substr(('0' + date.toString()).length - 2) +
-          ('0000' + (total + 1).toString()).substr(('0000' + (total + 1).toString()).length - 4)
-
-        newRecord.name = palletId
-        newRecord.status = newRecord.qty < 1 ? 'TERMINATED' : 'STORED'
-        newRecord.palletId = palletId
-
-        const result = await inventoryRepo.save({
-          domain: domain,
-          creator: user,
-          updater: user,
-          lastSeq: 0,
-          ...newRecord
-        } as any)
-
-        await tx.getRepository(InventoryHistory).save({
-          ...newRecord,
-          domain: domain,
-          creator: user,
-          updater: user,
-          name: InventoryNoGenerator.inventoryHistoryName(),
-          seq: 0,
-          transactionType: 'NEW',
-          productId: newRecord.product.id,
-          warehouseId: newRecord.warehouse.id,
-          locationId: newRecord.location.id
-        })
-
-        results.push({ ...result, cuFlag: '+' })
-      }
-    }
-
-    if (_updateRecords.length > 0) {
-      for (let i = 0; i < _updateRecords.length; i++) {
-        const newRecord = _updateRecords[i]
-        const newHistoryRecord = JSON.parse(JSON.stringify(_updateRecords[i]))
-        let transactionType = ''
-
-        let inventory = await inventoryRepo.findOne({
-          where: { id: newRecord.id },
-          relations: ['warehouse', 'location', 'product', 'bizplace']
-        })
-        newHistoryRecord.openingQty = inventory.qty
-        newHistoryRecord.openingUomValue = inventory.uomValue
-
-        // Get last sequence from InventoryHistory
-        let latestEntry = await tx.getRepository(InventoryHistory).find({
-          where: { palletId: inventory.palletId },
-          order: { seq: 'DESC' },
-          take: 1
-        })
-        let lastSeq = latestEntry[0].seq
-
-        // Condition 1: Change location (RELOCATE)
-        if (newRecord.location && newRecord.location.id) {
-          var location = await tx.getRepository(Location).findOne({
-            where: { id: newRecord.location.id },
-            relations: ['warehouse']
-          })
-          newRecord.location = location
-          newRecord.zone = location.zone
-          newRecord.warehouse = location.warehouse
-
-          newHistoryRecord.location = location
-          newHistoryRecord.zone = location.zone
-          newHistoryRecord.warehouse = location.warehouse
-
-          transactionType = 'RELOCATE'
-        }
-
-        // Condition 2: Change of qty or uomValue.
-        // Set qty movement for inventory history
-        if (typeof newRecord.qty != 'undefined') {
-          transactionType = 'ADJUSTMENT'
-          newHistoryRecord.qty = newRecord.qty - inventory.qty
-          if (newRecord.qty < 1) {
-            newRecord.status = 'TERMINATED'
-            newRecord.qty = 0
-            newRecord.uomValue = 0
-          }
-        } else {
-          newHistoryRecord.qty = 0
-        }
-        // Set uomValue movement for inventory history
-        if (typeof newRecord.uomValue != 'undefined') {
-          transactionType = 'ADJUSTMENT'
-          newHistoryRecord.uomValue = newRecord.uomValue - inventory.uomValue
-          if (newRecord.uomValue < 1) {
-            newRecord.uomValue = 0
-          }
-        } else {
-          newHistoryRecord.uomValue = 0
-        }
-
-        // Condition 3: Change of bizplace or product or batch id or packing type
-        if (newRecord.bizplace && newRecord.bizplace.id) {
-          newRecord.bizplace = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.bizplace.id })) as any
-        }
-
-        if (newRecord.product && newRecord.product.id) {
-          newRecord.product = (await tx.getRepository(Product).findOneBy({ id: newRecord.product.id })) as any
-        }
-
-        if ((newRecord.product && newRecord.product.id) || (newRecord.bizplace && newRecord.bizplace.id) || newRecord.batchId || newRecord.packingType) {
-          if (
-            inventory.bizplace.id !== (newRecord.bizplace ? newRecord.bizplace.id : '') ||
-            inventory.product.id !== (newRecord.product ? newRecord.product.id : '') ||
-            inventory.batchId !== newRecord.batchId ||
-            inventory.packingType !== newRecord.packingType
-          ) {
-            transactionType = 'ADJUSTMENT'
-            lastSeq = lastSeq + 1
-            let inventoryHistory = {
-              ...inventory,
-              domain: domain,
-              bizplace: inventory.bizplace.id,
-              openingQty: inventory.qty,
-              openingUomValue: inventory.uomValue,
-              qty: -inventory.qty || 0,
-              uomValue: -inventory.uomValue || 0,
-              name: InventoryNoGenerator.inventoryHistoryName(),
-              seq: lastSeq,
-              inventory,
-              transactionType: transactionType,
-              status: INVENTORY_STATUS.TERMINATED,
-              productId: inventory.product.id,
-              warehouseId: inventory.warehouse.id,
-              locationId: inventory.location.id,
-              creator: user,
-              updater: user
-            }
-
-            delete inventoryHistory.id
-            await tx.getRepository(InventoryHistory).save(inventoryHistory as any)
-
-            newHistoryRecord.qty = newRecord.qty || inventory.qty
-            newHistoryRecord.uomValue = newRecord.uomValue || inventory.uomValue || 0
-            newHistoryRecord.openingQty = 0
-            newHistoryRecord.openingUomValue = 0
-            newHistoryRecord.batchId = newRecord.batchId || inventory.batchId || '-'
-          }
-        }
-
-        //Transaction type will be RELOCATE if there is only location change. Any other changes will be considered Adjustment.
-        lastSeq = lastSeq + 1
-        let inventoryHistory = {
-          ...inventory,
-          ...newHistoryRecord,
-          domain: domain,
-          creator: user,
-          updater: user,
-          name: InventoryNoGenerator.inventoryHistoryName(),
-          seq: lastSeq,
-          inventory,
-          transactionType: transactionType == '' ? 'ADJUSTMENT' : transactionType,
-          productId: newHistoryRecord.product ? newHistoryRecord.product.id : inventory.product.id,
-          warehouseId: newHistoryRecord.warehouse ? newHistoryRecord.warehouse.id : inventory.warehouse.id,
-          locationId: newHistoryRecord.location ? newHistoryRecord.location.id : inventory.location.id
-        }
-
-        delete inventoryHistory.id
-        await tx.getRepository(InventoryHistory).save(inventoryHistory)
-
-        const result = await inventoryRepo.save({
-          ...inventory,
-          ...newRecord,
-          updater: user,
-          lastSeq: lastSeq
-        })
-
-        results.push({ ...result, cuFlag: 'M' })
-      }
-    }
-
-    return results
+    return await updateMultipleInventory(patches, context)
   }
 
   @Directive('@privilege(category: "inventory", privilege: "mutation")')
@@ -480,3 +263,224 @@ export class InventoryMutation {
     return true
   }
 }
+
+export async function updateMultipleInventory(patches: InventoryPatch[], context: ResolverContext): Promise<Inventory[]> {
+  const { domain, user, tx } = context.state
+
+  let results = []
+  const _createRecords = patches.filter((patch: any) => !patch.id)
+  const _updateRecords = patches.filter((patch: any) => patch.id)
+
+  const inventoryRepo = tx.getRepository(Inventory)
+  if (_createRecords.length > 0) {
+    let today = new Date()
+    let year = today.getFullYear()
+    let month = today.getMonth()
+    let date = today.getDate()
+
+    for (let i = 0; i < _createRecords.length; i++) {
+      const total = await tx.getRepository(Inventory).countBy({
+        createdAt: MoreThan(new Date(year, month, date))
+      })
+
+      const newRecord = _createRecords[i]
+
+      if (newRecord.location && newRecord.location.id) {
+        var location = await tx.getRepository(Location).findOne({
+          where: { id: newRecord.location.id },
+          relations: ['warehouse']
+        })
+        newRecord.location = location
+        newRecord.zone = location.zone
+        newRecord.warehouse = location.warehouse
+      }
+
+      if (newRecord.bizplace && newRecord.bizplace.id) {
+        newRecord.bizplace = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.bizplace.id })) as any
+      }
+
+      if (newRecord.product && newRecord.product.id) {
+        var product = (await tx.getRepository(Product).findOneBy({ id: newRecord.product.id })) as any
+        newRecord.product = product
+      }
+
+      let palletId =
+        'P' +
+        year.toString().substr(year.toString().length - 2) +
+        ('0' + (month + 1).toString()).substr(('0' + (month + 1).toString()).toString().length - 2) +
+        ('0' + date.toString()).substr(('0' + date.toString()).length - 2) +
+        ('0000' + (total + 1).toString()).substr(('0000' + (total + 1).toString()).length - 4)
+
+      newRecord.name = palletId
+      newRecord.status = newRecord.qty < 1 ? 'TERMINATED' : 'STORED'
+      newRecord.palletId = palletId
+
+      const result = await inventoryRepo.save({
+        domain: domain,
+        creator: user,
+        updater: user,
+        lastSeq: 0,
+        ...newRecord
+      } as any)
+
+      await tx.getRepository(InventoryHistory).save({
+        ...newRecord,
+        domain: domain,
+        creator: user,
+        updater: user,
+        name: InventoryNoGenerator.inventoryHistoryName(),
+        seq: 0,
+        transactionType: 'NEW',
+        productId: newRecord.product.id,
+        warehouseId: newRecord.warehouse.id,
+        locationId: newRecord.location.id
+      })
+
+      results.push({ ...result, cuFlag: '+' })
+    }
+  }
+
+  if (_updateRecords.length > 0) {
+    for (let i = 0; i < _updateRecords.length; i++) {
+      const newRecord = _updateRecords[i]
+      const newHistoryRecord = JSON.parse(JSON.stringify(_updateRecords[i]))
+      let transactionType = ''
+
+      let inventory = await inventoryRepo.findOne({
+        where: { id: newRecord.id },
+        relations: ['warehouse', 'location', 'product', 'bizplace']
+      })
+      newHistoryRecord.openingQty = inventory.qty
+      newHistoryRecord.openingUomValue = inventory.uomValue
+
+      // Get last sequence from InventoryHistory
+      let latestEntry = await tx.getRepository(InventoryHistory).find({
+        where: { palletId: inventory.palletId },
+        order: { seq: 'DESC' },
+        take: 1
+      })
+      let lastSeq = latestEntry[0].seq
+
+      // Condition 1: Change location (RELOCATE)
+      if (newRecord.location && newRecord.location.id) {
+        var location = await tx.getRepository(Location).findOne({
+          where: { id: newRecord.location.id },
+          relations: ['warehouse']
+        })
+        newRecord.location = location
+        newRecord.zone = location.zone
+        newRecord.warehouse = location.warehouse
+
+        newHistoryRecord.location = location
+        newHistoryRecord.zone = location.zone
+        newHistoryRecord.warehouse = location.warehouse
+
+        transactionType = 'RELOCATE'
+      }
+
+      // Condition 2: Change of qty or uomValue.
+      // Set qty movement for inventory history
+      if (typeof newRecord.qty != 'undefined') {
+        transactionType = 'ADJUSTMENT'
+        newHistoryRecord.qty = newRecord.qty - inventory.qty
+        if (newRecord.qty < 1) {
+          newRecord.status = 'TERMINATED'
+          newRecord.qty = 0
+          newRecord.uomValue = 0
+        }
+      } else {
+        newHistoryRecord.qty = 0
+      }
+      // Set uomValue movement for inventory history
+      if (typeof newRecord.uomValue != 'undefined') {
+        transactionType = 'ADJUSTMENT'
+        newHistoryRecord.uomValue = newRecord.uomValue - inventory.uomValue
+        if (newRecord.uomValue < 1) {
+          newRecord.uomValue = 0
+        }
+      } else {
+        newHistoryRecord.uomValue = 0
+      }
+
+      // Condition 3: Change of bizplace or product or batch id or packing type
+      if (newRecord.bizplace && newRecord.bizplace.id) {
+        newRecord.bizplace = (await tx.getRepository(Bizplace).findOneBy({ id: newRecord.bizplace.id })) as any
+      }
+
+      if (newRecord.product && newRecord.product.id) {
+        newRecord.product = (await tx.getRepository(Product).findOneBy({ id: newRecord.product.id })) as any
+      }
+
+      if ((newRecord.product && newRecord.product.id) || (newRecord.bizplace && newRecord.bizplace.id) || newRecord.batchId || newRecord.packingType) {
+        if (
+          inventory.bizplace.id !== (newRecord.bizplace ? newRecord.bizplace.id : '') ||
+          inventory.product.id !== (newRecord.product ? newRecord.product.id : '') ||
+          inventory.batchId !== newRecord.batchId ||
+          inventory.packingType !== newRecord.packingType
+        ) {
+          transactionType = 'ADJUSTMENT'
+          lastSeq = lastSeq + 1
+          let inventoryHistory: any = {
+            ...inventory,
+            domain: domain,
+            bizplace: inventory.bizplace.id,
+            openingQty: inventory.qty,
+            openingUomValue: inventory.uomValue,
+            qty: -inventory.qty || 0,
+            uomValue: -inventory.uomValue || 0,
+            name: InventoryNoGenerator.inventoryHistoryName(),
+            seq: lastSeq,
+            inventory,
+            transactionType: transactionType,
+            status: INVENTORY_STATUS.TERMINATED,
+            productId: inventory.product.id,
+            warehouseId: inventory.warehouse.id,
+            locationId: inventory.location.id,
+            creator: user,
+            updater: user
+          }
+
+          delete inventoryHistory.id
+          await tx.getRepository(InventoryHistory).save(inventoryHistory as any)
+
+          newHistoryRecord.qty = newRecord.qty || inventory.qty
+          newHistoryRecord.uomValue = newRecord.uomValue || inventory.uomValue || 0
+          newHistoryRecord.openingQty = 0
+          newHistoryRecord.openingUomValue = 0
+          newHistoryRecord.batchId = newRecord.batchId || inventory.batchId || '-'
+        }
+      }
+
+      //Transaction type will be RELOCATE if there is only location change. Any other changes will be considered Adjustment.
+      lastSeq = lastSeq + 1
+      let inventoryHistory = {
+        ...inventory,
+        ...newHistoryRecord,
+        domain: domain,
+        creator: user,
+        updater: user,
+        name: InventoryNoGenerator.inventoryHistoryName(),
+        seq: lastSeq,
+        inventory,
+        transactionType: transactionType == '' ? 'ADJUSTMENT' : transactionType,
+        productId: newHistoryRecord.product ? newHistoryRecord.product.id : inventory.product.id,
+        warehouseId: newHistoryRecord.warehouse ? newHistoryRecord.warehouse.id : inventory.warehouse.id,
+        locationId: newHistoryRecord.location ? newHistoryRecord.location.id : inventory.location.id
+      }
+
+      delete inventoryHistory.id
+      await tx.getRepository(InventoryHistory).save(inventoryHistory)
+
+      const result = await inventoryRepo.save({
+        ...inventory,
+        ...newRecord,
+        updater: user,
+        lastSeq: lastSeq
+      })
+
+      results.push({ ...result, cuFlag: 'M' })
+    }
+  }
+
+  return results
+}

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

@@ -6,16 +6,7 @@ import { Bizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '
 import { logger } from '@things-factory/env'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
-import {
-  buildQuery,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting,
-  getQueryBuilderFromListParams,
-  getRepository
-} from '@things-factory/shell'
+import { buildQuery, Domain, Filter, getQueryBuilderFromListParams, getRepository, ListParam, Pagination, Sorting } from '@things-factory/shell'
 
 import { INVENTORY_STATUS, LOCATION_TYPE } from '../../constants'
 import { InventoryChange } from '../inventory-change/inventory-change'
@@ -137,9 +128,7 @@ export class InventoryQuery {
         const sort: OrderByCondition = (sortings || []).reduce(
           (acc, sort) => ({
             ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'inventory.' + sort.name]: sort.desc
-              ? 'DESC'
-              : 'ASC'
+            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'inventory.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
           }),
           {}
         )
@@ -210,10 +199,7 @@ export class InventoryQuery {
 
   @Directive('@privilege(category: "inventory", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => InventoryList)
-  async renewInventoriesGroupByProduct(
-    @Args() params: ListParam,
-    @Ctx() context: ResolverContext
-  ): Promise<InventoryList> {
+  async renewInventoriesGroupByProduct(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<InventoryList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -242,6 +228,7 @@ export class InventoryQuery {
       .addSelect('product.primaryValue', 'primaryValue')
       .addSelect('product.primaryUnit', 'primaryUnit')
       .addSelect('product.auxUnit1', 'auxUnit1')
+      .addSelect('product.minQty', 'minQty')
       .addSelect('i.product_color', 'productColor')
       .addSelect('i.product_quality', 'productQuality')
       .addSelect('i.work_category', 'workCategory')
@@ -250,7 +237,7 @@ export class InventoryQuery {
       .addSelect('COALESCE(SUM(i.locked_qty), 0)', 'lockedQty')
       .addSelect('COALESCE(SUM(i.uom_value), 0)', 'uomValue')
       .addSelect('COALESCE(SUM(i.locked_uom_value), 0)', 'lockedUomValue')
-      .innerJoin('i.product', 'product', 'i.product_id = product.id')
+      .innerJoin('i.product', 'product', 'product.deleted_at IS NULL')
       .andWhere('i.status = :status', { status: INVENTORY_STATUS.STORED })
       .andWhere('i.expiration_date >= now()')
       .andWhere('product.domain_id = :domain', { domain: domain.id })
@@ -591,11 +578,7 @@ export class InventoryQuery {
 
   @Directive('@transaction')
   @Query(returns => Boolean)
-  async checkProductIdenticality(
-    @Arg('palletA') palletA: string,
-    @Arg('palletB') palletB: string,
-    @Ctx() context: ResolverContext
-  ): Promise<Boolean> {
+  async checkProductIdenticality(@Arg('palletA') palletA: string, @Arg('palletB') palletB: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     const { tx } = context.state
     const invRepo: Repository<Inventory> = tx.getRepository(Inventory)
     const invA: Inventory = await invRepo.findOne({
@@ -608,20 +591,11 @@ export class InventoryQuery {
       relations: ['product']
     })
 
-    return (
-      invA?.batchId === invB?.batchId &&
-      invA?.product?.id === invB?.product?.id &&
-      invA?.packingType === invB?.packingType
-    )
+    return invA?.batchId === invB?.batchId && invA?.product?.id === invB?.product?.id && invA?.packingType === invB?.packingType
   }
 
   @Query(returns => Boolean)
-  async checkCartonIdenticality(
-    @Arg('cartonA') cartonA: string,
-    @Arg('palletA') palletA: string,
-    @Arg('cartonB') cartonB: string,
-    @Ctx() context: ResolverContext
-  ) {
+  async checkCartonIdenticality(@Arg('cartonA') cartonA: string, @Arg('palletA') palletA: string, @Arg('cartonB') cartonB: string, @Ctx() context: ResolverContext) {
     const invRepo: Repository<Inventory> = getRepository(Inventory)
     const invA: Inventory = await invRepo.findOne({
       where: {
@@ -654,11 +628,7 @@ export class InventoryQuery {
   }
 
   @Query(returns => Boolean)
-  async checkInventoryOwner(
-    @Arg('palletId') palletId: string,
-    @Arg('bizplaceName') bizplaceName: string,
-    @Ctx() context: ResolverContext
-  ): Promise<Boolean> {
+  async checkInventoryOwner(@Arg('palletId') palletId: string, @Arg('bizplaceName') bizplaceName: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     const invRepo: Repository<Inventory> = getRepository(Inventory)
     const bizRepo: Repository<Bizplace> = getRepository(Bizplace)
 
@@ -709,28 +679,20 @@ export class InventoryQuery {
       })
     }
 
-    const remainOnlyParam = params?.filters?.find(
-      (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-    )
+    const remainOnlyParam = params?.filters?.find((f: { name: string; operator: string; value: any }) => f.name === 'remainOnly')
 
     let remainOnly: boolean = false
     if (typeof remainOnlyParam?.value !== 'undefined') {
       remainOnly = remainOnlyParam.value
-      params.filters = params.filters.filter(
-        (f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly'
-      )
+      params.filters = params.filters.filter((f: { name: string; operator: string; value: any }) => f.name !== 'remainOnly')
     }
 
-    const unlockOnlyParam = params?.filters?.find(
-      (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-    )
+    const unlockOnlyParam = params?.filters?.find((f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly')
 
     let unlockOnly: boolean = false
     if (typeof unlockOnlyParam?.value !== 'undefined') {
       unlockOnly = unlockOnlyParam.value
-      params.filters = params.filters.filter(
-        (f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly'
-      )
+      params.filters = params.filters.filter((f: { name: string; operator: string; value: any }) => f.name !== 'unlockOnly')
     }
 
     const productBundleSettings: ProductBundleSetting[] = await getRepository(ProductBundleSetting).find({
@@ -1106,18 +1068,7 @@ export class InventoryQuery {
 }
 
 export async function inventoriesByStrategy(
-  {
-    worksheetId,
-    batchId,
-    bizplaceId,
-    productName,
-    productSku,
-    packingType,
-    packingSize,
-    uom,
-    pickingStrategy,
-    locationSortingRules
-  },
+  { worksheetId, batchId, bizplaceId, productName, productSku, packingType, packingSize, uom, pickingStrategy, locationSortingRules },
   trxMgr: EntityManager
 ) {
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
@@ -1206,9 +1157,7 @@ export async function inventoriesByStrategy(
     case 'LOCATION':
       if (locationSortingRules?.length > 0) {
         locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-          idx === 0
-            ? qb.orderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-            : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+          idx === 0 ? qb.orderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC') : qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
         })
       } else qb.orderBy('"LOC"."name"', 'DESC')
       break

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

@@ -104,6 +104,12 @@ export class InventoryPatch {
   @Field(type => Float, { nullable: true })
   qty?: number
 
+  @Field(type => Float, { nullable: true })
+  lockedQty?: number
+
+  @Field(type => Float, { nullable: true })
+  lockedUomValue?: number
+
   @Field({ nullable: true })
   status?: string