@things-factory/worksheet-base 4.3.771 → 4.3.772

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -440,19 +440,17 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       foundInventory = await this.trxMgr.getRepository(Inventory).save(newInventory)
 
       //refer to scanUnload
-      newInventory = await this.transactionInventory(
-        newInventory,
+      await generateInventoryHistory(
+        foundInventory,
         Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
-        newInventory.qty,
-        newInventory.uomValue,
-        INVENTORY_TRANSACTION_TYPE.UNLOADING
+        INVENTORY_TRANSACTION_TYPE.UNLOADING,
+        foundInventory.qty,
+        foundInventory.uomValue,
+        this.user,
+        this.trxMgr
       )
     } else {
-      const updatedQty: number = foundInventory.qty + qty
-      foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
-      foundInventory.manufactureDate = foundInventory?.manufactureDate ? new Date(foundInventory?.manufactureDate) : null
-      foundInventory.qty = updatedQty
-      foundInventory.uomValue +=
+      const addUomValue: number =
         Math.round(
           qty *
             (Boolean(arrivalNotice)
@@ -460,20 +458,39 @@ export class UnloadingWorksheetController extends VasWorksheetController {
               : targetInventory.returnUomValue / targetInventory.returnQty) *
             1000
         ) / 1000
-      foundInventory.conditionOfGoods = conditionOfGoods ?? foundInventory.conditionOfGoods // DEFAULT BACK TO PREVIOUS INVENTORY'S CONDITION OF GOODS
 
-      //refer to scanUnload
-      foundInventory = await this.transactionInventory(
+      const updateFields: any = {
+        qty: () => `"qty" + :addQty::numeric`,
+        uomValue: () => `"uom_value" + :addUomValue::numeric`,
+        updater: this.user,
+        updatedAt: new Date()
+      }
+      if (conditionOfGoods) {
+        updateFields.conditionOfGoods = conditionOfGoods
+      }
+      await this.trxMgr.getRepository(Inventory).createQueryBuilder()
+        .update(Inventory).set(updateFields)
+        .setParameter('addQty', qty)
+        .setParameter('addUomValue', addUomValue)
+        .where('id = :id', { id: foundInventory.id }).execute()
+
+      // Update in-memory for downstream
+      foundInventory.qty += qty
+      foundInventory.uomValue += addUomValue
+      if (conditionOfGoods) foundInventory.conditionOfGoods = conditionOfGoods
+
+      await generateInventoryHistory(
         foundInventory,
         Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
+        INVENTORY_TRANSACTION_TYPE.UNLOADING,
         foundInventory.qty,
         foundInventory.uomValue,
-        INVENTORY_TRANSACTION_TYPE.UNLOADING
+        this.user,
+        this.trxMgr
       )
 
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
-      foundInventory = await this.trxMgr.getRepository(Inventory).save(foundInventory)
     }
 
     let inventoryItem: InventoryItem = new InventoryItem()
@@ -770,14 +787,20 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     let foundInventory: Inventory = await invQb.getOne()
     if (!foundInventory) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(foundInventory.palletId))
 
+    await this.trxMgr.getRepository(Inventory).update(
+      { id: foundInventory.id },
+      { status: INVENTORY_STATUS.UNLOADED, updater: this.user }
+    )
     foundInventory.status = INVENTORY_STATUS.UNLOADED
 
-    foundInventory = await this.transactionInventory(
+    await generateInventoryHistory(
       foundInventory,
       Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
+      INVENTORY_TRANSACTION_TYPE.UNLOADING,
       foundInventory.qty,
       foundInventory.uomValue,
-      INVENTORY_TRANSACTION_TYPE.UNLOADING
+      this.user,
+      this.trxMgr
     )
   }
 
@@ -888,14 +911,23 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(Inventory).save(inventory)
 
         if (inventory.qty == 0) {
+          await this.trxMgr.getRepository(Inventory).createQueryBuilder()
+            .update(Inventory).set({
+              lastSeq: () => `"last_seq" + 1`,
+              status: INVENTORY_STATUS.DELETED,
+              updater: this.user, updatedAt: new Date()
+            })
+            .where('id = :id', { id: inventory.id }).execute()
           inventory.lastSeq++
           inventory.status = INVENTORY_STATUS.DELETED
-          inventory = await this.transactionInventory(
+          await generateInventoryHistory(
             inventory,
             Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+            INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING,
             -inventory.qty,
             -inventory.uomValue,
-            INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+            this.user,
+            this.trxMgr
           )
           inventory.qty = 0
           inventory.uomValue = 0
@@ -909,14 +941,23 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
         }
       } else {
+        await this.trxMgr.getRepository(Inventory).createQueryBuilder()
+          .update(Inventory).set({
+            lastSeq: () => `"last_seq" + 1`,
+            status: INVENTORY_STATUS.DELETED,
+            updater: this.user, updatedAt: new Date()
+          })
+          .where('id = :id', { id: inventory.id }).execute()
         inventory.lastSeq++
         inventory.status = INVENTORY_STATUS.DELETED
-        inventory = await this.transactionInventory(
+        await generateInventoryHistory(
           inventory,
           Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+          INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING,
           -inventory.qty,
           -inventory.uomValue,
-          INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+          this.user,
+          this.trxMgr
         )
         inventory.qty = 0
         inventory.uomValue = 0
@@ -1096,12 +1137,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       }
 
       for (const inventory of inventories) {
-        await this.transactionInventory(
+        await generateInventoryHistory(
           inventory,
           arrivalNotice,
+          INVENTORY_TRANSACTION_TYPE.UNLOADING,
           inventory.qty,
           inventory.uomValue,
-          INVENTORY_TRANSACTION_TYPE.UNLOADING
+          this.user,
+          this.trxMgr
         )
       }
     } catch (e) {

package/server/controllers/outbound/packing-worksheet-controller.ts

@@ -18,6 +18,7 @@ import {
 } from '@things-factory/sales-base'
 import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
 import {
+  generateInventoryHistory,
   Inventory,
   INVENTORY_ITEM_SOURCE,
   INVENTORY_STATUS,
@@ -296,7 +297,7 @@ export class PackingWorksheetController extends VasWorksheetController {
           await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
         }
 
-        await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.PACKING)
+        await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.PACKING, 0, 0, this.user, this.trxMgr)
 
         worksheetDetail.status = WORKSHEET_STATUS.DONE
       }
@@ -484,7 +485,7 @@ export class PackingWorksheetController extends VasWorksheetController {
 
       if (orderInventory.packedQty === releaseQty) {
         orderInventory.status = ORDER_INVENTORY_STATUS.PACKED
-        await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.PACKING)
+        await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.PACKING, 0, 0, this.user, this.trxMgr)
         await this.trxMgr.getRepository(WorksheetDetail).update(
           { targetInventory: { id: orderInventory.id }, type: 'PACKING' },
           {

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -1414,10 +1414,31 @@ export class PickingWorksheetController extends VasWorksheetController {
         if (!toLocation) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(locationName))
 
         if (fromLocation.id !== toLocation.id) {
+          await this.trxMgr
+            .getRepository(Inventory)
+            .update(
+              { id: inventory.id },
+              {
+                location: toLocation,
+                warehouse: toLocation.warehouse,
+                zone: toLocation.zone,
+                updater: this.user
+              }
+            )
+
           inventory.location = toLocation
           inventory.warehouse = toLocation.warehouse
           inventory.zone = toLocation.zone
-          inventory = await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.RELOCATE)
+
+          await generateInventoryHistory(
+            inventory,
+            releaseGood,
+            INVENTORY_TRANSACTION_TYPE.RELOCATE,
+            0,
+            0,
+            this.user,
+            this.trxMgr
+          )
         }
       }
     } catch (error) {
@@ -1578,10 +1599,31 @@ export class PickingWorksheetController extends VasWorksheetController {
         if (!toLocation) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(locationName))
 
         if (fromLocation.id !== toLocation.id) {
+          await this.trxMgr
+            .getRepository(Inventory)
+            .update(
+              { id: inventory.id },
+              {
+                location: toLocation,
+                warehouse: toLocation.warehouse,
+                zone: toLocation.zone,
+                updater: this.user
+              }
+            )
+
           inventory.location = toLocation
           inventory.warehouse = toLocation.warehouse
           inventory.zone = toLocation.zone
-          await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.RELOCATE)
+
+          await generateInventoryHistory(
+            inventory,
+            releaseGood,
+            INVENTORY_TRANSACTION_TYPE.RELOCATE,
+            0,
+            0,
+            this.user,
+            this.trxMgr
+          )
         }
       }
     }

package/server/controllers/outbound/returning-worksheet-controller.ts

@@ -1,5 +1,6 @@
 import { OrderInventory, ORDER_INVENTORY_STATUS, ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
 import {
+  generateInventoryHistory,
   Inventory,
   Warehouse,
   INVENTORY_STATUS,
@@ -114,24 +115,37 @@ export class ReturningWorksheetController extends VasWorksheetController {
       throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('return', 'pallet ID is not matched'))
     }
 
+    const isLocationChanged: boolean = originLocation.id !== toLocation.id
+
+    const updateFields: any = {
+      qty: () => `"qty" + :addQty::numeric`,
+      uomValue: () => `"uom_value" + :addUomValue::numeric`,
+      status: INVENTORY_STATUS.STORED,
+      updater: this.user,
+      updatedAt: new Date()
+    }
+    if (isLocationChanged) {
+      updateFields.location = toLocation
+      updateFields.warehouse = toLocation.warehouse
+      updateFields.zone = toLocation.zone
+    }
+    await this.trxMgr.getRepository(Inventory).createQueryBuilder()
+      .update(Inventory).set(updateFields)
+      .setParameter('addQty', targetInventory.releaseQty)
+      .setParameter('addUomValue', targetInventory.releaseUomValue)
+      .where('id = :id', { id: inventory.id }).execute()
+
+    // Update in-memory for downstream
     inventory.qty += targetInventory.releaseQty
     inventory.uomValue += targetInventory.releaseUomValue
     inventory.status = INVENTORY_STATUS.STORED
-
-    const isLocationChanged: boolean = originLocation.id !== toLocation.id
     if (isLocationChanged) {
       inventory.location = toLocation
       inventory.warehouse = toLocation.warehouse
       inventory.zone = toLocation.zone
     }
 
-    await this.transactionInventory(
-      inventory,
-      releaseGood,
-      targetInventory.releaseQty,
-      targetInventory.releaseUomValue,
-      INVENTORY_TRANSACTION_TYPE.RETURN
-    )
+    await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.RETURN, targetInventory.releaseQty, targetInventory.releaseUomValue, this.user, this.trxMgr)
 
     // update status of order inventory
     targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
@@ -205,19 +219,30 @@ export class ReturningWorksheetController extends VasWorksheetController {
       const warehouse: Warehouse = location.warehouse
       const zone: string = warehouse.zone
 
+      await this.trxMgr.getRepository(Inventory).createQueryBuilder()
+        .update(Inventory).set({
+          qty: () => `"qty" + :addQty::numeric`,
+          uomValue: () => `"uom_value" + :addUomValue::numeric`,
+          status: INVENTORY_STATUS.STORED,
+          location: location,
+          warehouse: warehouse,
+          zone: zone,
+          updater: this.user,
+          updatedAt: new Date()
+        })
+        .setParameter('addQty', targetInventory.releaseQty)
+        .setParameter('addUomValue', targetInventory.releaseUomValue)
+        .where('id = :id', { id: inventory.id }).execute()
+
+      // Update in-memory for downstream
       inventory.qty += targetInventory.releaseQty
       inventory.uomValue += targetInventory.releaseUomValue
       inventory.location = location
       inventory.status = INVENTORY_STATUS.STORED
       inventory.warehouse = warehouse
       inventory.zone = zone
-      await this.transactionInventory(
-        inventory,
-        releaseGood,
-        targetInventory.releaseQty,
-        targetInventory.releaseUomValue,
-        INVENTORY_TRANSACTION_TYPE.RETURN
-      )
+
+      await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.RETURN, targetInventory.releaseQty, targetInventory.releaseUomValue, this.user, this.trxMgr)
 
       targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
       targetInventory.updater = this.user

package/server/controllers/outbound/sorting-worksheet-controller.ts

@@ -14,6 +14,7 @@ import {
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import {
+  generateInventoryHistory,
   Inventory,
   INVENTORY_ITEM_SOURCE,
   INVENTORY_STATUS,
@@ -347,7 +348,7 @@ export class SortingWorksheetController extends VasWorksheetController {
           if (matchingOI.sortedQty == pickedQty) {
             matchingOI.status = ORDER_INVENTORY_STATUS.SORTED
             await this.updateOrderTargets([matchingOI])
-            await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.SORTING)
+            await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.SORTING, 0, 0, this.user, this.trxMgr)
 
             let worksheetDetail = worksheetDetails.find(wd => wd.targetInventory.id == matchingOI.id)
             await this.trxMgr
@@ -493,7 +494,7 @@ export class SortingWorksheetController extends VasWorksheetController {
             if (matchingOI.sortedQty == releaseQty) {
               matchingOI.status = ORDER_INVENTORY_STATUS.SORTED
               await this.updateOrderTargets([matchingOI])
-              await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.SORTING)
+              await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.SORTING, 0, 0, this.user, this.trxMgr)
 
               let inventoryItems: InventoryItem = await this.trxMgr
                 .getRepository(InventoryItem)

package/server/controllers/replenishment/replenishment-worksheet-controller.ts

@@ -572,13 +572,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
         await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
       }
 
-      await this.transactionInventory(
-        newInventory,
-        replenishment,
-        actualQty,
-        newUomValue,
-        INVENTORY_TRANSACTION_TYPE.RELOCATE
-      )
+      await generateInventoryHistory(newInventory, replenishment, INVENTORY_TRANSACTION_TYPE.RELOCATE, actualQty, newUomValue, this.user, this.trxMgr)
 
       if (actualQty + targetInventory.actualPackQty === targetInventory.releaseQty) {
         targetInventory.actualPackQty = targetInventory.releaseQty

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts

@@ -24,7 +24,7 @@ import {
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_TRANSACTION_TYPE, InventoryUtil } from '@things-factory/warehouse-base'
+import { generateInventoryHistory, Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
 
 import { PickingWorksheetController } from '../../../../controllers/'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
@@ -66,8 +66,6 @@ export async function generatePickingWorksheet(
     })
 
     if (releaseGood.type == 'b2c' && directReleaseOrder && directReleaseOrder.value.toLowerCase() == 'true') {
-      const inventoryUtil = new InventoryUtil(tx, domain, user)
-
       await mmsProcessOrder(tx, domain, user, releaseGood, context)
 
       let orderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
@@ -86,19 +84,19 @@ export async function generatePickingWorksheet(
           .getRepository(Inventory)
           .findOne({ where: { id: orderInventory.inventory.id } })
 
-        await inventoryUtil.transactionInventory(
-          {
-            id: inventory.id,
-            qty: inventory.qty - orderInventory.releaseQty,
-            uomValue: Math.round((inventory.uomValue - orderInventory.releaseUomValue) * 100) / 100,
-            lockedQty: inventory.lockedQty - orderInventory.releaseQty,
-            lockedUomValue: Math.round((inventory.lockedUomValue - orderInventory.releaseUomValue) * 100) / 100
-          },
-          releaseGood,
-          -orderInventory.releaseQty,
-          -orderInventory.releaseUomValue,
-          INVENTORY_TRANSACTION_TYPE.DIRECT_DEDUCTION
-        )
+        await tx.getRepository(Inventory).createQueryBuilder()
+          .update(Inventory).set({
+            qty: () => `"qty" - :releaseQty::numeric`,
+            uomValue: () => `ROUND(("uom_value" - :releaseUomValue::numeric)::numeric, 2)`,
+            lockedQty: () => `"locked_qty" - :releaseQty::numeric`,
+            lockedUomValue: () => `ROUND(("locked_uom_value" - :releaseUomValue::numeric)::numeric, 2)`,
+            updater: user, updatedAt: new Date()
+          })
+          .setParameter('releaseQty', orderInventory.releaseQty)
+          .setParameter('releaseUomValue', orderInventory.releaseUomValue)
+          .where('id = :id', { id: inventory.id }).execute()
+
+        await generateInventoryHistory(inventory, releaseGood, INVENTORY_TRANSACTION_TYPE.DIRECT_DEDUCTION, -orderInventory.releaseQty, -orderInventory.releaseUomValue, user, tx)
 
         await tx
           .getRepository(OrderInventory)