@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "5.0.13",
+  "version": "6.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,17 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/biz-base": "^5.0.11",
-    "@things-factory/code-base": "^5.0.11",
-    "@things-factory/integration-sftp": "^5.0.11",
-    "@things-factory/notification": "^5.0.11",
-    "@things-factory/product-base": "^5.0.11",
-    "@things-factory/setting-base": "^5.0.11",
-    "@things-factory/shell": "^5.0.11",
-    "@things-factory/transport-base": "^5.0.11",
-    "@things-factory/warehouse-base": "^5.0.12"
+    "@things-factory/attachment-base": "^6.0.0-alpha.0",
+    "@things-factory/auth-base": "^6.0.0-alpha.0",
+    "@things-factory/biz-base": "^6.0.0-alpha.0",
+    "@things-factory/code-base": "^6.0.0-alpha.0",
+    "@things-factory/integration-sftp": "^6.0.0-alpha.1",
+    "@things-factory/notification": "^6.0.0-alpha.0",
+    "@things-factory/product-base": "^6.0.0-alpha.0",
+    "@things-factory/setting-base": "^6.0.0-alpha.0",
+    "@things-factory/shell": "^6.0.0-alpha.0",
+    "@things-factory/transport-base": "^6.0.0-alpha.0",
+    "@things-factory/warehouse-base": "^6.0.0-alpha.1"
   },
-  "gitHead": "72dfd33e398eab9872600e91d1b13fef0595c174"
+  "gitHead": "b978f296de5c8be4a3f3450929821e5554855438"
 }

package/server/constants/order.ts

@@ -45,7 +45,8 @@ export const DISPATCHMENT_STATUS = {
 
 export const MANIFEST_STATUS = {
   OPEN: 'OPEN',
-  CLOSED: 'CLOSED'
+  CLOSED: 'CLOSED',
+  IN_QUEUE: 'IN_QUEUE'
 }
 
 export const ORDER_INVENTORY_TYPE = {
@@ -71,6 +72,7 @@ export const ORDER_PRODUCT_STATUS = {
   READY_TO_UNLOAD: 'READY_TO_UNLOAD',
   PENDING_APPROVAL: 'PENDING_APPROVAL',
   PENDING_ASSIGN: 'PENDING_ASSIGN',
+  PENDING_WORKSHEET: 'PENDING_WORKSHEET',
   READY_TO_PICK: 'READY_TO_PICK',
   PICKING: 'PICKING',
   UNLOADING: 'UNLOADING',
@@ -87,6 +89,7 @@ export const ORDER_PRODUCT_STATUS = {
 }
 
 export const ORDER_INVENTORY_STATUS = {
+  ASSIGNED: 'ASSIGNED',
   ARRIVED: 'ARRIVED',
   INTRANSIT: 'INTRANSIT',
   PENDING: 'PENDING',

package/server/constants/release-good.ts

@@ -1,6 +1,9 @@
-
-
 export enum ReleaseOrderType {
     B2B = 'b2b',
     B2C = 'b2c'
-}
+}
+
+export const ORDER_METHOD = {
+    SELECT_BY_PRODUCT: 'SELECT_BY_PRODUCT',
+    SELECT_BY_PALLET: 'SELECT_BY_PALLET'
+}

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

@@ -14,7 +14,7 @@ export class EcommerceController extends OrderController {
   ): Promise<void> {
     const inventoryProducts: any[] = await Promise.all(
       productIds.map(async productId => {
-        const product: Product = await this.trxMgr.getRepository(Product).findOne(productId)
+        const product: Product = await this.trxMgr.getRepository(Product).findOneBy({ id: productId })
         let qb = await this.trxMgr.getRepository(Inventory).createQueryBuilder('inv')
         qb.leftJoinAndSelect('inv.location', 'loc')
           .andWhere('"inv"."domain_id" = :domainId')

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

@@ -11,134 +11,151 @@ import { OrderController } from '../order-controller'
 
 export class SellercraftController extends OrderController {
   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 updateSellercraftStock(sellercraft: Sellercraft, orderProducts: OrderProduct[], type: string): Promise<void> {
-    for (var i = 0; i < orderProducts.length; i++) {
-      const orderProduct: OrderProduct = orderProducts[i]
-
-      const product: Product = orderProduct.product
-      const pendingAssignOPs: OrderProduct[] = await this.trxMgr.getRepository(OrderProduct).find({
-        where: {
-          domain: this.domain,
-          bizplace: orderProduct.bizplace,
-          product,
-          status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN
-        }
-      })
+    let sellercraftSetting: any = sellercraft.sellercraftSetting
+    let disableUpdateStock: boolean =
+      sellercraftSetting?.disableUpdateStock && sellercraftSetting?.disableUpdateStock == 1 ? true : false
+
+    if (!disableUpdateStock) {
+      for (var i = 0; i < orderProducts.length; i++) {
+        const orderProduct: OrderProduct = orderProducts[i]
+
+        const product: Product = orderProduct.product
+        const pendingAssignOPs: OrderProduct[] = await this.trxMgr.getRepository(OrderProduct).find({
+          where: {
+            domain: this.domain,
+            bizplace: orderProduct.bizplace,
+            product,
+            status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN
+          }
+        })
 
-      const productDetails: ProductDetail[] = product.productDetails
+        const productDetails: ProductDetail[] = product.productDetails
 
-      let totalUnassignReleaseQty: number = 0
-      if (pendingAssignOPs?.length) {
-        totalUnassignReleaseQty = pendingAssignOPs.reduce((total, currentValue) => {
-          total += currentValue.releaseQty
+        let totalUnassignReleaseQty: number = 0
+        if (pendingAssignOPs?.length) {
+          totalUnassignReleaseQty = pendingAssignOPs.reduce((total, currentValue) => {
+            total += currentValue.releaseQty
+            return total
+          }, 0)
+        }
+
+        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"."bizplace_id" = :bizplaceId')
+          .andWhere('"inv"."status" = :status')
+          .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+          .setParameters({
+            domainId: this.domain.id,
+            productId: product.id,
+            bizplaceId: orderProduct.bizplace.id,
+            status: INVENTORY_STATUS.STORED,
+            locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+          })
+
+        let inventories: Inventory[] = await qb.getMany()
+
+        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
+              )
+              if (packingSize == 0) packingSize = 1
+            }
+
+            return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
+          })
+        )
+
+        let inventoryTotalQty: number = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalQty
           return total
         }, 0)
-      }
 
-      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"."bizplace_id" = :bizplaceId')
-        .andWhere('"inv"."status" != :status')
-        .andWhere('"loc"."type" NOT IN (:...locationTypes)')
-        .setParameters({
-          domainId: this.domain.id,
-          productId: product.id,
-          bizplaceId: orderProduct.bizplace.id,
-          status: INVENTORY_STATUS.TERMINATED,
-          locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
-        })
-
-      let inventories: Inventory[] = await qb.getMany()
-
-      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 inventoryTotalLockedQty: number = sellercraftInvs.reduce((total, currentValue) => {
+          total += currentValue.totalLockedQty
+          return total
+        }, 0)
 
-          let packingSize: number = 1
-          if (inventoryPackingType !== defaultProductDetail.packingType) {
-            const unmatchingProductDetail: ProductDetail = product.productDetails.find(
-              productDetail => productDetail.packingType === inventoryPackingType
-            )
+        switch (type) {
+          case 'CONFIRM_ORDER':
+            inventoryTotalQty -= totalUnassignReleaseQty
+            break
+        }
 
-            packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail)
-            if (packingSize == 0) packingSize = 1
+        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
+            }
           }
+        ]
 
-          return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize }
+        await SellercraftAPI.updateProduct(sellercraft, {
+          context: { state: { domain: this?.domain, user: this?.user } },
+          accountId: sellercraft.accountId,
+          sellercraftInv
         })
-      )
-
-      let inventoryTotalQty: number = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalQty
-        return total
-      }, 0)
-
-      let inventoryTotalLockedQty: number = sellercraftInvs.reduce((total, currentValue) => {
-        total += currentValue.totalLockedQty
-        return total
-      }, 0)
-
-      switch (type) {
-        case 'CONFIRM_ORDER':
-          inventoryTotalQty -= totalUnassignReleaseQty
-          break
       }
-
-      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
-      })
     }
   }
 

package/server/controllers/order-controller.ts

@@ -2,7 +2,6 @@ import { EntityManager, EntitySchema, FindOneOptions } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
-import { sendNotification } from '@things-factory/notification'
 import { ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -163,10 +162,13 @@ export class OrderController {
    */
   async notifyToUsers(users: User[], message: NotificationMsgInterface): Promise<void> {
     const receivers: any[] = users.map(user => user.id)
-    await sendNotification({
-      receivers,
-      message
-    })
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+    // await sendNotification({
+    //   receivers,
+    //   message
+    // })
   }
 
   /**