@things-factory/warehouse-base 4.0.9 → 4.0.13

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

@@ -3,7 +3,7 @@ import { Brackets, EntityManager, Equal, getRepository, Not, Repository, SelectQ
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Product, ProductBundleSetting } from '@things-factory/product-base'
+import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 
@@ -25,125 +25,139 @@ export class InventoryQuery {
   ): Promise<InventoryList> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    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',
-        operator: 'in',
-        value: await getPermittedBizplaceIds(domain, user),
-        relation: true
-      })
-    }
-
-    const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-      (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
-    )
+    try {
+      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',
+          operator: 'in',
+          value: await getPermittedBizplaceIds(domain, user),
+          relation: true
+        })
+      }
 
-    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'
+      const remainOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
+        (f: { name: string; operator: string; value: any }) => f.name === 'remainOnly'
       )
-    }
 
-    const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
-      (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
-    )
+      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'
+        )
+      }
 
-    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'
+      const unlockOnlyParam: { name: string; operator: string; value: boolean } = params?.filters?.find(
+        (f: { name: string; operator: string; value: any }) => f.name === 'unlockOnly'
       )
-    }
 
-    const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
-    buildQuery(qb, params, context)
+      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'
+        )
+      }
 
-    qb.leftJoinAndSelect('iv.domain', 'domain')
-      .leftJoinAndSelect('iv.bizplace', 'bizplace')
-      .leftJoinAndSelect('iv.product', 'product')
-      .leftJoinAndSelect('iv.warehouse', 'warehouse')
-      .leftJoinAndSelect('iv.location', 'location')
-      .leftJoinAndSelect('iv.creator', 'creator')
-      .leftJoinAndSelect('iv.updater', 'updater')
+      const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
+      buildQuery(qb, params, context)
+
+      qb.leftJoinAndSelect('iv.domain', 'domain')
+        .leftJoinAndSelect('iv.bizplace', 'bizplace')
+        .leftJoinAndSelect('iv.product', 'product')
+        .leftJoinAndSelect('iv.warehouse', 'warehouse')
+        .leftJoinAndSelect('iv.location', 'location')
+        .leftJoinAndSelect('iv.creator', 'creator')
+        .leftJoinAndSelect('iv.updater', 'updater')
+      // .addSelect('(SELECT COUNT(id) FROM inventory_changes ic where "iv"."id" = "ic"."inventory_id" )', 'changeCount')
+
+      if (remainOnly) {
+        qb.andWhere('iv.qty > 0')
+          .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
+          .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
+      }
 
-    if (remainOnly) {
-      qb.andWhere('iv.qty > 0')
-        .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-        .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
-    }
+      if (unlockOnly) {
+        qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0')
+      }
 
-    if (unlockOnly) {
-      qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0')
-    }
+      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 })
+                  .orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue })
+              })
+            )
+            .getQuery()
+          return `EXISTS ${subQuery}`
+        })
+      }
 
-    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}`
-      })
-    }
+      if (sortings?.length !== 0) {
+        const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
+        const sort = (sortings || []).reduce(
+          (acc, sort) => ({
+            ...acc,
+            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
+              ? 'DESC'
+              : 'ASC'
+          }),
+          {}
+        )
+        qb.orderBy(sort)
+      }
 
-    if (sortings?.length !== 0) {
-      const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone']
-      const sort = (sortings || []).reduce(
-        (acc, sort) => ({
-          ...acc,
-          [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
-            ? 'DESC'
-            : 'ASC'
-        }),
-        {}
-      )
-      qb.orderBy(sort)
-    }
+      if (locationSortingRules?.length > 0) {
+        locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
+          qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+        })
+      }
 
-    if (locationSortingRules?.length > 0) {
-      locationSortingRules.forEach((rule: { name: string; desc: boolean }) => {
-        qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-      })
-    }
+      let [items, total] = await qb.getManyAndCount()
 
-    let [items, total] = await qb.getManyAndCount()
+      items = await Promise.all(
+        items.map(async (item: Inventory) => {
+          let inventoryChangeCount = await getRepository(InventoryChange).count({
+            where: { inventory: item.id }
+          })
 
-    items = await Promise.all(
-      items.map(async (item: Inventory) => {
-        let inventoryChangeCount = await getRepository(InventoryChange).count({
-          where: { inventory: item.id }
-        })
+          const selectedQty = item.lockedQty ? item.lockedQty : 0
+          const selectedUomValue = item.lockedUomValue ? item.lockedUomValue : 0
 
-        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,
-          remainQty: item.qty - selectedQty,
-          remainUomValue: item.uomValue - selectedUomValue
-        }
-      })
-    )
+          return {
+            ...item,
+            changeCount: inventoryChangeCount,
+            remainQty: item.qty - selectedQty,
+            remainUomValue: item.uomValue - selectedUomValue
+          }
+        })
+      )
 
-    return { items, total }
+      return { items, total }
+    } catch (error) {
+      throw error
+    }
   }
 
   @Directive('@privilege(category: "inventory", privilege: "query")')
@@ -226,6 +240,7 @@ export class InventoryQuery {
         productQuery = `AND (
           Lower("Product"."name") LIKE ANY(ARRAY[${productValue}])
           OR Lower("Product"."sku") LIKE ANY(ARRAY[${productValue}])
+          OR Lower("Product"."brand") LIKE ANY(ARRAY[${productValue}])
           OR Lower("Product"."description") LIKE ANY(ARRAY[${productValue}])
           OR Lower("ProductRef"."name") LIKE ANY(ARRAY[${productValue}])
           OR Lower("ProductRef"."sku") LIKE ANY(ARRAY[${productValue}])
@@ -267,7 +282,7 @@ export class InventoryQuery {
         `
         create temp table temp_inv_history AS 
         (
-          SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description", 
+          SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description", 
           "Product"."weight" AS "weight", "ProductRef"."name" AS "productRefName", 
           "ProductRef"."description" AS "productRefDesciption", "Bizplace"."name" AS "bizplaceName", SUM("Inventory"."qty") AS "qty" ,
           CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
@@ -313,6 +328,7 @@ export class InventoryQuery {
               id: item.id,
               name: item.name,
               sku: item.sku,
+              brand: item.brand,
               description: item.description,
               type: item.type,
               weight: item.weight,
@@ -341,6 +357,8 @@ export class InventoryQuery {
     @Arg('productName') productName: string,
     @Arg('productSku') productSku: string,
     @Arg('packingType') packingType: string,
+    @Arg('packingSize') packingSize: number,
+    @Arg('uom') uom: string,
     @Arg('pickingStrategy') pickingStrategy: string,
     @Arg('locationSortingRules', type => [Sorting], { nullable: true }) locationSortingRules?: Sorting[],
     @Arg('bizplaceId', { nullable: true }) bizplaceId?: string
@@ -360,7 +378,18 @@ export class InventoryQuery {
     }
 
     return inventoriesByStrategy(
-      { worksheetId, batchId, bizplaceId, productName, productSku, packingType, pickingStrategy, locationSortingRules },
+      {
+        worksheetId,
+        batchId,
+        bizplaceId,
+        productName,
+        productSku,
+        packingType,
+        packingSize,
+        uom,
+        pickingStrategy,
+        locationSortingRules
+      },
       tx
     )
   }
@@ -633,7 +662,18 @@ export class InventoryQuery {
 }
 
 export async function inventoriesByStrategy(
-  { worksheetId, batchId, bizplaceId, productName, productSku, packingType, pickingStrategy, locationSortingRules },
+  {
+    worksheetId,
+    batchId,
+    bizplaceId,
+    productName,
+    productSku,
+    packingType,
+    packingSize,
+    uom,
+    pickingStrategy,
+    locationSortingRules
+  },
   trxMgr: EntityManager
 ) {
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
@@ -658,11 +698,15 @@ 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({
       productName,
       productSku,
-      packingType
+      packingType,
+      packingSize,
+      uom
     })
 
   if (batchId !== '') {

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

@@ -50,9 +50,15 @@ export class InventoryPatch {
   @Field({ nullable: true })
   sku?: string
 
+  @Field({ nullable: true })
+  brand?: string
+
   @Field({ nullable: true })
   productName?: string
 
+  @Field({ nullable: true })
+  productDetailId?: string
+
   @Field(type => ObjectRef, { nullable: true })
   reusablePallet?: ObjectRef
 
@@ -80,6 +86,9 @@ export class InventoryPatch {
   @Field({ nullable: true })
   otherRef?: string
 
+  @Field({ nullable: true })
+  transactionType?: string
+
   @Field({ nullable: true })
   zone?: string
 
@@ -257,6 +266,9 @@ export class InventoryBundleGroup {
   @Field({ nullable: true })
   releaseUomValueWithUom?: string
 
+  @Field({ nullable: true })
+  uom?: string
+
   @Field({ nullable: true })
   packingType?: string
 

package/server/service/inventory/inventory.ts

@@ -14,7 +14,7 @@ import {
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarDate } from '@things-factory/shell'
 
 import { InventoryChange } from '../inventory-change/inventory-change'
 import { Location } from '../location/location'
@@ -38,8 +38,8 @@ export class Inventory {
   @RelationId((inventory: Inventory) => inventory.domain)
   domainId: string
 
-  @ManyToOne(type => Bizplace)
-  @Field(type => Bizplace)
+  @ManyToOne(type => Bizplace, { nullable: true })
+  @Field(type => Bizplace, { nullable: true })
   bizplace: Bizplace
 
   @ManyToOne(type => Inventory)
@@ -50,8 +50,8 @@ export class Inventory {
   @Field()
   name: string
 
-  @Column()
-  @Field()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   palletId: string
 
   @Column({ nullable: true })
@@ -131,8 +131,8 @@ export class Inventory {
   @Field({ nullable: true })
   sellPrice: number
 
-  @Column()
-  @Field()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   packingType: string
 
   @Column('float', { nullable: true, default: 1 })
@@ -175,8 +175,8 @@ export class Inventory {
   @Field({ nullable: true })
   description: string
 
-  @Column()
-  @Field()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   status: string
 
   @Column({ nullable: true })
@@ -192,7 +192,7 @@ export class Inventory {
   inventoryChanges: InventoryChange[]
 
   @Column('date', { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => ScalarDate, { nullable: true })
   expirationDate: Date
 
   @Field({ nullable: true })
@@ -204,6 +204,9 @@ export class Inventory {
   @Field({ nullable: true })
   productSKU: string
 
+  @Field({ nullable: true })
+  productBrand: string
+
   @Field(type => Float, { nullable: true })
   averageUnitCost: number
 

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

@@ -15,6 +15,7 @@ import { EcommerceController, SellercraftController } from '../../controllers'
 import { InventoryNoGenerator } from '../../utils'
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { Inventory } from '../inventory/inventory'
+import { InventoryPatch } from '../inventory/inventory-types'
 import { Location } from '../location/location'
 import { InventoryChange } from './inventory-change'
 import { InventoryChangeList, InventoryChangePatch, NewInventoryChange } from './inventory-change-types'
@@ -129,7 +130,7 @@ export class InventoryChangeMutation {
   @Directive('@transaction')
   @Mutation(returns => Boolean)
   async submitInventoryChanges(
-    @Arg('patches', type => [InventoryChangePatch]) patches: InventoryChangePatch[],
+    @Arg('patches', type => [InventoryPatch]) patches: InventoryPatch[],
     @Ctx() context: any
   ) {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
@@ -140,15 +141,15 @@ export class InventoryChangeMutation {
     const inventoryChangeRepo = tx.getRepository(InventoryChange)
     if (_createRecords.length > 0) {
       for (let i = 0; i < _createRecords.length; i++) {
-        const newRecord: Partial<InventoryChange> = _createRecords[i]
+        const newRecord = _createRecords[i]
 
         var location = await tx.getRepository(Location).findOne({
-          where: { id: newRecord.id },
+          where: { id: newRecord.location.id },
           relations: ['warehouse']
         })
         newRecord.location = location
-        // newRecord.zone = location.zone
-        // newRecord.warehouse = location.warehouse
+        newRecord.zone = location.zone
+        newRecord.warehouse = location.warehouse
 
         newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
 
@@ -176,7 +177,7 @@ export class InventoryChangeMutation {
 
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
-        const updateRecord: Partial<InventoryChange> = _updateRecords[i]
+        const updateRecord = _updateRecords[i]
 
         let existingRecord = await tx.getRepository(Inventory).findOne({
           where: { id: updateRecord.id },
@@ -189,8 +190,8 @@ export class InventoryChangeMutation {
             relations: ['warehouse']
           })
           updateRecord.location = location
-          // updateRecord.zone = location.zone
-          // updateRecord.warehouse = location.warehouse
+          updateRecord.zone = location.zone
+          updateRecord.warehouse = location.warehouse
         }
 
         if (!!updateRecord?.bizplace?.id)
@@ -356,9 +357,7 @@ export class InventoryChangeMutation {
           if (newRecord.uomValue != null && newRecord.uomValue != inventory.uomValue) {
             newHistoryRecord.uomValue = newRecord.uomValue - inventory.uomValue
             Math.round(newHistoryRecord.uomValue * 100) / 100
-            if (newRecord.uomValue < 1) {
-              newRecord.uomValue = 0
-            }
+
             transactionType = 'ADJUSTMENT'
           } else {
             newHistoryRecord.uomValue = 0

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

@@ -13,7 +13,7 @@ import {
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarDate } from '@things-factory/shell'
 
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { Inventory } from '../inventory/inventory'
@@ -23,6 +23,10 @@ import { Location } from '../location/location'
 @Index('ix_inventory-change_0', (inventoryChange: InventoryChange) => [inventoryChange.domain, inventoryChange.id], {
   unique: true
 })
+@Index('ix_inventory-change_1', (inventoryChange: InventoryChange) => [
+  inventoryChange.domain,
+  inventoryChange.inventory
+])
 @ObjectType()
 export class InventoryChange {
   @PrimaryGeneratedColumn('uuid')
@@ -116,7 +120,7 @@ export class InventoryChange {
   lastInventoryHistory: InventoryHistory
 
   @Column('date', { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => ScalarDate, { nullable: true })
   expirationDate: Date
 
   @Column('int', { nullable: true })