@things-factory/warehouse-base 4.3.81 → 4.3.82

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

@@ -17,13 +17,13 @@ import { logger } from '@things-factory/env'
 export class InventoryQuery {
   /**
    * Combined single query resolver to perform extraction of data with or without pagination
-   * @param context 
-   * @param filters 
-   * @param pagination 
-   * @param sortings 
-   * @param locationSortingRules 
-   * @param exportItem 
-   * @returns 
+   * @param context
+   * @param filters
+   * @param pagination
+   * @param sortings
+   * @param locationSortingRules
+   * @param exportItem
+   * @returns
    */
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
@@ -45,7 +45,7 @@ export class InventoryQuery {
       const remainOnlyParam = filters.find((filter: any) => filter.name == 'remainOnly')
       const bizplace = filters.find((filter: any) => filter.name === 'bizplace')
 
-      filters = filters.filter(x => (['productInfo', 'remainOnly']).indexOf(x.name) < 0)
+      filters = filters.filter(x => ['productInfo', 'remainOnly'].indexOf(x.name) < 0)
 
       const params = { filters, pagination }
 
@@ -66,7 +66,12 @@ export class InventoryQuery {
 
       qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
         .leftJoinAndSelect('inventory.product', 'product')
-        .leftJoinAndSelect('product.productDetails', 'productDetail', 'productDetail.id = inventory.product_detail_id')
+        .leftJoinAndSelect('inventory.productDetail', 'productDetail')
+        .leftJoinAndSelect(
+          'product.productDetails',
+          'productDetails',
+          'productDetails.id = inventory.product_detail_id'
+        )
         .leftJoinAndSelect('inventory.warehouse', 'warehouse')
         .leftJoinAndSelect('inventory.location', 'location')
         .leftJoinAndSelect('inventory.creator', 'creator')
@@ -77,7 +82,10 @@ export class InventoryQuery {
           subQuery => {
             return subQuery
               .select('inventoryItems.inventory_id', 'inventory_item_inventory_id')
-              .addSelect(`SUM(case when "inventoryItems"."status" = 'STORED' then 1 else 0 end)`, 'inventory_item_count')
+              .addSelect(
+                `SUM(case when "inventoryItems"."status" = 'STORED' then 1 else 0 end)`,
+                'inventory_item_count'
+              )
               .addSelect(`string_agg(inventoryItems.serial_number, ', ')`, 'serial_numbers')
               .from('inventory_items', 'inventoryItems')
               .where(`inventoryItems.domain_id = :domainId`, { domainId: domain.id })
@@ -133,7 +141,9 @@ export class InventoryQuery {
       }
 
       if (locationSortingRules?.length > 0) {
-        locationSortingRules.forEach((rule) => { qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC') })
+        locationSortingRules.forEach(rule => {
+          qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+        })
       }
 
       // Fetch all row for exporting
@@ -645,7 +655,7 @@ export class InventoryQuery {
 
     const productBundleSettings: ProductBundleSetting[] = await getRepository(ProductBundleSetting).find({
       where: { productBundle: productBundleId },
-      relations: ['product', 'productBundle']
+      relations: ['product', 'productDetail', 'productBundle']
     })
 
     if (!productBundleSettings.length) {
@@ -656,6 +666,7 @@ export class InventoryQuery {
     buildQuery(qb, params, context)
 
     qb.select('iv.product_id', 'productId')
+      .addSelect('iv.product_detail_id', 'productDetailId')
       .addSelect('iv.batch_id', 'batchId')
       .addSelect('iv.batch_id_ref', 'batchIdRef')
       .addSelect('iv.packing_type', 'packingType')
@@ -684,6 +695,7 @@ export class InventoryQuery {
       productIds: productBundleSettings.map(productBundle => productBundle.product.id)
     })
       .groupBy('iv.product_id')
+      .addGroupBy('iv.product_detail_id')
       .addGroupBy('iv.batch_id')
       .addGroupBy('iv.batch_id_ref')
       .addGroupBy('iv.packing_type')
@@ -712,6 +724,7 @@ export class InventoryQuery {
       return {
         id: pbs.id,
         productId: pbs.product.id,
+        productDetailId: pbs.productDetail.id,
         bundleId: pbs.productBundle.id,
         bundleQty: pbs.bundleQty,
         releaseQty: bundleReleaseQty * pbs.bundleQty,

package/server/service/inventory/inventory.ts

@@ -210,6 +210,9 @@ export class Inventory {
   @Field({ nullable: true })
   productId: string
 
+  @Field({ nullable: true })
+  productDetailId: string
+
   @Field({ nullable: true })
   productName: string
 

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

@@ -6,8 +6,7 @@ import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { sendNotification } from '@things-factory/notification'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -138,14 +137,18 @@ export class InventoryChangeMutation {
   ) {
     const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
     try {
-
       const _createRecords = []
       const _updateRecords = []
 
       for (let i = 0; i < patches.length; i++) {
-        let foundExistingPallet = await tx.getRepository(Inventory).createQueryBuilder('iv')
+        let foundExistingPallet = await tx
+          .getRepository(Inventory)
+          .createQueryBuilder('iv')
           .where('iv.domain_id = :domain_id', { domain_id: domain.id })
-          .andWhere('(iv.pallet_id = :pallet_id or iv.id = :id)', { pallet_id: patches[i]?.palletId, id: patches[i]?.id })
+          .andWhere('(iv.pallet_id = :pallet_id or iv.id = :id)', {
+            pallet_id: patches[i]?.palletId,
+            id: patches[i]?.id
+          })
           .getOne()
 
         //remove any unchanged records
@@ -193,7 +196,9 @@ export class InventoryChangeMutation {
           newRecord.bizplace = await tx.getRepository(Bizplace).findOne(newRecord.bizplace.id)
 
           var product: Product = await tx.getRepository(Product).findOne(newRecord.product.id)
+          var productDetail: ProductDetail = await tx.getRepository(ProductDetail).findOne(newRecord.productDetailId)
           newRecord.product = product
+          newRecord.productDetail = productDetail
 
           newRecord.status = 'PENDING'
           newRecord.transactionType = 'NEW'
@@ -355,7 +360,9 @@ export class InventoryChangeMutation {
               newInventoryItemChange.status = updatedInventoryChange.status
               newInventoryItemChange.inventory = updatedInventoryChange.inventory
               newInventoryItemChange.inventoryItem =
-                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW ? null : inventoryItemChange.inventoryItem
+                newInventoryItemChange?.type == INVENTORY_ITEM_CHANGE_TYPE.NEW
+                  ? null
+                  : inventoryItemChange.inventoryItem
               newInventoryItemChange.inventoryChange = updatedInventoryChange
               newInventoryItemChange.domain = domain
               newInventoryItemChange.creator = user
@@ -417,11 +424,9 @@ export class InventoryChangeMutation {
       // }
 
       return true
-
     } catch (error) {
       throw error
     }
-
   }
 
   @Directive('@privilege(category: "inventory_adjustment_approval", privilege: "mutation")')
@@ -520,6 +525,7 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
           inventoryItem.serialNumber = inventoryItemChange.serialNumber
           inventoryItem.status = INVENTORY_STATUS.STORED
           inventoryItem.product = inventoryChange.inventory.product
+          inventoryItem.productDetail = inventoryChange.inventory.productDetail
           inventoryItem.domain = inventoryItemChange.domain
           inventoryItem.inventory = inventoryChange.inventory
           inventoryItem.source = INVENTORY_ITEM_SOURCE.ADJUSTMENT
@@ -539,7 +545,8 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
           inventoryItem = {
             ...existingInventoryItem,
             serialNumber: inventoryItemChange.serialNumber,
-            product: inventoryItemChange.inventory.product
+            product: inventoryItemChange.inventory.product,
+            productDetail: inventoryItemChange.inventory.productDetail
           }
         } else if (changeType == INVENTORY_ITEM_CHANGE_TYPE.REMOVED) {
           inventoryItem = {
@@ -576,6 +583,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
       'bizplace.company',
       'bizplace.company.domain',
       'product',
+      'productDetail',
       'product.productDetails',
       'product.productDetails.childProductDetail',
       'location'
@@ -611,6 +619,7 @@ export async function approveInventoryChanges(patches: any, context: any) {
             'bizplace.company',
             'bizplace.company.domain',
             'product',
+            'productDetail',
             'product.productDetails',
             'product.productDetails.childProductDetail',
             'warehouse',
@@ -620,8 +629,6 @@ export async function approveInventoryChanges(patches: any, context: any) {
           ]
         })
 
-        const customerDomain: Domain = inventory.bizplace.domain
-
         // Check for locked inventory, and stop from udpating inventory
         if (inventory.qty < inventory.lockedQty) {
           arrLockedInventory.push(_inventoryChanges[i])

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

@@ -1425,7 +1425,7 @@ export class InventoryHistoryQuery {
           rih.bizplace_id as bizplace_id,
           cast(rih.created_at + (interval '8 hour') as DATE) as "tempDate"
           from reduced_inventory_histories rih
-          left join product_details pd on pd.product_id = rih.product_id and pd.packing_type = rih.packing_type
+          left join product_details pd on pd.id = rih.product_detail_id
           where rih.status not like 'TERMINATED' and rih.bizplace_id = $1
           group by CAST(rih.created_at + (interval '8 hour') as DATE), rih.bizplace_id
         )

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

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail} from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
@@ -32,7 +32,8 @@ export class InventoryItem {
 
   @RelationId((inventoryItem: InventoryItem) => inventoryItem.domain)
   domainId?: string
-
+  
+  
   @Column()
   @Field()
   name: string
@@ -57,13 +58,19 @@ export class InventoryItem {
   @Field({ nullable: true })
   outboundOrderId: string
 
+
   @ManyToOne(type => Product)
   @Field(type => Product, { nullable: true })
   product?: Product
 
+  
   @RelationId((inventoryItem: InventoryItem) => inventoryItem.product)
   productId?: string
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @ManyToOne(type => Inventory)
   @Field(type => Inventory)
   inventory?: Inventory

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

@@ -11,7 +11,7 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 @Entity()
@@ -60,6 +60,10 @@ export class InventoryProduct {
   @RelationId((inventoryProduct: InventoryProduct) => inventoryProduct.product)
   productId?: string
 
+  @ManyToOne(type => ProductDetail, { nullable: true })
+  @Field({ nullable: true })
+  productDetail: ProductDetail
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date

package/server/utils/inventory-util.ts

@@ -147,68 +147,134 @@ export async function generateInventoryHistory(
     }
   })
 
-  let seq: number = 0
-  let openingQty: number = 0
-  let openingUomValue: number = 0
-
-  if (lastInvHistory) {
-    openingQty = lastInvHistory.openingQty + lastInvHistory.qty
-    openingUomValue = lastInvHistory.openingUomValue + lastInvHistory.uomValue
-    seq = lastInvHistory.seq + 1
-  }
-
-  let remainQty = (openingQty || 0) + (qty || 0)
-
-  let inventoryHistory: any = new InventoryHistory()
-
-  inventoryHistory = {
-    ...inventory,
-    name: InventoryNoGenerator.inventoryHistoryName(),
-    inventory,
-    seq: seq,
-    status: remainQty == 0 ? INVENTORY_STATUS.TERMINATED : inventory.status,
-    transactionType,
+  let lastSeq: number
+  let res: any
+  let inventoryHistoryFields: any = {
     refOrderId: refOrder?.id || null,
     orderNo: refOrder?.name || null,
     orderRefNo: refOrder?.refNo || null,
-    qty,
-    openingQty,
-    uomValue,
-    openingUomValue: openingUomValue,
+    uom: inventory?.uom,
+
     creator: user,
-    updater: user
+    updater: user,
+    domain: inventory?.domain,
+    bizplace: inventory?.bizplace,
+    reusablePallet: inventory?.reusablePallet,
+    inventory: inventory,
+    product: inventory?.product,
+    warehouse: inventory?.warehouse,
+    location: inventory?.location,
+
+    palletId: inventory?.palletId,
+    batchId: inventory?.batchId,
+    zone: inventory?.zone,
+    packingType: inventory?.packingType,
+    description: inventory?.description,
+    expirationDate: inventory?.expirationDate,
+    unitCost: inventory?.unitCost,
+    batchIdRef: inventory?.batchIdRef,
+    cartonId: inventory?.cartonId,
+    manufactureYear: inventory?.manufactureYear,
+    packingSize: inventory?.packingSize,
+    manufactureDate: inventory?.manufactureDate
   }
 
-  delete inventoryHistory.updatedAt
-  delete inventoryHistory.createdAt
-  delete inventoryHistory.id
-
-  let newInventoryHistory = await invHistoryRepo.save(inventoryHistory)
-
-  if (remainQty == 0) {
-    seq = seq + 1
-    let terminatedHistory = {
-      ...newInventoryHistory,
-      name: InventoryNoGenerator.inventoryHistoryName(),
-      seq: seq,
-      status: INVENTORY_STATUS.TERMINATED,
-      transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
-      uom: inventory.uom,
-      qty: 0,
-      openingQty: 0,
-      uomValue: 0,
-      openingUomValue: 0
+  if (!lastInvHistory) {
+    res = await invHistoryRepo
+    .createQueryBuilder()
+    .insert()
+    .into(InventoryHistory)
+    .values([
+      {
+        ...inventoryHistoryFields,
+        name: InventoryNoGenerator.inventoryHistoryName(),
+        status: inventory.status,
+        transactionType,
+        qty,
+        openingQty: 0,
+        uomValue,
+        openingUomValue: 0,
+        seq: 0
+      }
+    ])
+    .returning('*')
+    .execute()
+  }
+  else {
+    if (transactionType == 'PICKING' || transactionType == 'UNLOADING') {
+      const findSameOrderHistory: InventoryHistory[] = await invHistoryRepo.find({
+        domain: inventory.domain,
+        palletId: inventory.palletId,
+        refOrderId: refOrder.id
+      })
+  
+      if (findSameOrderHistory.length > 0) {
+        let prevTotalQty = 0
+        let prevTotalUomValue = 0
+        for (let oh of findSameOrderHistory) {
+          prevTotalQty += oh.qty
+          prevTotalUomValue += oh.uomValue
+        }
+        qty -= prevTotalQty
+        uomValue -= prevTotalUomValue
+      }
     }
+  
+    res = await invHistoryRepo
+      .createQueryBuilder()
+      .insert()
+      .into(InventoryHistory)
+      .values([
+        {
+          ...inventoryHistoryFields,
+          name: InventoryNoGenerator.inventoryHistoryName(),
+          status: () =>
+            `(select case when opening_qty + ${qty} = 0 then 'TERMINATED' else 'STORED' end as status from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1)`,
+          transactionType,
+          qty,
+          openingQty: () =>
+            `(select opening_qty from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + ${qty}`,
+          uomValue,
+          openingUomValue: () =>
+            `(select opening_uom_value from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + ${uomValue}`,
+          seq: () =>
+            `(select seq from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + 1`
+        }
+      ])
+      .returning('*')
+      .execute()
+  }
 
-    delete terminatedHistory.id
-
-    newInventoryHistory = await invHistoryRepo.save(terminatedHistory)
+  let newInventoryHistory: InventoryHistory = res.generatedMaps[0]
+  lastSeq = newInventoryHistory.seq
+
+  if (newInventoryHistory.openingQty == 0) {
+    let terminatedRes = await invHistoryRepo
+      .createQueryBuilder()
+      .insert()
+      .into(InventoryHistory)
+      .values([
+        {
+          ...inventoryHistoryFields,
+          name: InventoryNoGenerator.inventoryHistoryName(),
+          status: INVENTORY_STATUS.TERMINATED,
+          transactionType: INVENTORY_TRANSACTION_TYPE.TERMINATED,
+          qty: 0,
+          openingQty: 0,
+          uomValue: 0,
+          openingUomValue: 0,
+          seq: () =>
+            `(select seq from inventory_histories where inventory_id = '${inventory.id}' order by seq desc limit 1) + 1`
+        }
+      ])
+      .returning('seq')
+      .execute()
+
+    lastSeq = terminatedRes.generatedMaps[0].seq
     inventory.status = INVENTORY_STATUS.TERMINATED
   }
 
-  if (inventory.lastSeq !== seq) {
-    await invRepo.update(inventory.id, { lastSeq: newInventoryHistory.seq, updater: user })
-  }
+  await invRepo.update(inventory.id, { lastSeq, updater: user })
 
   await switchLocationStatus(domain, location, user, trxMgr)
   return newInventoryHistory