@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -15,285 +15,344 @@ import { WorksheetController } from '../worksheet-controller'
 
 export class SellercraftController extends WorksheetController {
   async packOrder(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
-    const orderProducts: OrderProduct[] = releaseGood.orderProducts
-    let sellercraftOPs: any[] = []
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disablePackOrder: boolean =
+      sellercraftSetting?.disablePackOrder && sellercraftSetting?.disablePackOrder == 1 ? true : false
 
-    sellercraftOPs = orderProducts.map(orderProduct => {
-      const product: Product = orderProduct.product
+    if (!disablePackOrder) {
+      const orderProducts: OrderProduct[] = releaseGood.orderProducts
+      let sellercraftOPs: any[] = []
 
-      return {
-        sku: product.sku,
-        releaseQty: orderProduct.releaseQty,
-        uom: 'EA'
+      sellercraftOPs = orderProducts.map(orderProduct => {
+        const product: Product = orderProduct.product
+
+        return {
+          sku: product.sku,
+          releaseQty: orderProduct.releaseQty,
+          uom: 'EA'
+        }
+      })
+
+      const orderInformation: any = {
+        accountId: sellercraft.accountId,
+        orderId: releaseGood.refNo2,
+        sellercraftOPs
       }
-    })
+      const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
+        ...orderInformation,
+        context: { state: { domain: this?.domain, user: this?.user } }
+      })
 
-    const orderInformation: any = {
-      accountId: sellercraft.accountId,
-      orderId: releaseGood.refNo2,
-      sellercraftOPs
+      releaseGood.packageId = packageId
+      releaseGood.updater = this.user
     }
-    const packageId: string = await SellercraftAPI.packMarketplaceOrder(sellercraft, {
-      ...orderInformation,
-      context: { state: { domain: this?.domain, user: this?.user } }
-    })
 
-    releaseGood.packageId = packageId
-    releaseGood.updater = this.user
     return releaseGood
   }
 
   async registerProductInbound(sellercraft: Sellercraft, arrivalNotice: ArrivalNotice): Promise<void> {
-    const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
-    const purchaseOrder: PurchaseOrder = arrivalNotice.purchaseOrder
-    const sellercraftOPs: any[] = await Promise.all(
-      orderProducts.map(async (orderProduct: OrderProduct) => {
-        const product: Product = orderProduct.product
-        const productDetails: ProductDetail[] = product.productDetails
-        const unloadedPackingType: string = orderProduct.packingType
-        const defaultProductDetail: ProductDetail = product.productDetails.find(
-          productDetail => productDetail.isDefault
-        )
-
-        let packingSize: number = 1
-        if (unloadedPackingType !== defaultProductDetail.packingType) {
-          const unmatchingProductDetail: ProductDetail = product.productDetails.find(
-            productDetail => productDetail.packingType === unloadedPackingType
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableRegisterInbound: boolean =
+      sellercraftSetting?.disableRegisterInbound && sellercraftSetting?.disableRegisterInbound == 1 ? true : false
+
+    if (!disableRegisterInbound) {
+      const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
+      const purchaseOrder: PurchaseOrder = arrivalNotice.purchaseOrder
+      const sellercraftOPs: any[] = await Promise.all(
+        orderProducts.map(async (orderProduct: OrderProduct) => {
+          const product: Product = orderProduct.product
+          const productDetails: ProductDetail[] = product.productDetails
+          const unloadedPackingType: string = orderProduct.packingType
+          const defaultProductDetail: ProductDetail = product.productDetails.find(
+            productDetail => productDetail.isDefault
           )
 
-          packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
-        }
+          let packingSize: number = 1
+          if (unloadedPackingType !== defaultProductDetail.packingType) {
+            const unmatchingProductDetail: ProductDetail = product.productDetails.find(
+              productDetail => productDetail.packingType === unloadedPackingType
+            )
 
-        return {
-          sku: product.sku,
-          purchaseOrderQty: orderProduct.packQty * packingSize,
-          receivedQty: orderProduct.actualPackQty * packingSize,
-          uom: 'EA',
-          batchId: orderProduct.batchId,
-          productName: product.name,
-          gtin: defaultProductDetail.gtin,
-          forceCreateProduct: true,
-          expiryTime: 0,
-          weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
-          packageDimension: {
-            length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
-            width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
-            height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+            packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
           }
-        }
+
+          return {
+            sku: product.sku,
+            purchaseOrderQty: orderProduct.packQty * packingSize,
+            receivedQty: orderProduct.actualPackQty * packingSize,
+            uom: 'EA',
+            batchId: orderProduct.batchId,
+            productName: product.name,
+            gtin: defaultProductDetail.gtin,
+            forceCreateProduct: true,
+            expiryTime: 0,
+            weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
+            packageDimension: {
+              length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
+              width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
+              height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+            }
+          }
+        })
+      )
+
+      const inboundOrder: any = {
+        accountId: sellercraft.accountId,
+        inboundId: arrivalNotice.name,
+        inboundTime: Math.floor(new Date(arrivalNotice.updatedAt).getTime() / 1000),
+        inboundType: purchaseOrder ? 'purchase_order' : 'blind_receive',
+        purchaseOrderId: purchaseOrder ? purchaseOrder.name : '',
+        sellercraftOPs
+      }
+      await SellercraftAPI.addInboundOrder(sellercraft, {
+        ...inboundOrder,
+        context: { state: { domain: this?.domain, user: this?.user } }
       })
-    )
-
-    const inboundOrder: any = {
-      accountId: sellercraft.accountId,
-      inboundId: arrivalNotice.name,
-      inboundTime: Math.floor(new Date(arrivalNotice.updatedAt).getTime() / 1000),
-      inboundType: purchaseOrder ? 'purchase_order' : 'blind_receive',
-      purchaseOrderId: purchaseOrder ? purchaseOrder.name : '',
-      sellercraftOPs
     }
-    await SellercraftAPI.addInboundOrder(sellercraft, {
-      ...inboundOrder,
-      context: { state: { domain: this?.domain, user: this?.user } }
-    })
   }
 
   async registerProductReturn(sellercraft: Sellercraft, returnOrder: ReturnOrder): Promise<void> {
-    const orderInventories: OrderInventory[] = returnOrder.orderInventories
-    const sellercraftOPs: any[] = await Promise.all(
-      orderInventories.map(async (orderInventory: OrderInventory) => {
-        const product: Product = orderInventory.product
-        const productDetails: ProductDetail[] = product.productDetails
-        const unloadedPackingType: string = orderInventory.packingType
-        const defaultProductDetail: ProductDetail = product.productDetails.find(
-          productDetail => productDetail.isDefault
-        )
-
-        let packingSize: number = 1
-        if (unloadedPackingType !== defaultProductDetail.packingType) {
-          const unmatchingProductDetail: ProductDetail = product.productDetails.find(
-            productDetail => productDetail.packingType === unloadedPackingType
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableRegisterReturn: boolean =
+      sellercraftSetting?.disableRegisterReturn && sellercraftSetting?.disableRegisterReturn == 1 ? true : false
+
+    if (!disableRegisterReturn) {
+      const orderInventories: OrderInventory[] = returnOrder.orderInventories
+      const sellercraftOPs: any[] = await Promise.all(
+        orderInventories.map(async (orderInventory: OrderInventory) => {
+          const product: Product = orderInventory.product
+          const productDetails: ProductDetail[] = product.productDetails
+          const unloadedPackingType: string = orderInventory.packingType
+          const defaultProductDetail: ProductDetail = product.productDetails.find(
+            productDetail => productDetail.isDefault
           )
 
-          packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
-        }
+          let packingSize: number = 1
+          if (unloadedPackingType !== defaultProductDetail.packingType) {
+            const unmatchingProductDetail: ProductDetail = product.productDetails.find(
+              productDetail => productDetail.packingType === unloadedPackingType
+            )
 
-        return {
-          sku: product.sku,
-          productName: product.name,
-          gtin: defaultProductDetail.gtin,
-          purchaseOrderQty: orderInventory.returnQty * packingSize,
-          receivedQty: orderInventory.returnQty * packingSize,
-          uom: 'EA',
-          batchId: orderInventory.batchId,
-          forceCreateProduct: true,
-          expiryTime: 0,
-          weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
-          packageDimension: {
-            length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
-            width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
-            height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+            packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
           }
-        }
+
+          return {
+            sku: product.sku,
+            productName: product.name,
+            gtin: defaultProductDetail.gtin,
+            purchaseOrderQty: orderInventory.returnQty * packingSize,
+            receivedQty: orderInventory.returnQty * packingSize,
+            uom: 'EA',
+            batchId: orderInventory.batchId,
+            forceCreateProduct: true,
+            expiryTime: 0,
+            weight: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
+            packageDimension: {
+              length: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
+              width: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
+              height: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+            }
+          }
+        })
+      )
+
+      const returnInbound: any = {
+        accountId: sellercraft.accountId,
+        inboundId: returnOrder.name,
+        inboundTime: Math.floor(new Date(returnOrder.updatedAt).getTime() / 1000),
+        purchaseOrderId: '',
+        inboundType: 'sales_return',
+        sellercraftOPs
+      }
+      await SellercraftAPI.addInboundOrder(sellercraft, {
+        ...returnInbound,
+        context: { state: { domain: this?.domain, user: this?.user } }
       })
-    )
-
-    const returnInbound: any = {
-      accountId: sellercraft.accountId,
-      inboundId: returnOrder.name,
-      inboundTime: Math.floor(new Date(returnOrder.updatedAt).getTime() / 1000),
-      purchaseOrderId: '',
-      inboundType: 'sales_return',
-      sellercraftOPs
     }
-    await SellercraftAPI.addInboundOrder(sellercraft, {
-      ...returnInbound,
-      context: { state: { domain: this?.domain, user: this?.user } }
-    })
   }
 
   async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
-    const bizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOne({ domain: sellercraft.domain })
-    let product: Product = inventory.product
-    const productDetails: ProductDetail[] = product.productDetails
-    let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
-    qb.leftJoinAndSelect('inv.location', 'loc')
-      .andWhere('"inv"."domain_id" = :domainId')
-      .andWhere('"inv"."bizplace_id" = :bizplaceId')
-      .andWhere('"inv"."product_id" = :productId')
-      .andWhere('"inv"."status" != :status')
-      .andWhere('"loc"."type" NOT IN (:...locationTypes)')
-      .setParameters({
-        domainId: this.domain.id,
-        bizplaceId: bizplace.id,
-        productId: product.id,
-        status: INVENTORY_STATUS.TERMINATED,
-        locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
-      })
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableUpdateStock: boolean =
+      sellercraftSetting?.disableUpdateStock && sellercraftSetting?.disableUpdateStock == 1 ? true : false
+
+    if (!disableUpdateStock) {
+      const bizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOneBy({ domain: sellercraft.domain })
+      let product: Product = inventory.product
+      const productDetails: ProductDetail[] = product.productDetails
+      let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
+      qb.leftJoinAndSelect('inv.location', 'loc')
+        .andWhere('"inv"."domain_id" = :domainId')
+        .andWhere('"inv"."bizplace_id" = :bizplaceId')
+        .andWhere('"inv"."product_id" = :productId')
+        .andWhere('"inv"."status" = :status')
+        .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+        .setParameters({
+          domainId: this.domain.id,
+          bizplaceId: bizplace.id,
+          productId: product.id,
+          status: INVENTORY_STATUS.STORED,
+          locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+        })
 
-    let inventories: Inventory[] = await qb.getMany()
-    let inventoryTotalQty: number = 0
-    let inventoryTotalLockedQty: number = 0
+      let inventories: Inventory[] = await qb.getMany()
+      let inventoryTotalQty: number = 0
+      let inventoryTotalLockedQty: number = 0
 
-    let defaultProductDetail: ProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
+      let defaultProductDetail: ProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
 
-    if (inventories?.length > 0) {
-      const sellercraftInvs: any[] = await Promise.all(
-        inventories.map(async (inventory: Inventory) => {
-          const inventoryPackingType: string = inventory.packingType
+      if (inventories?.length > 0) {
+        const sellercraftInvs: any[] = await Promise.all(
+          inventories.map(async (inventory: Inventory) => {
+            const inventoryPackingType: string = inventory.packingType
 
-          let packingSize: number = 1
-          if (inventoryPackingType !== defaultProductDetail.packingType) {
-            const unmatchingProductDetail: ProductDetail = product.productDetails.find(
-              productDetail => productDetail.packingType === inventoryPackingType
-            )
+            let packingSize: number = 1
+            if (inventoryPackingType !== defaultProductDetail.packingType) {
+              const unmatchingProductDetail: ProductDetail = product.productDetails.find(
+                productDetail => productDetail.packingType === inventoryPackingType
+              )
 
-            packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
-          }
+              packingSize = await this.getChildPackingSize(
+                productDetails,
+                defaultProductDetail,
+                unmatchingProductDetail
+              )
+            }
 
-          return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
-        })
-      )
+            return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
+          })
+        )
 
-      inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalQty
-        return total
-      }, 0)
+        inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalQty
+          return total
+        }, 0)
 
-      inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalLockedQty
-        return total
-      }, 0)
-    }
+        inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalLockedQty
+          return total
+        }, 0)
+      }
 
-    const sellercraftInv: any[] = [
-      {
-        sku: product.sku,
-        gtin: defaultProductDetail.gtin,
-        stock: {
-          quantity_total: inventoryTotalQty,
-          quantity_reserved: inventoryTotalLockedQty,
-          unit_of_measure: 'EA'
-        },
-        package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
-        package_dimensions: {
-          length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
-          width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
-          height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+      const sellercraftInv: any[] = [
+        {
+          sku: product.sku,
+          gtin: defaultProductDetail.gtin,
+          stock: {
+            quantity_total: inventoryTotalQty,
+            quantity_reserved: inventoryTotalLockedQty,
+            unit_of_measure: 'EA'
+          },
+          package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,
+          package_dimensions: {
+            length_mm: defaultProductDetail.depth < 1 ? 1 : defaultProductDetail.depth,
+            width_mm: defaultProductDetail.width < 1 ? 1 : defaultProductDetail.width,
+            height_mm: defaultProductDetail.height < 1 ? 1 : defaultProductDetail.height
+          }
         }
-      }
-    ]
+      ]
 
-    await SellercraftAPI.updateProduct(sellercraft, {
-      context: { state: { domain: this?.domain, user: this?.user } },
-      accountId: sellercraft.accountId,
-      sellercraftInv
-    })
+      await SellercraftAPI.updateProduct(sellercraft, {
+        context: { state: { domain: this?.domain, user: this?.user } },
+        accountId: sellercraft.accountId,
+        sellercraftInv
+      })
+    }
   }
 
-  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
-    if (!releaseGood?.packageId) throw new Error('Order package id is not found')
+  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableInitiateOrderShipment: boolean =
+      sellercraftSetting?.disableInitiateOrderShipment && sellercraftSetting?.disableInitiateOrderShipment == 1
+        ? true
+        : false
 
-    const orderInformation: any = {
-      accountId: sellercraft.accountId,
-      orderId: releaseGood.refNo2,
-      packageId: releaseGood.packageId
-    }
+    if (!disableInitiateOrderShipment) {
+      if (!releaseGood?.packageId) throw new Error('Order package id is not found')
 
-    const { handOverType, pickupTime, pickupAddress, dropoffAddress } = await SellercraftAPI.initiateOrderShipment(
-      sellercraft,
-      { ...orderInformation, context: { state: { domain: this?.domain, user: this?.user } } }
-    )
+      const orderInformation: any = {
+        accountId: sellercraft.accountId,
+        orderId: releaseGood.refNo2,
+        packageId: releaseGood.packageId
+      }
 
-    releaseGood.handoverType = handOverType
-    if (pickupAddress) {
-      releaseGood.pickupAddress = pickupAddress
-      releaseGood.pickupTime = new Date(pickupTime * 1000)
+      await SellercraftAPI.initiateOrderShipment(sellercraft, {
+        ...orderInformation,
+        context: { state: { domain: this?.domain, user: this?.user } }
+      })
     }
-    if (dropoffAddress) releaseGood.dropoffAddress = dropoffAddress
-    releaseGood.updater = this.user
-    return await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
   }
 
   async initiateOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
-    const orderInformation: any = {
-      accountId: sellercraft.accountId,
-      orderId: releaseGood.refNo2,
-      packageId: releaseGood.packageId
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableInitiateOrderDocument: boolean =
+      sellercraftSetting?.disableInitiateOrderDocument && sellercraftSetting?.disableInitiateOrderDocument == 1
+        ? true
+        : false
+
+    if (!disableInitiateOrderDocument) {
+      const orderInformation: any = {
+        accountId: sellercraft.accountId,
+        orderId: releaseGood.refNo2,
+        packageId: releaseGood.packageId
+      }
+      await SellercraftAPI.initiateOrderDocument(sellercraft, {
+        ...orderInformation,
+        context: { state: { domain: this?.domain, user: this?.user } }
+      })
     }
-    await SellercraftAPI.initiateOrderDocument(sellercraft, {
-      ...orderInformation,
-      context: { state: { domain: this?.domain, user: this?.user } }
-    })
   }
 
   async fetchOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
-    const orderInformation: any = {
-      accountId: sellercraft.accountId,
-      orderId: releaseGood.refNo2,
-      packageId: releaseGood.packageId
+    if (releaseGood?.ownTransport) {
+      return
     }
-    const { documents, trackingNo, transporter }: { documents: any[]; trackingNo: string; transporter: string } =
-      await SellercraftAPI.fetchOrderDocument(sellercraft, {
-        ...orderInformation,
-        context: { state: { domain: this?.domain, user: this?.user } }
-      })
+    try {
+      let sellercraftSetting: any = sellercraft.sellercraftSetting
+      let disableFetchOrderDocument: boolean =
+        sellercraftSetting?.disableFetchOrderDocument && sellercraftSetting?.disableFetchOrderDocument == 1
+          ? true
+          : false
+
+      if (!disableFetchOrderDocument) {
+        const orderInformation: any = {
+          accountId: sellercraft.accountId,
+          orderId: releaseGood.refNo2,
+          packageId: releaseGood.packageId
+        }
+        const { documents, trackingNo, transporter }: { documents: any[]; trackingNo: string; transporter: string } =
+          await SellercraftAPI.fetchOrderDocument(sellercraft, {
+            ...orderInformation,
+            context: { state: { domain: this?.domain, user: this?.user } }
+          })
+
+        let updateInfo: any
+        if (documents?.length) {
+          documents.map(document => {
+            if (document.type === 'invoice') {
+              updateInfo = { ...updateInfo, invoice: document.download_url }
+            } else if (document.type === 'airway_bill') {
+              updateInfo = { ...updateInfo, airwayBill: document.download_url }
+            }
+          })
+
+          updateInfo = {
+            ...updateInfo,
+            trackingNo: trackingNo,
+            transporter: transporter,
+            updater: this.user
+          }
+
+          // releaseGood = await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
 
-    if (documents?.length) {
-      documents.map(document => {
-        if (document.type === 'invoice') {
-          releaseGood.invoice = document.download_url
-        } else if (document.type === 'airway_bill') {
-          releaseGood.airwayBill = document.download_url
+          await this.trxMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { ...updateInfo })
+          releaseGood = await this.trxMgr.getRepository(ReleaseGood).findOneBy({ id: releaseGood.id })
         }
-      })
+      }
 
-      releaseGood.trackingNo = trackingNo
-      releaseGood.transporter = transporter
-      releaseGood.updater = this.user
-      releaseGood = await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+      return releaseGood
+    } catch (error) {
+      throw error
     }
-
-    return releaseGood
   }
 }

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

@@ -1,29 +1,21 @@
+import { In } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
-import { Product } from '@things-factory/product-base'
 import {
-  OrderInventory,
-  OrderNoGenerator,
-  OrderProduct,
-  OrderVas,
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
   ORDER_TYPES,
   ORDER_VAS_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct,
+  OrderVas,
   ReturnOrder,
   Vas,
   VAS_TARGET_TYPES
 } from '@things-factory/sales-base'
-import {
-  Inventory,
-  InventoryHistory,
-  InventoryNoGenerator,
-  INVENTORY_STATUS,
-  INVENTORY_TRANSACTION_TYPE,
-  Location,
-  Pallet,
-  Warehouse
-} from '@things-factory/warehouse-base'
-import { Equal, In, Not } from 'typeorm'
+import { Inventory, INVENTORY_STATUS, Location } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
@@ -47,7 +39,7 @@ export class UnloadingReturningWorksheetController extends VasWorksheetControlle
     )
     const orderInventories: OrderInventory[] = returnOrder.orderInventories
     const orderVASs: OrderVas[] = returnOrder.orderVass
-    const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOne(bufferLocationId)
+    const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOneBy({ id: bufferLocationId })
 
     const worksheet: Worksheet = await this.generateWorksheet(
       WORKSHEET_TYPE.UNLOADING_RETURN,