@things-factory/worksheet-base 5.0.0-alpha.5 → 5.0.0-alpha.52

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

@@ -20,11 +20,14 @@ import {
   VAS_TYPES
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import {
   Inventory,
+  INVENTORY_ITEM_SOURCE,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
   InventoryHistory,
+  InventoryItem,
   InventoryNoGenerator,
   Location,
   Pallet,
@@ -33,7 +36,7 @@ import {
 
 import { RULE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { DateGenerator } from '../../utils'
+import { DateGenerator, generateInventoryHistory } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
@@ -98,6 +101,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       ]
     })
     if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
+    const targetProduct: OrderProduct = worksheetDetail.targetProduct
+
+    if (targetProduct && targetProduct.status == ORDER_PRODUCT_STATUS.EDITED)
+      throw new Error('this product is pending for changes approval')
 
     const bizplace: Bizplace = worksheetDetail.bizplace
     const companyDomain: Domain = bizplace?.company?.domain
@@ -105,7 +112,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
     const returnOrder: ReturnOrder = worksheet.returnOrder
     const orderId: string = Boolean(arrivalNotice?.id) ? arrivalNotice.id : returnOrder.id
-    const targetProduct: OrderProduct = worksheetDetail.targetProduct
     const targetInventory: OrderInventory = worksheetDetail?.targetInventory
     const originInventory: OrderInventory = targetInventory ? targetInventory.inventory : null
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
@@ -241,6 +247,193 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
   }
 
+  async scanSerialNumberUnload(
+    worksheetDetailName: string,
+    serialNumber: string,
+    inventory: Partial<Inventory>
+  ): Promise<void> {
+    const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
+      where: {
+        name: worksheetDetailName,
+        status: Not(Equal(WORKSHEET_STATUS.DEACTIVATED))
+      },
+      relations: [
+        'bizplace',
+        'worksheet',
+        'worksheet.arrivalNotice',
+        'worksheet.returnOrder',
+        'worksheet.bufferLocation',
+        'worksheet.bufferLocation.warehouse',
+        'targetProduct',
+        'targetProduct.product',
+        'targetProduct.product.productDetails',
+        'targetProduct.product.productDetails.childProductDetail',
+        'targetInventory',
+        'targetInventory.product',
+        'targetInventory.product.productDetails',
+        'targetInventory.product.productDetails.childProductDetail'
+      ]
+    })
+    if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
+
+    if (!inventory?.palletId)
+      inventory.palletId = await generateId({
+        domain: this.domain,
+        type: RULE_TYPE.LOT_NUMBER_ID,
+        seed: { date: DateGenerator.generateDate() }
+      })
+
+    const targetProduct: OrderProduct = worksheetDetail.targetProduct
+
+    if (targetProduct.status == ORDER_PRODUCT_STATUS.EDITED)
+      throw new Error('this product is pending for changes approval')
+
+    const bizplace: Bizplace = worksheetDetail.bizplace
+    const worksheet: Worksheet = worksheetDetail.worksheet
+    const arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
+    const returnOrder: ReturnOrder = worksheet.returnOrder
+    const targetInventory: OrderInventory = worksheetDetail.targetInventory
+    const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
+    const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
+    const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
+    const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
+    let qty: number = 0
+    let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
+    const cartonId: string = inventory.cartonId
+    const orderId: string = Boolean(arrivalNotice) ? arrivalNotice.id : returnOrder.id
+    await this.checkSerialNumberDuplication(serialNumber, product)
+
+    qty++
+
+    const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
+      .getRepository(Inventory)
+      .createQueryBuilder('INV')
+      .where('INV.domain_id = :domainId', { domainId: this.domain.id })
+      .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
+      .andWhere('INV.product_id = :productId', { productId: product.id })
+      .andWhere('INV.batch_id = :batchId', { batchId: batchId })
+      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
+      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
+
+    if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
+    else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
+
+    if (inventory?.expirationDate) {
+      invQb.andWhere('INV.expiration_date = :expirationDate', {
+        expirationDate: inventory.expirationDate
+      })
+    }
+
+    if (inventory?.cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: inventory.cartonId })
+    else invQb.andWhere('INV.pallet_id = :palletId', { palletId: inventory.palletId })
+
+    let foundInventory: Inventory = await invQb.getOne()
+
+    const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
+    const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
+    const manufactureDate: number = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null
+    const location: Location = worksheet.bufferLocation
+    const warehouse: Warehouse = location.warehouse
+    const zone: string = location.zone
+    const unitCost: number = Boolean(arrivalNotice)
+      ? targetProduct?.unitPrice
+        ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
+            (1 + targetProduct.taxRate / 100)) /
+          targetProduct.packQty
+        : 0
+      : null
+
+    if (!foundInventory) {
+      let newInventory: Partial<Inventory> = new Inventory()
+      newInventory.bizplace = bizplace
+      newInventory.domain = this.domain
+      newInventory.name = InventoryNoGenerator.inventoryName()
+      newInventory.palletId = inventory.palletId
+      newInventory.cartonId = inventory.cartonId
+      newInventory.batchId = batchId
+      newInventory.batchIdRef = batchIdRef
+      newInventory.product = product
+      newInventory.packingType = packingType
+      newInventory.packingSize = packingSize
+      newInventory.uom = uom
+      newInventory.remark = remark
+      newInventory.qty = qty
+      newInventory.uomValue =
+        Math.round(
+          qty *
+            (Boolean(arrivalNotice)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue / targetInventory.returnQty) *
+            100
+        ) / 100
+      newInventory.manufactureDate = manufactureDate
+      newInventory.refOrderId = orderId
+      newInventory.unitCost = unitCost
+      if (inventory.reusablePallet?.id) {
+        newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+      }
+      newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
+      newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
+      newInventory.warehouse = warehouse
+      newInventory.location = location
+      newInventory.zone = zone
+      newInventory.status = INVENTORY_STATUS.CHECKED
+      newInventory.creator = this.user
+
+      if (inventory?.expirationDate) {
+        newInventory.expirationDate = new Date(inventory.expirationDate)
+      }
+
+      if (arrivalNotice) {
+        targetProduct.actualPalletQty++
+        targetProduct.actualPackQty = Boolean(targetProduct.actualPackQty) ? targetProduct.actualPackQty + qty : qty
+      } else if (returnOrder) {
+        targetInventory.actualPalletQty++
+        targetInventory.actualPackQty = Boolean(targetInventory.actualPackQty)
+          ? targetInventory.actualPackQty + qty
+          : qty
+      }
+      foundInventory = await this.trxMgr.getRepository(Inventory).save(newInventory)
+    } else {
+      const updatedQty: number = foundInventory.qty + qty
+      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
+      foundInventory.qty = updatedQty
+      foundInventory.uomValue +=
+        Math.round(
+          qty *
+            (Boolean(arrivalNotice)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue / targetInventory.returnQty) *
+            100
+        ) / 100
+      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()
+    inventoryItem.name = InventoryNoGenerator.inventoryItemName()
+    inventoryItem.serialNumber = serialNumber
+    inventoryItem.status = foundInventory.status
+    inventoryItem.inboundOrderId = foundInventory.refOrderId
+    inventoryItem.product = product
+    inventoryItem.inventory = foundInventory
+    inventoryItem.source = INVENTORY_ITEM_SOURCE.INBOUND
+    inventoryItem.domain = this.domain
+    inventoryItem.creator = this.user
+    inventoryItem.updater = this.user
+
+    await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
+
+    if (arrivalNotice) {
+      targetProduct.updater = this.user
+      this.updateOrderTargets([targetProduct])
+    } else if (returnOrder) {
+      targetInventory.updater = this.user
+      this.updateOrderTargets([targetInventory])
+    }
+  }
+
   async scanProductUnload(
     worksheetDetailName: string,
     productBarcode: string,
@@ -277,11 +470,15 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         seed: { date: DateGenerator.generateDate() }
       })
 
+    const targetProduct: OrderProduct = worksheetDetail.targetProduct
+
+    if (targetProduct.status == ORDER_PRODUCT_STATUS.EDITED)
+      throw new Error('this product is pending for changes approval')
+
     const bizplace: Bizplace = worksheetDetail.bizplace
     const worksheet: Worksheet = worksheetDetail.worksheet
     const arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
     const returnOrder: ReturnOrder = worksheet.returnOrder
-    const targetProduct: OrderProduct = worksheetDetail.targetProduct
     const targetInventory: OrderInventory = worksheetDetail.targetInventory
     const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
     const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
@@ -561,6 +758,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
         } else {
           targetProduct.actualPackQty--
+          // targetProduct.actualPalletQty--
         }
         targetProduct.updater = this.user
         await this.updateOrderTargets([targetProduct])
@@ -587,6 +785,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
         } else {
           targetInventory.actualPackQty--
+          // targetInventory.actualPalletQty--
         }
         targetInventory.updater = this.user
         await this.updateOrderTargets([targetInventory])
@@ -656,6 +855,60 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
   }
 
+  async undoSerialNumberUnload(worksheetDetailName: string, inventoryItemId: string): Promise<void> {
+    const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
+      where: { name: worksheetDetailName, domain: this.domain, status: Not(Equal(WORKSHEET_STATUS.DEACTIVATED)) },
+      relations: [
+        'worksheet',
+        'worksheet.arrivalNotice',
+        'worksheet.returnOrder',
+        'targetProduct',
+        'targetProduct.product'
+      ]
+    })
+
+    let worksheet: Worksheet = worksheetDetail.worksheet
+    let arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
+    let returnOrder: ReturnOrder = worksheet.returnOrder
+    let targetInventory: OrderInventory = worksheetDetail.targetInventory
+    let targetProduct: OrderProduct = worksheetDetail.targetProduct
+    let inventoryItem: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
+      where: { domain: this.domain, id: inventoryItemId },
+      relations: ['inventory', 'product']
+    })
+    let inventory: Inventory = inventoryItem.inventory
+
+    await this.trxMgr.getRepository(InventoryItem).delete(inventoryItem.id)
+
+    inventory.qty--
+    inventory.uomValue =
+      Math.round(
+        inventory.qty *
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
+      ) / 100
+    await this.trxMgr
+      .getRepository(Inventory)
+      .update({ id: inventory.id }, { qty: inventory.qty, uomValue: inventory.uomValue })
+
+    targetProduct.actualPackQty--
+
+    const inventoryItems: InventoryItem[] = await this.trxMgr.getRepository(InventoryItem).find({
+      where: { domain: this.domain, inboundOrderId: arrivalNotice.id, inventory }
+    })
+
+    if (inventoryItems?.length == 0) {
+      await this.trxMgr.getRepository(Inventory).delete(inventory.id)
+
+      targetProduct.actualPalletQty--
+    }
+
+    targetProduct.updater = this.user
+    await this.updateOrderTargets([targetProduct])
+  }
+
   async activateUnloading(
     worksheetNo: string,
     unloadingWorksheetDetails: UnloadingWorksheetDetail[]
@@ -715,6 +968,70 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     return worksheet
   }
 
+  async getProductScanningVal(arrivalNotice: ArrivalNotice) {
+    let productScanning: string = 'false'
+    const enableProductScanning: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: { domain: this.domain, category: 'id-rule', name: 'enable-product-scanning' }
+    })
+
+    if (enableProductScanning) productScanning = enableProductScanning.value
+
+    const partnerEnableProductScanning: PartnerSetting = await this.trxMgr.getRepository(PartnerSetting).findOne({
+      where: { setting: enableProductScanning, domain: this.domain, partnerDomain: arrivalNotice.bizplace?.domain }
+    })
+
+    if (partnerEnableProductScanning) productScanning = partnerEnableProductScanning.value
+
+    return productScanning
+  }
+
+  async getInputQtyVal(arrivalNotice: ArrivalNotice) {
+    let inputQty: string = 'false'
+    const enableInputQty: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: { domain: this.domain, category: 'id-rule', name: 'enable-input-qty' }
+    })
+
+    if (enableInputQty) inputQty = enableInputQty.value
+
+    const partnerEnableInputQty: PartnerSetting = await this.trxMgr.getRepository(PartnerSetting).findOne({
+      where: { setting: enableInputQty, domain: this.domain, partnerDomain: arrivalNotice.bizplace?.domain }
+    })
+
+    if (partnerEnableInputQty) inputQty = partnerEnableInputQty.value
+
+    return inputQty
+  }
+
+  // only creates inventory history upon partial or full unload when
+  // productScanning is true
+  // inputQty is false
+  async createInventoryHistory(arrivalNotice: ArrivalNotice, inventories?: Inventory[]) {
+    try {
+      if (inventories === undefined) {
+        const inventoryList = await this.trxMgr.getRepository(Inventory).findAndCount({
+          where: {
+            domain: this.domain,
+            refOrderId: arrivalNotice.id
+          }
+        })
+
+        inventories = inventoryList[0]
+      }
+
+      for (const inventory of inventories) {
+        await this.transactionInventory(
+          inventory,
+          arrivalNotice,
+          inventory.qty,
+          inventory.uomValue,
+          INVENTORY_TRANSACTION_TYPE.UNLOADING
+        )
+      }
+    } catch (e) {
+      throw e
+    }
+  }
+
   async completeUnloading(
     arrivalNoticeNo: string,
     unloadingWorksheetDetails: Partial<WorksheetDetail>[]
@@ -722,7 +1039,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     let arrivalNotice: ArrivalNotice = await this.findRefOrder(
       ArrivalNotice,
       { domain: this.domain, name: arrivalNoticeNo, status: In([ORDER_STATUS.PROCESSING, ORDER_STATUS.PUTTING_AWAY]) },
-      ['orderProducts', 'releaseGood']
+      ['orderProducts', 'releaseGood', 'bizplace', 'bizplace.domain']
     )
 
     if (arrivalNotice.crossDocking) {
@@ -785,6 +1102,47 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       await this.completeWorksheet(worksheet)
     }
 
+    const productScanning = await this.getProductScanningVal(arrivalNotice)
+    const inputQty = await this.getInputQtyVal(arrivalNotice)
+    if (productScanning === 'true' && inputQty === 'false') await this.createInventoryHistory(arrivalNotice)
+
+    const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
+      where: {
+        domain: this.domain,
+        refOrderId: arrivalNotice.id,
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
+      },
+      relations: ['domain', 'bizplace', 'product', 'warehouse', 'location']
+    })
+
+    for (let inventory of inventories) {
+      let inventoryItems: InventoryItem[] = await this.trxMgr.getRepository(InventoryItem).find({
+        where: { domain: this.domain, inventory }
+      })
+
+      if (inventoryItems?.length) {
+        inventory.status = INVENTORY_STATUS.STORED
+
+        await Promise.all(
+          inventoryItems.map(async inventoryItem => {
+            await this.trxMgr
+              .getRepository(InventoryItem)
+              .update({ id: inventoryItem.id }, { status: INVENTORY_STATUS.STORED })
+          })
+        )
+
+        await generateInventoryHistory(
+          inventory,
+          arrivalNotice,
+          INVENTORY_TRANSACTION_TYPE.UNLOADING,
+          inventory.qty,
+          inventory.uomValue,
+          this.user,
+          this.trxMgr
+        )
+      }
+    }
+
     let vasWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         arrivalNotice,
@@ -828,10 +1186,15 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     arrivalNoticeNo: string,
     unloadingWorksheetDetail: Partial<WorksheetDetail>[]
   ): Promise<Worksheet> {
-    const arrivalNotice: ArrivalNotice = await this.findRefOrder(ArrivalNotice, {
-      name: arrivalNoticeNo,
-      status: In([ORDER_STATUS.PROCESSING, ORDER_STATUS.PUTTING_AWAY])
-    })
+    const arrivalNotice: ArrivalNotice = await this.findRefOrder(
+      ArrivalNotice,
+      {
+        domain: this.domain,
+        name: arrivalNoticeNo,
+        status: In([ORDER_STATUS.PROCESSING, ORDER_STATUS.PUTTING_AWAY])
+      },
+      ['bizplace', 'bizplace.domain']
+    )
 
     const worksheet: Worksheet = await this.findWorksheetByRefOrder(arrivalNotice, WORKSHEET_TYPE.UNLOADING, [
       'worksheetDetails',
@@ -870,6 +1233,11 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     })
     await this.trxMgr.getRepository(Inventory).save(inventories)
 
+    const productScanning = await this.getProductScanningVal(arrivalNotice)
+    const inputQty = await this.getInputQtyVal(arrivalNotice)
+    if (productScanning === 'true' && inputQty === 'false')
+      await this.createInventoryHistory(arrivalNotice, inventories)
+
     let vasWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         arrivalNotice,

package/server/controllers/index.ts

@@ -7,7 +7,10 @@ export * from './render-kimeda-grn'
 export * from './render-orientage-grn'
 export * from './render-orientage-do'
 export * from './render-seebuu-grn'
+export * from './render-fm-grn'
 export * from './render-manifest'
+export * from './render-po'
+
 
 /* Worksheet Controllers */
 export * from './worksheet-controller'

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

@@ -1,4 +1,4 @@
-import { Equal, Not } from 'typeorm'
+import { Equal, Not, In } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import {
@@ -8,9 +8,11 @@ import {
   ORDER_TYPES,
   OrderInventory,
   OrderNoGenerator,
-  ReleaseGood
+  ReleaseGood,
+  OrderToteItem,
+  OrderTote
 } from '@things-factory/sales-base'
-import { Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_TRANSACTION_TYPE, Tote, TOTE_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
@@ -95,8 +97,8 @@ export class LoadingWorksheetController extends VasWorksheetController {
 
   async loading(
     releaseGoodNo: string,
-    worksheetDetails: Partial<WorksheetDetail & { loadedQty: number }>[]
-  ): Promise<void> {
+    worksheetDetails: Partial<WorksheetDetail & { loadedQty: number } & { toteName: string }>[]
+  ): Promise<any> {
     const releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
       { domain: this.domain, name: releaseGoodNo },
@@ -104,20 +106,29 @@ export class LoadingWorksheetController extends VasWorksheetController {
     )
     const bizplace: Bizplace = releaseGood.bizplace
 
-    for (let worksheetDetail of worksheetDetails) {
-      const loadedQty: number = worksheetDetail.loadedQty
-      worksheetDetail = await this.findExecutableWorksheetDetailByName(worksheetDetail.name, WORKSHEET_TYPE.LOADING, [
-        'worksheet',
-        'targetInventory',
-        'targetInventory.inventory',
-        'targetInventory.product'
-      ])
+    for (let i = 0; i < worksheetDetails.length; i++) {
+      const loadedQty: number = worksheetDetails[i].loadedQty
+      const toteName: string = worksheetDetails[i].toteName
+      let worksheetDetail = await this.findExecutableWorksheetDetailByName(
+        worksheetDetails[i].name,
+        WORKSHEET_TYPE.LOADING,
+        ['worksheet', 'targetInventory', 'targetInventory.inventory', 'targetInventory.product']
+      )
 
       const worksheet: Worksheet = worksheetDetail.worksheet
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       const pickedQty: number = targetInventory.releaseQty
       let inventory: Inventory = targetInventory.inventory
 
+      targetInventory.loadedAt = new Date()
+      targetInventory.loadedByUser = this.user
+
+      let loadedBy: string[] = targetInventory.loadedBy ? targetInventory.loadedBy.split(',') : []
+      if (!loadedBy.find(x => x == this.user.name)) {
+        loadedBy.push(this.user.name)
+        targetInventory.loadedBy = loadedBy.join(',')
+      }
+
       if (loadedQty > pickedQty) {
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('load', `loaded quantity can't exceed picked qty`))
       } else if (loadedQty == pickedQty) {
@@ -165,11 +176,56 @@ export class LoadingWorksheetController extends VasWorksheetController {
         newTargetInventory.updater = this.user
         newTargetInventory = await this.trxMgr.getRepository(OrderInventory).save(newTargetInventory)
 
-        await this.createWorksheetDetails(worksheet, WORKSHEET_TYPE.LOADING, [newTargetInventory], {
-          status: WORKSHEET_STATUS.EXECUTING
+        if (toteName) {
+          let foundOrderTote = await this.trxMgr
+            .getRepository(OrderTote)
+            .findOne({ where: { name: toteName, releaseGood } })
+
+          let foundOrderToteItems = await this.trxMgr
+            .getRepository(OrderToteItem)
+            .find({ where: { orderInventory: targetInventory.id } })
+
+          let foundOrderToteItemIds = foundOrderToteItems.map((itm: OrderToteItem) => itm.id)
+
+          await this.trxMgr
+            .getRepository(OrderToteItem)
+            .update({ id: In(foundOrderToteItemIds) }, { orderInventory: newTargetInventory })
+
+          let foundOrderToteItem: OrderToteItem = await this.trxMgr
+            .getRepository(OrderToteItem)
+            .findOne({ where: { orderInventory: newTargetInventory.id, orderTote: foundOrderTote, qty: loadedQty } })
+
+          await this.trxMgr
+            .getRepository(OrderToteItem)
+            .update({ id: foundOrderToteItem.id }, { orderInventory: targetInventory.id })
+        }
+
+        let newWorksheetDetail: any = await this.createWorksheetDetails(
+          worksheet,
+          WORKSHEET_TYPE.LOADING,
+          [newTargetInventory],
+          {
+            status: WORKSHEET_STATUS.EXECUTING
+          }
+        )
+
+        let worksheetDetailName = worksheetDetails[i].name
+        worksheetDetails = worksheetDetails.map(record => {
+          if (record.name == worksheetDetailName && !record?.targetInventory) {
+            return {
+              ...record,
+              name: newWorksheetDetail[0].name
+            }
+          } else {
+            return record
+          }
         })
+
+        worksheetDetails[i].name = worksheetDetailName
       }
 
+      worksheetDetails[i].targetInventory = targetInventory
+
       await generateInventoryHistory(
         inventory,
         releaseGood,
@@ -180,6 +236,8 @@ export class LoadingWorksheetController extends VasWorksheetController {
         this.trxMgr
       )
     }
+
+    return worksheetDetails
   }
 
   async undoLoading(deliveryOrder: Partial<DeliveryOrder>, palletIds: string[]): Promise<void> {
@@ -205,6 +263,10 @@ export class LoadingWorksheetController extends VasWorksheetController {
       undoTargetOrderInventory.deliveryOrder = null
       undoTargetOrderInventory.updater = this.user
 
+      undoTargetOrderInventory.loadedAt = null
+      undoTargetOrderInventory.loadedByUser = null
+      undoTargetOrderInventory.loadedBy = null
+
       let prevTargetInventory: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
         where: {
           domain: this.domain,
@@ -215,6 +277,10 @@ export class LoadingWorksheetController extends VasWorksheetController {
         }
       })
 
+      let undoOrderToteItem: OrderToteItem = await this.trxMgr
+        .getRepository(OrderToteItem)
+        .findOne({ where: { orderInventory: undoTargetOrderInventory } })
+
       if (prevTargetInventory) {
         // If there's prev target inventory
         // Merge qty and uomValue into prev target inventory
@@ -223,6 +289,13 @@ export class LoadingWorksheetController extends VasWorksheetController {
         prevTargetInventory.updater = this.user
         await this.updateOrderTargets([prevTargetInventory])
 
+        //Update order tote item if any
+        if (undoOrderToteItem) {
+          undoOrderToteItem.orderInventoryId = prevTargetInventory.id
+          undoOrderToteItem.orderInventory = prevTargetInventory
+          await this.trxMgr.getRepository(OrderToteItem).save(undoOrderToteItem)
+        }
+
         // Terminate undo target order inventory
         undoTargetOrderInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
         await this.updateOrderTargets([undoTargetOrderInventory])
@@ -269,6 +342,12 @@ export class LoadingWorksheetController extends VasWorksheetController {
       status: ORDER_STATUS.LOADING
     })
 
+    const orderToteIds = await (
+      await this.trxMgr.getRepository(OrderTote).find({ where: { releaseGood }, relations: ['tote'] })
+    ).map((record: OrderTote) => record?.toteId)
+
+    await this.trxMgr.getRepository(Tote).update({ id: In(orderToteIds) }, { status: TOTE_STATUS.DISPATCHED })
+
     const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.LOADING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory'