@things-factory/worksheet-base 4.0.0-y.0 → 4.0.4

package/server/utils/inventory-util.ts

@@ -1,18 +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 { Setting } from '@things-factory/setting-base'
-import { EntityManager, getRepository, Repository } from 'typeorm'
-import { ORDER_NUMBER_SETTING_KEY } from '@things-factory/sales-base'
 
 /**
  * @description It will insert new record into inventory histories table.
@@ -25,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)
@@ -77,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
@@ -84,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
@@ -216,6 +222,7 @@ export async function checkPalletIdenticallity(
  */
 export async function inventoriesByStrategy(
   { worksheetId, batchId, bizplaceId, productId, packingType, packingSize, pickingStrategy, locationSortingRules },
+  domain: Domain,
   trxMgr: EntityManager
 ) {
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
@@ -237,11 +244,13 @@ export async function inventoriesByStrategy(
         .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