@things-factory/worksheet-base 4.3.77 → 4.3.79-alpha.1

package/server/graphql/resolvers/worksheet/packing-worksheet.ts

@@ -1,6 +1,6 @@
-import { EntityManager, SelectQueryBuilder, getManager } from 'typeorm'
+import { EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
@@ -10,11 +10,12 @@ import {
   MarketplaceOrderShippingItem
 } from '@things-factory/marketplace-base'
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_TYPE } from '../../../constants'
-import { SellercraftController } from '../../../controllers'
+import { PackingWorksheetController, SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
@@ -47,7 +48,7 @@ export const packingWorksheetResolver = {
             .innerJoinAndSelect(
               'worksheets',
               'ws',
-              `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND ws.status = 'EXECUTING'`
+              `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND (ws.status = 'EXECUTING' OR ws.status = 'DEACTIVATED')`
             )
             .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
             .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
@@ -61,11 +62,22 @@ export const packingWorksheetResolver = {
             .andWhere('releaseGood.status IN (:...status)', {
               status: [ORDER_STATUS.READY_TO_PACK, ORDER_STATUS.PACKING]
             })
+            .orderBy(`case when orderInventory.status = '${ORDER_INVENTORY_STATUS.PACKED}' then 1 end`)
+            .addOrderBy('ws.created_at', 'ASC')
 
-          const orderInventoryByBin = await qb.getOne()
-          if (orderInventoryByBin?.releaseGood) {
-            releaseGoodNo = orderInventoryByBin.releaseGood.name
-            releaseGood = orderInventoryByBin.releaseGood
+          const [orderInventoriesByBin, totalInventoriesByBin] = await qb.getManyAndCount()
+          // @oscarchuaweiwen-fsd @chrislim I suggest using getMany() instead since the total is redundant here
+
+          // remove duplicated count of release good
+          const filteredRO = orderInventoriesByBin.map(oiBin => {
+            return oiBin.releaseGood.name
+          })
+
+          if (orderInventoriesByBin.length > 0) {
+            releaseGoodNo = orderInventoriesByBin[0].releaseGood.name
+            releaseGood = orderInventoriesByBin[0].releaseGood
+            releaseGood.totalInventoriesByBin = [...new Set(filteredRO)].length
+            releaseGood.isOrderInventoryBin = true
           } else {
             throw new Error(`Bin do not have any existing order.`)
           }
@@ -95,24 +107,59 @@ export const packingWorksheetResolver = {
         releaseGood
       )
 
-      let marketplaceOrder: MarketplaceOrder
+      if (worksheet.status === 'DEACTIVATED') {
+        const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
+
+        const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
+          where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
+        })
+
+        const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx
+          .getRepository(PartnerSetting)
+          .findOne({
+            where: {
+              setting: directActivatePackingWorksheet,
+              domain: domain,
+              partnerDomain: releaseGood.bizplace?.domain
+            }
+          })
+
+        if (
+          directActivatePackingWorksheet != undefined &&
+          directActivatePackingWorksheet.value.toLowerCase() == 'true'
+        ) {
+          if (partnerDirectActivatePackingWorksheetSetting != undefined) {
+            if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
+              await packingWSCtrl.activatePacking(worksheet.name)
+          } else {
+            await packingWSCtrl.activatePacking(worksheet.name)
+          }
+        } else {
+          throw new Error('Kindly go to packing worksheet page to activate the packing worksheet')
+        }
+      }
+
+      let marketplaceOrder: MarketplaceOrder = {}
       let marketplaceOrderItems: MarketplaceOrderItem[] = []
       let marketplaceStore
       let trackingNo: string
       let shippingProvider: string
       let marketplaceStatus: string
 
-      if (releaseGood.type === 'b2c') {
+      const orderSource: string = releaseGood.source
+      switch (orderSource) {
+        case ApplicationType.SELLERCRAFT:
+          const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+            domain: worksheet.bizplace.domain,
+            status: SellercraftStatus.ACTIVE
+          })
 
-        const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-          domain: worksheet.bizplace.domain,
-          status: SellercraftStatus.ACTIVE
-        })
+          if (sellercraft) {
+            getSellercraftDocument(sellercraft, releaseGood, domain, user)
+          }
+          break
 
-        if (sellercraft) {
-          // asynchronously get document from sellercraft
-          getSellercraftDocument(sellercraft, releaseGood, domain, user)
-        } else {
+        case ApplicationType.MMS:
           marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo },
             relations: [
@@ -148,9 +195,60 @@ export const packingWorksheetResolver = {
 
           marketplaceStore = marketplaceOrder?.marketplaceStore
           marketplaceStatus = marketplaceOrder?.status
-        }
+          break
+
+        default:
+          break
       }
 
+      // if (releaseGood.type === 'b2c') {
+      //   const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+      //     domain: worksheet.bizplace.domain,
+      //     status: SellercraftStatus.ACTIVE
+      //   })
+
+      //   if (sellercraft) {
+      //     // asynchronously get document from sellercraft
+      //     getSellercraftDocument(sellercraft, releaseGood, domain, user)
+      //   } else {
+      //     marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+      //       where: { orderNo: releaseGood.refNo },
+      //       relations: [
+      //         'domain',
+      //         'marketplaceStore',
+      //         'marketplaceOrderItems',
+      //         'marketplaceOrderItems.marketplaceOrderShippingItems',
+      //         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+      //       ]
+      //     })
+
+      //     if (!marketplaceOrder) {
+      //       throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
+      //     }
+
+      //     let marketplaceOrderShipping: MarketplaceOrderShipping
+      //     if (marketplaceOrder.isSplitted) {
+      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
+      //         where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
+      //       })
+      //     } else {
+      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
+      //         where: { orderNoRef: worksheet.releaseGood.refNo }
+      //       })
+      //     }
+
+      //     trackingNo = marketplaceOrderShipping.ownTrackingNo
+      //       ? marketplaceOrderShipping.ownTrackingNo
+      //       : marketplaceOrderShipping.trackingNo
+      //     shippingProvider = marketplaceOrderShipping.ownTransporter
+      //       ? marketplaceOrderShipping.ownTransporter
+      //       : marketplaceOrderShipping.transporter
+
+      //     marketplaceStore = marketplaceOrder?.marketplaceStore
+      //     marketplaceStatus = marketplaceOrder?.status
+      //   }
+      // }
+
       return {
         worksheetInfo: {
           releaseGood,
@@ -165,8 +263,8 @@ export const packingWorksheetResolver = {
           airwayBill: releaseGood?.airwayBill,
           checkedRemarkBy: releaseGood?.checkedRemarkBy,
           invoice: releaseGood?.invoice,
-          platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
-          marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
+          platform: Object.keys(marketplaceOrder).length > 0 ? marketplaceOrder.marketplaceStore?.platform : 'operato',
+          marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? marketplaceOrder.marketplaceStore?.id : '',
           marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
           marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
         },
@@ -265,7 +363,14 @@ async function getSellercraftDocument(sellercraft: Sellercraft, releaseGood: Rel
         }
       }
     } catch (error) {
-      logger.error(`packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({ sellercraft, releaseGood, domain, user })}) ${error} `)
+      logger.error(
+        `packing-worksheet[getSellercraftDocument]:(data:${JSON.stringify({
+          sellercraft,
+          releaseGood,
+          domain,
+          user
+        })}) ${error} `
+      )
     }
   })
-}
+}

package/server/graphql/resolvers/worksheet/pending-cancellation-release-order.ts

@@ -24,7 +24,7 @@ export const pendingCancellationReleaseOrder = {
       relations: ['bizplace', 'orderInventories', 'orderVass']
     })
 
-    if (foundRO.status === "DONE") throw new Error('Release good has been completed!');
+    if (foundRO.status === "DONE") throw new Error('Release good has been completed!')
     if (!foundRO) throw new Error(`Release good order doesn't exists.`)
     let targetOIs: OrderInventory[] = foundRO.orderInventories
     let foundOVs: OrderVas[] = foundRO.orderVass

package/server/graphql/resolvers/worksheet/picking/activate-picking.ts

@@ -1,8 +1,7 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -27,42 +26,73 @@ export async function activatePicking(
   const worksheet = await worksheetController.activatePicking(worksheetNo)
   const companyDomain: Domain = worksheet?.bizplace.company.domain
 
-  // find for any existing marketplace store connections
-  const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-    relations: ['marketplaceDistributors']
-  })
-
   let releaseGood: ReleaseGood = worksheet.releaseGood
 
-  if (releaseGood.type === 'b2c') {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-    if (marketplaceStores?.length && !sellercraft) {
-      if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-        const worksheetDetails = worksheet.worksheetDetails
-        let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
-      }
-
-      const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        relations: ['marketplaceStore']
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.MMS:
+      // find for any existing marketplace store connections
+      const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+        where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+        relations: ['marketplaceDistributors']
       })
 
-      if (marketplaceOrder) {
-        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-
-        if (marketplaceStore.isAutoUpdateShipment) {
+      if (marketplaceStores?.length) {
+        if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+          const worksheetDetails = worksheet.worksheetDetails
+          let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
           const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+          await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+        }
+
+        const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: releaseGood.refNo, domain: companyDomain },
+          relations: ['marketplaceStore']
+        })
+
+        if (marketplaceOrder) {
+          const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+          if (marketplaceStore.isAutoUpdateShipment) {
+            const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+            await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+          }
         }
       }
-    }
+      break
+
+    default:
+      break
   }
 
+  // if (releaseGood.type === 'b2c') {
+  //   const sellercraft: Sellercraft = await tx
+  //     .getRepository(Sellercraft)
+  //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  //   if (marketplaceStores?.length && !sellercraft) {
+  //     if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+  //       const worksheetDetails = worksheet.worksheetDetails
+  //       let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
+  //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+  //     }
+
+  //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
+  //       relations: ['marketplaceStore']
+  //     })
+
+  //     if (marketplaceOrder) {
+  //       const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+  //       if (marketplaceStore.isAutoUpdateShipment) {
+  //         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //         await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+  //       }
+  //     }
+  //   }
+  // }
+
   return worksheet
 }

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -69,7 +69,7 @@ export async function completeBatchPicking(
 
         let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: { id: releaseGood.id },
-          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
+          relations: ['orderProducts', 'orderProducts.product']
         })
 
         if (!foundReleaseGood?.packageId) {
@@ -112,7 +112,7 @@ export async function completeBatchPicking(
     })
 
     // loop to generate packing worksheet
-    for (var i: number = 0; i < uniqueRoNo.length; i++) {
+    for (let i: number = 0; i < uniqueRoNo.length; i++) {
       const releaseGoodNo: string = uniqueRoNo[i]
       const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
       await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)