@things-factory/worksheet-base 4.0.0-alpha.9 → 4.0.0-beta.0

package/server/utils/inventory-util.ts

@@ -1,16 +1,21 @@
+import {
+  EntityManager,
+  getRepository,
+  Repository
+} from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import {
   Inventory,
+  INVENTORY_STATUS,
   InventoryHistory,
   InventoryNoGenerator,
-  INVENTORY_STATUS,
   Location,
   LOCATION_STATUS
 } from '@things-factory/warehouse-base'
-import { EntityManager, getRepository, Repository } from 'typeorm'
 
 /**
  * @description It will insert new record into inventory histories table.
@@ -23,7 +28,8 @@ export async function generateInventoryHistory(
   qty: number,
   uomValue: number,
   user: User,
-  trxMgr?: EntityManager
+  trxMgr?: EntityManager,
+  targetInventory: Inventory = {}
 ): Promise<InventoryHistory> {
   const invHistoryRepo: Repository<InventoryHistory> =
     trxMgr?.getRepository(InventoryHistory) || getRepository(InventoryHistory)
@@ -75,6 +81,7 @@ export async function generateInventoryHistory(
   inventoryHistory.orderNo = refOrder?.name || null
   inventoryHistory.orderRefNo = refOrder?.refNo || null
   inventoryHistory.inventory = inventory
+  inventoryHistory.targetInventory = targetInventory
   inventoryHistory.product = inventory.product
   inventoryHistory.reusablePallet = inventory.reusablePallet
   inventoryHistory.zone = inventory.zone
@@ -82,6 +89,7 @@ export async function generateInventoryHistory(
   inventoryHistory.location = inventory.location
   inventoryHistory.expirationDate = inventory.expirationDate
   inventoryHistory.packingType = inventory.packingType
+  inventoryHistory.packingSize = inventory.packingSize
   inventoryHistory.uom = inventory.uom
   inventoryHistory.qty = qty
   inventoryHistory.openingQty = openingQty
@@ -207,14 +215,16 @@ export async function checkPalletIdenticallity(
   return { identicallity: true }
 }
 
-
-
 /**
  * @description: Get inventory based on picking strategy and sorting rule
  * @param { worksheetId, batchId, bizplaceId, productId, packingType, pickingStrategy, locationSortingRules }
  * @param trxMgr
  */
-export async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, productId, packingType, packingSize, pickingStrategy, locationSortingRules }, trxMgr: EntityManager){
+export async function inventoriesByStrategy(
+  { worksheetId, batchId, bizplaceId, productId, packingType, packingSize, pickingStrategy, locationSortingRules },
+  domain: Domain,
+  trxMgr: EntityManager
+) {
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
   qb.leftJoinAndSelect('INV.product', 'PROD')
     .leftJoinAndSelect('INV.location', 'LOC')
@@ -223,9 +233,7 @@ export async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId,
         .select('COALESCE(SUM(release_qty), 0)', 'releaseQty')
         .from('order_inventories', 'OI')
         .where('"OI"."inventory_id" = "INV"."id"')
-        .andWhere(
-          "\"OI\".\"status\" IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')"
-        )
+        .andWhere("\"OI\".\"status\" IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')")
         .andWhere('"OI"."ref_worksheet_id" <> :worksheetId', { worksheetId: worksheetId })
     )
     .addSelect(subQuery =>
@@ -233,16 +241,16 @@ export async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId,
         .select('COALESCE(SUM(release_uom_value), 0)', 'releaseUomValue')
         .from('order_inventories', 'OI')
         .where('"OI"."inventory_id" = "INV"."id"')
-        .andWhere(
-          "\"OI\".\"status\" IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')"
-        )
+        .andWhere("\"OI\".\"status\" IN ('PENDING', 'PENDING_RECEIVE', 'PENDING_WORKSHEET', 'PENDING_SPLIT')")
         .andWhere('"OI"."ref_worksheet_id" <> :worksheetId', { worksheetId: worksheetId })
     )
+    .andWhere('"INV"."domain_id" = :domainId')
     .andWhere('"PROD"."id" = :productId')
     .andWhere('"INV"."packing_type" = :packingType')
     .andWhere('"INV"."packing_size" = :packingSize')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
     .setParameters({
+      domainId: domain.id,
       productId,
       packingType,
       packingSize
@@ -256,32 +264,67 @@ export async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId,
     qb.andWhere('"INV"."bizplace_id" = :bizplaceId', { bizplaceId: bizplaceId })
   }
 
+  let locIdx = 0
+
   switch (pickingStrategy.toUpperCase()) {
     case 'FIFO':
       qb.orderBy('"INV"."created_at"', 'ASC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          if (locIdx === 0) {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          } else {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          }
+          ++locIdx
+        }
+      }
       break
 
-    case 'LILO':
+    case 'LIFO':
       qb.orderBy('"INV"."created_at"', 'DESC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          if (locIdx === 0) {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          } else {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          }
+          ++locIdx
+        }
+      }
       break
 
     case 'FEFO':
       qb.orderBy('"INV"."expiration_date"', 'ASC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          if (locIdx === 0) {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          } else {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          }
+          ++locIdx
+        }
+      }
       break
 
     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')
-        })
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          if (locIdx === 0) {
+            qb.orderBy(`LOC.${key}`, locationSortingRules[key])
+          } else {
+            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+          }
+          ++locIdx
+        }
       } else qb.orderBy('"LOC"."name"', 'DESC')
       break
     default:
       qb.orderBy('"INV"."created_at"', 'ASC')
 
-    break
+      break
   }
 
   const { entities, raw } = await qb.getRawAndEntities()
@@ -304,4 +347,4 @@ export async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId,
 
   const total: number = await qb.getCount()
   return { items, total }
-}
+}