@things-factory/worksheet-base 8.0.0-beta.9 → 8.0.1

package/dist-server/utils/inventory-util.d.ts

@@ -129,6 +129,8 @@ export declare function inventoriesByStrategy({ worksheetId, batchId, bizplaceId
         reserveQty: number;
         warehouseQty: number;
         lot?: string;
+        isMachineFiltering?: boolean;
+        origin?: string;
         originInventory?: Inventory;
         originInventoryId?: string;
     }[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "8.0.0-beta.9",
+  "version": "8.0.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^8.0.0-beta.9",
-    "@things-factory/biz-base": "^8.0.0-beta.9",
-    "@things-factory/document-template-base": "^8.0.0-beta.9",
-    "@things-factory/id-rule-base": "^8.0.0-beta.9",
-    "@things-factory/integration-lmd": "^8.0.0-beta.9",
-    "@things-factory/integration-marketplace": "^8.0.0-beta.9",
-    "@things-factory/integration-sellercraft": "^8.0.0-beta.9",
-    "@things-factory/integration-sftp": "^8.0.0-beta.9",
-    "@things-factory/marketplace-base": "^8.0.0-beta.9",
-    "@things-factory/notification": "^8.0.0-beta.9",
-    "@things-factory/sales-base": "^8.0.0-beta.9",
-    "@things-factory/setting-base": "^8.0.0-beta.9",
-    "@things-factory/shell": "^8.0.0-beta.9",
-    "@things-factory/transport-base": "^8.0.0-beta.9",
-    "@things-factory/warehouse-base": "^8.0.0-beta.9"
+    "@things-factory/auth-base": "^8.0.0",
+    "@things-factory/biz-base": "^8.0.0",
+    "@things-factory/document-template-base": "^8.0.0",
+    "@things-factory/id-rule-base": "^8.0.0",
+    "@things-factory/integration-lmd": "^8.0.0",
+    "@things-factory/integration-marketplace": "^8.0.0",
+    "@things-factory/integration-sellercraft": "^8.0.0",
+    "@things-factory/integration-sftp": "^8.0.0",
+    "@things-factory/marketplace-base": "^8.0.0",
+    "@things-factory/notification": "^8.0.0",
+    "@things-factory/sales-base": "^8.0.1",
+    "@things-factory/setting-base": "^8.0.0",
+    "@things-factory/shell": "^8.0.0",
+    "@things-factory/transport-base": "^8.0.0",
+    "@things-factory/warehouse-base": "^8.0.1"
   },
-  "gitHead": "86b1dfa26292926a2d5447fdc23bfa5a9e983245"
+  "gitHead": "047bd41976c5db5bacea3c7d049f3afeb92f1da1"
 }

package/server/constants/index.ts

@@ -0,0 +1,5 @@
+export * from './worksheet'
+export * from './template'
+export * from './transaction-type'
+export * from './target-type'
+export * from './rule-type'

package/server/constants/rule-type.ts

@@ -0,0 +1,4 @@
+export const RULE_TYPE = {
+  LOT_NUMBER_ID: 'inbound_pallet_id',
+  CARTON_NUMBER_ID: 'inbound_carton_id'
+}

package/server/constants/target-type.ts

@@ -0,0 +1,6 @@
+export const TARGET_TYPE = {
+  BATCH_NO: 'BATCH_NO',
+  BATCH_AND_PRODUCT_TYPE: 'BATCH_AND_PRODUCT_TYPE',
+  ETC: 'ETC',
+  PRODUCT: 'PRODUCT'
+}

package/server/constants/template.ts

@@ -0,0 +1,12 @@
+export const TEMPLATE_TYPE = {
+  DO_TEMPLATE: 'DO_TEMPLATE',
+  CO_TEMPLATE: 'CO_TEMPLATE',
+  GRN_TEMPLATE: 'GRN_TEMPLATE',
+  JOB_TEMPLATE: 'JOB_TEMPLATE',
+  MANIFEST_TEMPLATE: 'MANIFEST_TEMPLATE',
+  INVOICE_TEMPLATE: 'INVOICE_TEMPLATE',
+  PO_TEMPLATE:"PO_TEMPLATE",
+  COP: 'COP',
+  SIGNATURE: 'SIGNATURE',
+  LOGO: 'LOGO'
+}

package/server/constants/transaction-type.ts

@@ -0,0 +1,9 @@
+export const TRANSACTION_TYPE = {
+  UNLOADING: 'UNLOADING',
+  PUTAWAY: 'PUTAWAY',
+  ADJUSTMENT: 'ADJUSTMENT',
+  PICKING: 'PICKING',
+  LOADING: 'LOADING',
+  RETURN: 'RETURN',
+  TERMINATED: 'TERMINATED'
+}

package/server/constants/worksheet.ts

@@ -0,0 +1,38 @@
+export const WORKSHEET_TYPE = {
+  UNLOADING: 'UNLOADING',
+  PUTAWAY: 'PUTAWAY',
+  VAS: 'VAS',
+  PACKING: 'PACKING',
+  PICKING: 'PICKING',
+  SORTING: 'SORTING',
+  BATCH_PICKING: 'BATCH_PICKING',
+  LOADING: 'LOADING',
+  CYCLE_COUNT: 'CYCLE_COUNT',
+  CYCLE_COUNT_RECHECK: 'CYCLE_COUNT_RECHECK',
+  WAREHOUSE_RETURN: 'WAREHOUSE_RETURN',
+  UNLOADING_RETURN: 'UNLOADING_RETURN',
+  PUTAWAY_RETURN: 'PUTAWAY_RETURN'
+}
+
+export const WORKSHEET_STATUS = {
+  PROCESSING: 'PROCESSING',
+  DEACTIVATED: 'DEACTIVATED',
+  EXECUTING: 'EXECUTING',
+  NOT_TALLY: 'NOT_TALLY',
+  ADJUSTED: 'ADJUSTED',
+  PENDING_APPROVAL: 'PENDING_APPROVAL',
+  INSPECTED: 'INSPECTED',
+  PENDING_ADJUSTMENT: 'PENDING_ADJUSTMENT',
+  PARTIALLY_UNLOADED: 'PARTIALLY_UNLOADED',
+  DONE: 'DONE',
+  REPLACED: 'REPLACED',
+  CANCELLED: 'CANCELLED'
+}
+
+export const TASK_NUMBER_SETTING_KEY = {
+  TASK_NO_RULE: 'task-no-rule'
+}
+
+export const TASK_NUMBER_RULE_TYPE = {
+  TASK_NO: 'task_number'
+}

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

@@ -0,0 +1,209 @@
+import { MarketplaceSetting, MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem,
+  MarketplaceProductVariation
+} from '@things-factory/marketplace-base'
+import { ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { getProductBundleInventory, Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
+
+import { WorksheetController } from '../worksheet-controller'
+
+export class EcommerceController extends WorksheetController {
+  async updateProductVariationStock(
+    marketplaceStores: MarketplaceStore[],
+    orderProducts: any[],
+    companyDomain: Domain
+  ): Promise<void> {
+    let inventoryProducts: any[] = await Promise.all(
+      orderProducts.map(async orderProduct => {
+        const product = orderProduct.product
+        let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
+        qb.leftJoinAndSelect('inv.location', 'loc')
+          .andWhere('"inv"."domain_id" = :domainId')
+          .andWhere('"inv"."product_id" = :productId')
+          .andWhere('"inv"."status" != :status')
+          .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+          .setParameters({
+            domainId: this.domain.id,
+            productId: orderProduct.product.id,
+            status: INVENTORY_STATUS.TERMINATED,
+            locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+          })
+
+        let inventories: Inventory[] = await qb.getMany()
+
+        inventories = inventories.filter(
+          inventory =>
+            inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
+        )
+
+        const inventoryQty: number = inventories.reduce((total, currentValue) => {
+          total += currentValue.qty
+          return total
+        }, 0)
+
+        const inventoryLockedQty: number = inventories.reduce((total, currentValue) => {
+          total += currentValue.lockedQty
+          return total
+        }, 0)
+
+        return { sku: product.sku, name: product.name, qty: inventoryQty - inventoryLockedQty }
+      })
+    )
+
+    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]
+
+      // get marketplace setting based on marketplace connection
+      const marketplaceSetting: MarketplaceSetting = await this.trxMgr.getRepository(MarketplaceSetting).findOne({
+        where: { marketplaceStore: { id: marketplaceStore.id }, category: 'stock_allocation' }
+      })
+
+      for (var j = 0; j < inventoryProducts.length; j++) {
+        const inventoryProduct = inventoryProducts[j]
+        const marketplaceProductVariations: MarketplaceProductVariation[] = await this.trxMgr
+          .getRepository(MarketplaceProductVariation)
+          .find({
+            where: { domain: { id: companyDomain.id }, sku: inventoryProduct.sku },
+            relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+          })
+
+        let storeProductVariations: MarketplaceProductVariation[] = marketplaceProductVariations.filter(
+          productVariation => productVariation.marketplaceProduct.marketplaceStore.id === marketplaceStore.id
+        )
+
+        let percentageValue: number = 100
+        if (storeProductVariations) {
+          for (let k = 0; k < storeProductVariations.length; k++) {
+            let storeProductVariation: MarketplaceProductVariation = storeProductVariations[k]
+            if (marketplaceSetting) {
+              percentageValue = parseInt(marketplaceSetting.value)
+            }
+
+            let remainQty: number = Math.floor(
+              (inventoryProduct.qty - storeProductVariation.reserveQty) * (percentageValue / 100)
+            )
+            if (remainQty < 0) remainQty = 0
+
+            let productVariationLocationId = storeProductVariation?.locationId
+            let adjustQty: number = remainQty
+
+            if (marketplaceStore.platform === 'shopify') {
+              let locationIds: any[] = JSON.parse(productVariationLocationId)
+              adjustQty = adjustQty - storeProductVariation.qty
+              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: storeProductVariation.marketplaceProduct.itemId,
+                variationId: storeProductVariation.variationId,
+                variationSku: storeProductVariation.variationSku,
+                qty: adjustQty,
+                locationId: productVariationLocationId,
+                inventoryItemId: storeProductVariation.inventoryItemId,
+                distributors: validMarketplaceDistributors
+              }
+            ])
+
+            storeProductVariation.qty = remainQty
+            storeProductVariation.updater = this.user
+            await this.trxMgr.getRepository(MarketplaceProductVariation).save(storeProductVariation)
+          }
+        }
+      }
+    }
+  }
+
+  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: { id: companyDomain.id },
+          marketplaceStore: { id: marketplaceStore.id },
+          subOrderNoRef: releaseGood.refNo2
+        }
+      })
+    } else {
+      marketplaceOrderShipping = await this.trxMgr.getRepository(MarketplaceOrderShipping).findOne({
+        where: {
+          domain: { id: companyDomain.id },
+          marketplaceStore: { id: marketplaceStore.id },
+          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'
+      )
+    }
+
+    let marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+    let orderItems: any[] = []
+    marketplaceOrderItems.map(marketplaceOrderItem => {
+      const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+        marketplaceOrderItem.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
+        if (marketplaceOrderShippingItem?.marketplaceOrderShipping.id == marketplaceOrderShipping.id) {
+          orderItems.push({ name: marketplaceOrderItem.name, qty: marketplaceOrderShippingItem.qty })
+        }
+      })
+    })
+
+    await StoreAPI.createOrderShip(marketplaceStore, {
+      orderId: marketplaceOrder.name,
+      orderItems,
+      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

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