@things-factory/worksheet-base 4.3.770 → 4.3.772

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)