@things-factory/worksheet-base 4.0.0-alpha.7 → 4.0.0-beta.1

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

@@ -1,7 +1,13 @@
 import { MarketplaceSetting, MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
-import { MarketplaceProductVariation } from '@things-factory/marketplace-base'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderShipping,
+  MarketplaceProductVariation
+} from '@things-factory/marketplace-base'
+import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
+import { getProductBundleInventory, Inventory } from '@things-factory/warehouse-base'
+
 import { WorksheetController } from '../worksheet-controller'
 
 export class EcommerceController extends WorksheetController {
@@ -10,7 +16,7 @@ export class EcommerceController extends WorksheetController {
     orderProducts: any[],
     companyDomain: Domain
   ): Promise<void> {
-    const inventoryProducts: any[] = await Promise.all(
+    let inventoryProducts: any[] = await Promise.all(
       orderProducts.map(async orderProduct => {
         const product = orderProduct.product
         const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
@@ -31,6 +37,15 @@ export class EcommerceController extends WorksheetController {
       })
     )
 
+    let bundleProductInventory: any[] = await getProductBundleInventory(
+      this.domain,
+      companyDomain,
+      orderProducts,
+      this.trxMgr
+    )
+
+    inventoryProducts.push(bundleProductInventory)
+
     for (var i = 0; i < marketplaceStores.length; i++) {
       const marketplaceStore = marketplaceStores[i]
 
@@ -67,13 +82,22 @@ export class EcommerceController extends WorksheetController {
             if (locationIds[0]?.location_id) productVariationLocationId = locationIds[0].location_id
           }
 
+          let validMarketplaceDistributors: any[] = []
+          if (marketplaceStore.marketplaceDistributors) {
+            validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(
+              distributor => distributor.status === 'ACTIVE'
+            )
+          }
+
           await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
             {
               itemId: marketplaceProductVariation.marketplaceProduct.itemId,
               variationId: marketplaceProductVariation.variationId,
+              variationSku: marketplaceProductVariation.variationSku,
               qty: adjustQty,
               locationId: productVariationLocationId,
-              inventoryItemId: marketplaceProductVariation.inventoryItemId
+              inventoryItemId: marketplaceProductVariation.inventoryItemId,
+              distributors: validMarketplaceDistributors
             }
           ])
 
@@ -84,4 +108,58 @@ export class EcommerceController extends WorksheetController {
       }
     }
   }
+
+  async createOrderShip(
+    releaseGood: ReleaseGood,
+    marketplaceStore: MarketplaceStore,
+    marketplaceOrder: MarketplaceOrder,
+    companyDomain: Domain
+  ): Promise<void> {
+    let marketplaceOrderShipping: MarketplaceOrderShipping
+
+    if (marketplaceOrder.isSplitted) {
+      marketplaceOrderShipping = await this.trxMgr.getRepository(MarketplaceOrderShipping).findOne({
+        where: { domain: companyDomain, marketplaceStore, subOrderNoRef: releaseGood.refNo2 }
+      })
+    } else {
+      marketplaceOrderShipping = await this.trxMgr.getRepository(MarketplaceOrderShipping).findOne({
+        where: { domain: companyDomain, marketplaceStore, orderNoRef: releaseGood.refNo }
+      })
+    }
+
+    const trackingNo: string = marketplaceOrderShipping.ownTrackingNo
+      ? marketplaceOrderShipping.ownTrackingNo
+      : marketplaceOrderShipping.trackingNo
+    const shippingProvider: string = marketplaceOrderShipping.ownTransporter
+      ? marketplaceOrderShipping.ownTransporter
+      : marketplaceOrderShipping.transporter
+
+    let validMarketplaceDistributors: any[] = []
+    if (marketplaceOrder.marketplaceStore.marketplaceDistributors) {
+      validMarketplaceDistributors = marketplaceOrder.marketplaceStore.marketplaceDistributors.filter(
+        distributor => distributor.status === 'ACTIVE'
+      )
+    }
+
+    await StoreAPI.createOrderShip(marketplaceStore, {
+      orderId: marketplaceOrder.name,
+      orderItems: marketplaceOrder.marketplaceOrderItems.filter(
+        item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id
+      ),
+      shippings: [{ trackingNo, carrierCode: shippingProvider }],
+      sourceCodes: validMarketplaceDistributors.map(distributor => distributor.name)
+    })
+  }
+
+  async createOrderComment(
+    marketplaceStore: MarketplaceStore,
+    marketplaceOrder: MarketplaceOrder,
+    orderStatus: String
+  ): Promise<void> {
+    await StoreAPI.createOrderComment(marketplaceStore, {
+      orderId: marketplaceOrder.name,
+      remark: orderStatus,
+      status: marketplaceOrder.status
+    })
+  }
 }

package/server/controllers/ecommerce/index.ts

@@ -1 +1,2 @@
 export * from './ecommerce-controller'
+export * from './sellercraft-controller'

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

@@ -0,0 +1,223 @@
+import { Equal, Not } from 'typeorm'
+
+import { Sellercraft, SellercraftAPI } from '@things-factory/integration-sellercraft'
+import { Product, ProductDetail } from '@things-factory/product-base'
+import {
+  ArrivalNotice,
+  OrderInventory,
+  OrderProduct,
+  PurchaseOrder,
+  ReleaseGood,
+  ReturnOrder
+} from '@things-factory/sales-base'
+import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
+
+import { WorksheetController } from '../worksheet-controller'
+
+export class SellercraftController extends WorksheetController {
+  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
+          )
+
+          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: false,
+          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 })
+  }
+
+  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
+          )
+
+          packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
+        }
+
+        return {
+          sku: product.sku,
+          purchaseOrderQty: orderInventory.returnQty * packingSize,
+          receivedQty: orderInventory.returnQty * packingSize,
+          uom: 'EA',
+          batchId: orderInventory.batchId,
+          forceCreateProduct: false,
+          expiryTime: 0
+        }
+      })
+    )
+
+    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 })
+  }
+
+  async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
+    let product: Product = inventory.product
+    const productDetails: ProductDetail[] = product.productDetails
+    const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
+      where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) }
+    })
+
+    let defaultProductDetail: ProductDetail
+    const sellercraftInvs: any[] = await Promise.all(
+      inventories.map(async (inventory: Inventory) => {
+        const inventoryPackingType: string = inventory.packingType
+        defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault)
+
+        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)
+        }
+
+        return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize }
+      })
+    )
+
+    const totalQty: number = sellercraftInvs.reduce((total, currentValue) => {
+      total += currentValue.quantity
+      return total
+    }, 0)
+
+    const sellercraftInv: any = {
+      accountId: sellercraft.accountId,
+      sku: product.sku,
+      uom: 'EA',
+      quantity: totalQty,
+      gtin: defaultProductDetail.gtin,
+      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
+      }
+    }
+
+    await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
+  }
+
+  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
+    const orderInformation: any = {
+      accountId: sellercraft.accountId,
+      orderId: releaseGood.collectionOrderNo,
+      packageId: releaseGood.packageId
+    }
+
+    const {
+      handOverType,
+      pickupTime,
+      pickupAddress,
+      dropoffAddress
+    } = await SellercraftAPI.initiateOrderShipment(sellercraft, { ...orderInformation })
+
+    releaseGood.handoverType = handOverType
+    if (pickupAddress) {
+      releaseGood.pickupAddress = pickupAddress
+      releaseGood.pickupTime = new Date(pickupTime * 1000)
+    }
+    if (dropoffAddress) releaseGood.dropoffAddress = dropoffAddress
+    releaseGood.updater = this.user
+    await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+  }
+
+  async initiateOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
+    const orderInformation: any = {
+      accountId: sellercraft.accountId,
+      orderId: releaseGood.collectionOrderNo,
+      packageId: releaseGood.packageId
+    }
+    await SellercraftAPI.initiateOrderDocument(sellercraft, { ...orderInformation })
+  }
+
+  async fetchOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
+    const orderInformation: any = {
+      accountId: sellercraft.accountId,
+      orderId: releaseGood.collectionOrderNo,
+      packageId: releaseGood.packageId
+    }
+    const { documents, trackingNo }: { documents: any[]; trackingNo: string } = await SellercraftAPI.fetchOrderDocument(
+      sellercraft,
+      {
+        ...orderInformation
+      }
+    )
+
+    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
+        }
+      })
+
+      releaseGood.trackingNo = trackingNo
+      releaseGood.updater = this.user
+      releaseGood = await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+    }
+
+    return releaseGood
+  }
+}

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

@@ -15,6 +15,7 @@ import {
 } from '@things-factory/sales-base'
 import {
   Inventory,
+  InventoryHistory,
   InventoryNoGenerator,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,

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

@@ -1,38 +1,40 @@
-import { Domain } from '@things-factory/shell'
+import { Equal, In, Not, SelectQueryBuilder } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
 import { generateId } from '@things-factory/id-rule-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
-  OrderNoGenerator,
-  OrderProduct,
-  OrderInventory,
-  OrderVas,
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
   ORDER_TYPES,
   ORDER_VAS_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderProduct,
+  OrderVas,
   ReleaseGood,
   ReturnOrder,
   Vas,
   VAS_TARGET_TYPES,
   VAS_TYPES
 } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
 import {
   Inventory,
-  InventoryHistory,
-  InventoryNoGenerator,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
+  InventoryHistory,
+  InventoryNoGenerator,
   Location,
   Pallet,
   Warehouse
 } from '@things-factory/warehouse-base'
-import { Equal, In, Not, SelectQueryBuilder } from 'typeorm'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE, RULE_TYPE } from '../../constants'
+
+import { RULE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { DateGenerator } from '../../utils'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
   palletizingVasId: string
@@ -102,13 +104,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     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 targetInventory: OrderInventory = worksheetDetail?.targetInventory
+    const originInventory: OrderInventory = targetInventory ? targetInventory.inventory : null
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
     const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
     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 uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
+    const uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
     const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
     const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
     const qty: number = inventory.qty
@@ -522,7 +525,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
     )
     inventory.qty = 0
-    inventory.weight = 0
     inventory.uomValue = 0
     inventory.updater = this.user
 

package/server/controllers/index.ts

@@ -1,10 +1,12 @@
 export * from './render-ro-do'
+export * from './render-grn'
 export * from './render-manual-do'
 export * from './render-elccl-grn'
 export * from './render-job-sheet'
 export * from './render-kimeda-grn'
 export * from './render-orientage-grn'
 export * from './render-orientage-do'
+export * from './render-seebuu-grn'
 
 /* Worksheet Controllers */
 export * from './worksheet-controller'