@things-factory/worksheet-base 3.6.45 → 3.6.49

package/server/graphql/resolvers/worksheet/vas-transactions/repackaging/undo-repackaging.ts

@@ -1,20 +1,40 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Inventory } from '@things-factory/warehouse-base'
-import { OrderVas, VasOrder } from '@things-factory/sales-base'
+import {
+  OrderVas,
+  VasOrder
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { Worksheet, WorksheetDetail } from '../../../../../entities'
-import { dismissInventory, getWorksheetDetailByName, updateRelatedOrderVas } from '../common-utils'
+import { Inventory } from '@things-factory/warehouse-base'
+
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../../../../entities'
 import {
+  getWorksheetDetailByName,
+  updateRelatedOrderVas
+} from '../common-utils'
+import {
+  FeaturedInventoryInterface,
   OperationGuideInterface,
   PackingUnits,
-  PalletChangesInterface,
   RefOrderType,
   RepackagingGuide,
-  RepackedInvInfo
+  RepackedInvInfo,
+  TemporaryPalletChangesInterface
 } from '../interfaces'
 
+/** STEPS TO UNDO REPACKAGING
+ *  1. get the pallet id to undo (pallet id must be the LV one and not the parent)
+ *  2. revert the qty of repackedFrom into the original inventory and featuredInv (if applicable)
+ *  3. remove the repackedInv for undo item
+ *  4. update the requiredPkgQty
+ *
+ */
+
 export const undoRepackagingResolver = {
   async undoRepackaging(_: any, { worksheetDetailName, fromPalletId, toPalletId }, context: any) {
     /**
@@ -30,37 +50,49 @@ export const undoRepackagingResolver = {
     let operationGuide: OperationGuideInterface<RepackagingGuide> = JSON.parse(targetVas.operationGuide)
     let operationGuideData: RepackagingGuide = operationGuide.data
     let repackedInvs: RepackedInvInfo[] = operationGuideData.repackedInvs
+    let featuredInvs: FeaturedInventoryInterface[] = operationGuideData.featuredInvs
     let undoInventory: RepackedInvInfo = repackedInvs.find((ri: RepackedInvInfo) => ri.palletId === toPalletId)
     if (!undoInventory) throw new Error(`Couldn't find pallet, using pallet id (${toPalletId})`)
 
     const packingUnit: string = operationGuideData.packingUnit
     const stdAmount: number = operationGuideData.stdAmount
 
-    undoInventory.repackedFrom = undoInventory.repackedFrom.filter(
-      (rf: PalletChangesInterface) => rf.fromPalletId !== fromPalletId
-    )
+    // undoInventory.repackedFrom = undoInventory.repackedFrom.filter(
+    //   (rf: TemporaryPalletChangesInterface) => rf.fromPalletId !== fromPalletId
+    // )
 
     // 완전히 Repacked 상태인 pallet count
-    const repackedPkgQty: number =
-      undoInventory.repackedFrom.reduce((totalAmount: number, rf: PalletChangesInterface) => {
-        const amount: number = packingUnit === PackingUnits.QTY ? rf.reducedQty : rf.reducedUomValue
-        totalAmount += amount
-        return totalAmount
-      }, 0) / stdAmount
+    // const repackedPkgQty: number =
+    //   undoInventory.repackedFrom.reduce((totalAmount: number, rf: TemporaryPalletChangesInterface) => {
+    //     const amount: number = packingUnit === PackingUnits.QTY ? rf.reducedUnitQty : rf.reducedUomValue
+    //     totalAmount += amount
+    //     return totalAmount
+    //   }, 0) / stdAmount
 
     // Undo를 발생한 수량 차이를 계산
-    undoInventory.repackedPkgQty = repackedPkgQty
-
-    // Pallet 전체가 취소된 경우
-    let updatedRepackedInvs: RepackedInvInfo[]
-    if (!undoInventory.repackedFrom?.length) {
-      updatedRepackedInvs = repackedInvs.filter((ri: RepackedInvInfo) => ri.palletId !== toPalletId)
-    } else {
-      updatedRepackedInvs = repackedInvs.map((ri: RepackedInvInfo) => {
-        if (ri.palletId === toPalletId) ri = undoInventory
-        return ri
-      })
-    }
+    // undoInventory.repackedPkgQty = repackedPkgQty
+
+    const updatedRepackedInvs: RepackedInvInfo[] = repackedInvs.filter(
+      (ri: RepackedInvInfo) => ri.palletId !== toPalletId
+    )
+
+    const updatedFeaturedInvs: FeaturedInventoryInterface[] = featuredInvs.reduce(
+      (inventories: FeaturedInventoryInterface[], currInv: FeaturedInventoryInterface) => {
+        undoInventory.repackedFrom.forEach(undoInv => {
+          if (undoInv.fromPalletId == currInv.palletId) {
+            if (packingUnit == PackingUnits.QTY) {
+              currInv.currentUnitQty += undoInv.reducedUnitQty
+            } else if (packingUnit == PackingUnits.UOM) {
+              currInv.currentUomValue += undoInv.reducedUomValue
+            }
+          }
+        })
+
+        inventories.push(currInv)
+        return inventories
+      },
+      []
+    )
 
     const requiredPackageQty: number = await getRequiredPackageQty(
       tx,
@@ -74,17 +106,17 @@ export const undoRepackagingResolver = {
     const repackedPackageQty: number = getRepackedPackageQty(updatedRepackedInvs)
 
     operationGuide.data.requiredPackageQty = requiredPackageQty - repackedPackageQty
+    operationGuide.data.featuredInvs = updatedFeaturedInvs
     operationGuide.data.repackedInvs = updatedRepackedInvs
 
     if (!(refOrder instanceof VasOrder)) {
-      // const palletChanges: PalletChangesInterface[] = operationGuide.data.repackedInvs
+      // const palletChanges: TemporaryPalletChangesInterface[] = operationGuide.data.repackedInvs
       //   .map((ri: RepackedInvInfo) => ri.repackedFrom)
       //   .flat()
 
-      const palletChanges: PalletChangesInterface[] = []
-      await dismissInventory(tx, wsd, targetVas, palletChanges, fromPalletId)
+      const palletChanges: TemporaryPalletChangesInterface[] = []
+      // await dismissInventory(tx, wsd, targetVas, palletChanges, fromPalletId)
     }
-
     // Update every order vas to share same operation guide
     await updateRelatedOrderVas(tx, domain, bizplace, wsd, targetVas, operationGuide, user)
   }

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