@things-factory/worksheet-base 3.6.45 → 3.6.49

package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/undo-repackaging.js.map

@@ -1 +1 @@
-{"version":3,"file":"undo-repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/undo-repackaging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"undo-repackaging.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/repackaging/undo-repackaging.ts"],"names":[],"mappings":"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"}

package/dist-server/utils/inventory-util.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inventoriesByStrategy = exports.checkPalletIdenticallity = exports.checkPalletDuplication = exports.switchLocationStatus = exports.generateInventoryHistory = void 0;
+const typeorm_1 = require("typeorm");
 const product_base_1 = require("@things-factory/product-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
-const typeorm_1 = require("typeorm");
 /**
  * @description It will insert new record into inventory histories table.
  * seq will be calculated based on number of records for one specific pallet id (provided by inventory object)
  */
-async function generateInventoryHistory(inventory, refOrder, transactionType, qty, uomValue, user, trxMgr) {
+async function generateInventoryHistory(inventory, refOrder, transactionType, qty, uomValue, user, trxMgr, targetInventory = {}) {
     var _a, _b, _c;
     const invHistoryRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(warehouse_base_1.InventoryHistory)) || (0, typeorm_1.getRepository)(warehouse_base_1.InventoryHistory);
     const invRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(warehouse_base_1.Inventory)) || (0, typeorm_1.getRepository)(warehouse_base_1.Inventory);
@@ -54,6 +54,7 @@ async function generateInventoryHistory(inventory, refOrder, transactionType, qt
     inventoryHistory.orderNo = (refOrder === null || refOrder === void 0 ? void 0 : refOrder.name) || null;
     inventoryHistory.orderRefNo = (refOrder === null || refOrder === void 0 ? void 0 : refOrder.refNo) || null;
     inventoryHistory.inventory = inventory;
+    inventoryHistory.targetInventory = targetInventory;
     inventoryHistory.product = inventory.product;
     inventoryHistory.reusablePallet = inventory.reusablePallet;
     inventoryHistory.zone = inventory.zone;

package/dist-server/utils/inventory-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "3.6.45",
+  "version": "3.6.49",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,20 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^3.6.45",
-    "@things-factory/biz-base": "^3.6.45",
+    "@things-factory/auth-base": "^3.6.49",
+    "@things-factory/biz-base": "^3.6.49",
     "@things-factory/document-template-base": "^3.6.45",
-    "@things-factory/id-rule-base": "^3.6.45",
-    "@things-factory/integration-lmd": "^3.6.45",
-    "@things-factory/integration-marketplace": "^3.6.45",
-    "@things-factory/integration-sellercraft": "^3.6.45",
-    "@things-factory/marketplace-base": "^3.6.45",
-    "@things-factory/notification": "^3.6.45",
-    "@things-factory/sales-base": "^3.6.45",
-    "@things-factory/setting-base": "^3.6.45",
+    "@things-factory/id-rule-base": "^3.6.49",
+    "@things-factory/integration-lmd": "^3.6.49",
+    "@things-factory/integration-marketplace": "^3.6.49",
+    "@things-factory/integration-sellercraft": "^3.6.49",
+    "@things-factory/marketplace-base": "^3.6.49",
+    "@things-factory/notification": "^3.6.49",
+    "@things-factory/sales-base": "^3.6.49",
+    "@things-factory/setting-base": "^3.6.49",
     "@things-factory/shell": "^3.6.45",
-    "@things-factory/transport-base": "^3.6.45",
-    "@things-factory/warehouse-base": "^3.6.45"
+    "@things-factory/transport-base": "^3.6.49",
+    "@things-factory/warehouse-base": "^3.6.49"
   },
-  "gitHead": "a56491c920df03e4b3806923b9abb547efb39d83"
+  "gitHead": "5333dd82de9aae441deed3a4b7d5ba228c1b0092"
 }

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

@@ -21,7 +21,9 @@ export class PackingWorksheetController extends VasWorksheetController {
 
     const existingPackingWorksheet: Worksheet = await this.trxMgr
       .getRepository(Worksheet)
-      .findOne({ where: { domain: this.domain, releaseGood } })
+      .findOne({
+        where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
+      })
 
     if (existingPackingWorksheet) throw new Error('There is existing packing worksheet that has been generated')
     let worksheet: Worksheet = await this.createWorksheet(releaseGood, WORKSHEET_TYPE.PACKING)

package/server/controllers/render-grn.ts

@@ -153,6 +153,14 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     company_email: foundCP.email,
     company_brn: domainBizplace.company.brn,
     company_address: domainBizplace.company.address,
+    warehouse_address: foundCP.address,
+    warehouse_address2: foundCP.address2,
+    warehouse_postcode: foundCP.postCode,
+    warehouse_city: foundCP.city,
+    warehouse_state: foundCP.state,
+    warehouse_phone: foundCP.phone,
+    warehouse_fax: foundCP.fax,
+    warehouse_email: foundCP.email,
     order_no: foundGRN.name,
     gan_no: foundGAN.name,
     gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',

package/server/controllers/render-ro-do.ts

@@ -1,13 +1,15 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { Equal, getRepository, In } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
-import { DeliveryOrder, OrderInventory, ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
+import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { Equal, getRepository, In } from 'typeorm'
+
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
 
@@ -46,7 +48,7 @@ export async function renderRODO({ doNo }, context: any) {
   const ownRefNo = foundRO.refNo
 
   const partnerDomain: Partner = await getRepository(Partner).findOne({
-    where: { partnerDomain: partnerBiz.domain },
+    where: { partnerDomain: partnerBiz.domain, domain },
     relations: ['domain']
   })
 
@@ -202,12 +204,24 @@ export async function renderRODO({ doNo }, context: any) {
     company_domain: domainBizplace.company.name,
     company_brn: domainBizplace.company.brn,
     company_address: domainBizplace.company.address,
+    company_email: foundWarehouseCP.email ? foundWarehouseCP.email : null,
     company_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
+    warehouse_address: foundWarehouseCP ? foundWarehouseCP.address : null,
+    warehouse_address2: foundWarehouseCP ? foundWarehouseCP.address2 : null,
+    warehouse_postcode: foundWarehouseCP ? foundWarehouseCP.postCode : null,
+    warehouse_city: foundWarehouseCP ? foundWarehouseCP.city : null,
+    warehouse_state: foundWarehouseCP ? foundWarehouseCP.state : null,
     warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
-    company_email: foundWarehouseCP.email,
+    warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
+    warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
     customer_name: foundCP ? foundCP.name : null,
     customer_delivery_address: foundCP ? foundCP.address : null,
     customer_billing_address: foundCP ? foundCP.billingAddress : null,
+    new_delivery_address: foundRO?.deliveryAddress1 || null,
+    new_delivery_address2: foundRO?.deliveryAddress2 || null,
+    new_billing_address: foundRO?.billingAddress || null,
+    new_attention_to: foundRO?.attentionTo || null,
+    new_phone_no: foundRO?.phone1 || null,
     customer_phone: foundCP ? foundCP.phone : null,
     customer_fax: foundCP ? foundCP.fax : null,
     customer_email: foundCP ? foundCP.email : null,

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

@@ -1,28 +1,30 @@
+import { EntityManager, Equal, In, Not } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { Product } from '@things-factory/product-base'
 import {
   ArrivalNotice,
-  OrderNoGenerator,
-  OrderVas,
   ORDER_STATUS,
   ORDER_TYPES,
   ORDER_VAS_STATUS,
+  OrderNoGenerator,
+  OrderVas,
   ReleaseGood,
-  VasOrder,
-  VAS
+  VAS,
+  VasOrder
 } from '@things-factory/sales-base'
-import { Product } from '@things-factory/product-base'
 import {
   Inventory,
-  InventoryHistory,
-  InventoryNoGenerator,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
+  InventoryHistory,
+  InventoryNoGenerator,
   Location,
   LOCATION_TYPE,
   Warehouse
 } from '@things-factory/warehouse-base'
-import { EntityManager, Equal, Not, In } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import {
@@ -30,10 +32,12 @@ import {
   completeRepackaging,
   completeRepalletizing,
   completeUnpacking,
+  FeaturedInventoryInterface,
   RefOrderType
 } from '../../graphql/resolvers/worksheet/vas-transactions'
-import { ReferenceOrderType, WorksheetController } from '.././worksheet-controller'
+import { PackingUnits } from '../../graphql/resolvers/worksheet/vas-transactions/interfaces/repackaging'
 import { generateInventoryHistory } from '../../utils'
+import { ReferenceOrderType, WorksheetController } from '../worksheet-controller'
 
 type CompleteTransactionType = (trxMgr: EntityManager, orderVas: OrderVas, user: User) => Promise<void>
 
@@ -41,6 +45,7 @@ export class VasWorksheetController extends WorksheetController {
   private readonly COMPLETE_TRX_MAP: Record<string, CompleteTransactionType> = {
     'vas-repalletizing': completeRepalletizing,
     'vas-repack': completeRepackaging,
+    'vas-repack-relabel': completeRepackaging,
     'vas-relabel': completeRelabeling,
     'vas-unpack': completeUnpacking
   }
@@ -102,20 +107,88 @@ export class VasWorksheetController extends WorksheetController {
         return acc + inv.qty
       }, 0)
 
+      let operationGuide = JSON.parse(targetVas.operationGuide)
+      let vasOperationGuide = targetVas.vas?.operationGuide
+
+      if (vasOperationGuide === 'vas-repack' || vasOperationGuide === 'vas-repack-relabel') {
+        const mainInventory: Inventory = inventories[0]
+        const featuredInvs: FeaturedInventoryInterface[] = []
+        const foundInvs: Inventory[] = await this.trxMgr
+          .getRepository(Inventory)
+          .findByIds(inventories.filter(inv => inv.id !== mainInventory.id).map(inv => inv.id))
+
+        /* Update lockedQty of featuredInvs */
+        for (let inventory of foundInvs) {
+          const transferQty: number = inventories.find(inv => inv.id === inventory.id).qty
+          const transferUomValue: number = Math.round((inventory.uomValue / inventory.qty) * transferQty * 100) / 100
+
+          inventory.lockedQty += transferQty
+          inventory.lockedUomValue += transferUomValue
+
+          await this.trxMgr.getRepository(Inventory).save(inventory)
+
+          let featuredInv: FeaturedInventoryInterface = {
+            palletId: inventory.palletId,
+            originalQty: transferQty,
+            originalUomValue: transferUomValue,
+            packingSize: inventory.packingSize,
+            uomValuePerQty: inventory.uomValue / (inventory.qty * inventory.packingSize)
+          }
+
+          switch (operationGuide.data?.packingUnit) {
+            case PackingUnits.QTY:
+              featuredInv.currentUnitQty = transferQty * inventory.packingSize
+              break
+
+            case PackingUnits.UOM:
+              featuredInv.currentUomValue = transferUomValue
+              break
+          }
+
+          featuredInvs.push(featuredInv)
+        }
+
+        /* assign featuredInvs inside operationGuide.data */
+        operationGuide.data = {
+          ...operationGuide.data,
+          featuredInvs
+        }
+
+        /* assign main inventory as the only inventories */
+        inventories = [mainInventory]
+      }
+
       for (let inventory of inventories) {
         let newTargetVas: OrderVas = new OrderVas()
 
         const foundInventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne(inventory.id)
-        const unitUomValue: number = foundInventory.uomValue / foundInventory.qty
-        const assignedQty = inventory.qty // assigned inventory qty that was passed from client side
+        if (!foundInventory) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(inventory.id))
 
-        let operationGuide = JSON.parse(targetVas.operationGuide)
+        // assigned inventory qty that was passed from client side
+        const assignedQty = inventory.qty
+        const unitUomValue: number = foundInventory.uomValue / foundInventory.qty
 
         // update unpack qty for unpacking vas
-        if (targetVas.vas?.operationGuide === 'vas-unpack') {
+        if (vasOperationGuide === 'vas-unpack') {
           operationGuide.data.unpackQty = Math.round(operationGuide.data.unpackQty / accInventoriesQty) * assignedQty
         }
 
+        if (vasOperationGuide === 'vas-repack' || vasOperationGuide === 'vas-repack-relabel') {
+          switch (operationGuide.data?.packingUnit) {
+            case PackingUnits.UOM:
+              newTargetVas.qty = 1
+              newTargetVas.uomValue = targetVas.uomValue
+              break
+
+            default:
+              newTargetVas.qty = accInventoriesQty
+              newTargetVas.uomValue = accInventoriesQty * unitUomValue
+          }
+        } else {
+          newTargetVas.qty = assignedQty
+          newTargetVas.uomValue = assignedQty * unitUomValue
+        }
+
         newTargetVas.set = targetVas.set
         newTargetVas.targetType = targetVas.targetType
         newTargetVas.targetBatchId = targetVas.targetBatchId
@@ -129,8 +202,6 @@ export class VasWorksheetController extends WorksheetController {
         newTargetVas.vas = targetVas.vas
         newTargetVas.domain = this.domain
         newTargetVas.name = OrderNoGenerator.orderVas()
-        newTargetVas.qty = assignedQty
-        newTargetVas.uomValue = assignedQty * unitUomValue
         newTargetVas.inventory = foundInventory
         newTargetVas.bizplace = bizplace
         newTargetVas.creator = this.user
@@ -141,15 +212,13 @@ export class VasWorksheetController extends WorksheetController {
         seq++
 
         // update inventory locked qty & uom value
-        const currentLockedQty: any = inventory.lockedQty
-        const currentLockedUomValue: any = inventory.lockedUomValue
+        const currentLockedQty: number = foundInventory.lockedQty || 0
+        const currentLockedUomValue: number = foundInventory.lockedUomValue || 0
 
         await this.trxMgr.getRepository(Inventory).save({
           ...foundInventory,
-          lockedQty: !!currentLockedQty ? targetVas.qty + currentLockedQty : targetVas.qty,
-          lockedUomValue: !!currentLockedUomValue
-            ? targetVas.qty * unitUomValue + currentLockedUomValue
-            : targetVas.qty * unitUomValue,
+          lockedQty: inventory.qty + currentLockedQty,
+          lockedUomValue: inventory.qty * unitUomValue + currentLockedUomValue,
           updater: this.user
         })
       }
@@ -360,13 +429,19 @@ export class VasWorksheetController extends WorksheetController {
       }
     }
 
-    const targetVas: Inventory = foundWorksheetDetail.targetVas
+    const targetVas: VasOrder = foundWorksheetDetail.targetVas
     if (!targetVas) throw new Error(`VAS doesn't exists`)
 
     const inventory: Inventory = foundWorksheetDetail.targetVas.inventory
 
     // reset lockedQty if there's inventory found
-    if (inventory && inventory.lockedQty >= targetVas.qty) {
+    if (
+      inventory &&
+      inventory.lockedQty >= targetVas.qty &&
+      targetVas.vas.operationGuide &&
+      targetVas.vas.operationGuide !== 'vas-repack' &&
+      targetVas.vas.operationGuide !== 'vas-repack-relabel'
+    ) {
       await this.trxMgr.getRepository(Inventory).save({
         ...inventory,
         lockedQty: inventory.lockedQty - targetVas.qty,
@@ -664,6 +739,12 @@ export class VasWorksheetController extends WorksheetController {
         (wsd: WorksheetDetail) => wsd.targetVas.id === targetVas.id
       )
 
+      // if (targetVas.operationGuide && (!issue || (targetVas.vas.name.toUpperCase() == VAS.REPACKAGING && issue))) {
+      //   await this.doOperationTransaction(targetVas)
+      // } /*else if (targetVas.operationGuide && targetVas.vas.name.toUpperCase() === VAS.REPACKAGING && issue) {
+      //   await this.doOperationTransaction(targetVas)
+      // }*/
+
       if (targetVas.operationGuide && !issue) {
         await this.doOperationTransaction(targetVas)
       }

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -3,14 +3,9 @@ import { EntityManager } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
-import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import {
-  MarketplaceOrder,
-  MarketplaceOrderItem,
-  MarketplaceOrderShipping,
-  MarketplaceTransporter
-} from '@things-factory/marketplace-base'
+import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
@@ -147,12 +142,12 @@ export async function completePicking(
           pickupCity: warehouseContactPoint.city,
           pickupPhone: warehouseContactPoint.phone,
           pickupEmail: warehouseContactPoint.email,
-          name: marketplaceOrderShipping.attentionTo.trim(),
-          address1: marketplaceOrderShipping.address1.trim(),
-          address2: marketplaceOrderShipping.address2.trim(),
-          postCode: marketplaceOrderShipping.postCode.trim(),
-          city: marketplaceOrderShipping.city.trim(),
-          state: marketplaceOrderShipping.state.trim(),
+          name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
+          address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
+          address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
+          postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
+          city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
+          state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
           phone: marketplaceOrderShipping.phone1 || '',
           email: marketplaceOrderShipping.email || '',
           attentionTo: marketplaceOrderShipping.attentionTo,
@@ -193,33 +188,33 @@ export async function completePicking(
   if (releaseGood.packingOption) {
     const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
     await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)
-  }
+  } else {
+    // Find Existing Loading Worksheet if any
+    const existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
+      where: {
+        releaseGood,
+        type: WORKSHEET_TYPE.LOADING,
+        status: WORKSHEET_STATUS.DEACTIVATED
+      }
+    })
 
-  // Find Existing Loading Worksheet if any
-  const existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
-    where: {
-      releaseGood,
-      type: WORKSHEET_TYPE.LOADING,
-      status: WORKSHEET_STATUS.DEACTIVATED
-    }
-  })
+    if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
+      const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
+      let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(
+        releaseGoodNo,
+        pickedTargetInventories
+      )
 
-  if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
-    const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
-    let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(
-      releaseGoodNo,
-      pickedTargetInventories
-    )
+      if (!loadingWorksheet.worksheetDetails?.length) {
+        loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)
+      }
 
-    if (!loadingWorksheet.worksheetDetails?.length) {
-      loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id)
+      const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
+      await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
+    } else {
+      throw new Error(
+        'Picking completion has been triggered twice, loading worksheet has been generated. Kindly proceed to loading.'
+      )
     }
-
-    const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
-    await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
-  } else {
-    throw new Error(
-      'Picking completion has been triggered twice, loading worksheet has been generated. Kindly proceed to loading.'
-    )
   }
 }