@things-factory/worksheet-base 4.3.76 → 4.3.79-alpha.0

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

@@ -24,6 +24,7 @@ export const pendingCancellationReleaseOrder = {
       relations: ['bizplace', 'orderInventories', 'orderVass']
     })
 
+    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
@@ -94,77 +95,81 @@ export const pendingCancellationReleaseOrder = {
       await tx.getRepository(OrderVas).save(foundOVs)
     }
 
-    if (pickedOIs && pickedOIs.length) {
-      let pickedWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
-        where: {
-          domain,
-          targetInventory: In(pickedOIs.map(oi => oi.id)),
-          status: ORDER_INVENTORY_STATUS.DONE
-        }
-      })
+    // find worksheet and update status to PENDING_CANCEL
+    let foundWS: Worksheet = await tx.getRepository(Worksheet).findOne({
+      where: {
+        domain,
+        releaseGood: foundRO
+      },
+      order: { 'createdAt': 'DESC' }
+    })
 
-      pickedWSD = pickedWSD.map((wsd: WorksheetDetail) => {
-        return {
-          ...wsd,
-          status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
-          updater: user
-        }
-      })
-      await tx.getRepository(WorksheetDetail).save(pickedWSD)
-
-      let replacedWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
-        where: {
-          domain,
-          targetInventory: In(pickedOIs.map(oi => oi.id)),
-          status: ORDER_INVENTORY_STATUS.REPLACED
-        },
-        relations: ['targetInventory']
+    if (foundWS) {
+      await tx.getRepository(Worksheet).update({ id: foundWS.id }, {
+        status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
+        updater: user
       })
 
-      if (replacedWSD && replacedWSD.length) {
-        let replacedOI: OrderInventory[] = replacedWSD.map((wsd: WorksheetDetail) => wsd.targetInventory)
-        replacedOI = replacedOI.map((oi: OrderInventory) => {
+      if (pickedOIs && pickedOIs.length) {
+        let pickedWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
+          where: {
+            domain,
+            targetInventory: In(pickedOIs.map(oi => oi.id)),
+            status: ORDER_INVENTORY_STATUS.DONE,
+            worksheet: foundWS
+          }
+        })
+
+        pickedWSD = pickedWSD.map((wsd: WorksheetDetail) => {
           return {
-            ...oi,
-            status: ORDER_INVENTORY_STATUS.REPLACED,
+            ...wsd,
+            status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
             updater: user
           }
         })
-        await tx.getRepository(OrderInventory).save(replacedOI)
-      }
-    }
+        await tx.getRepository(WorksheetDetail).save(pickedWSD)
 
-    if (pickingOIs && pickingOIs.length) {
-      let pickingWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
-        where: { domain, targetInventory: In(pickingOIs.map(oi => oi.id)) }
-      })
+        let replacedWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
+          where: {
+            domain,
+            targetInventory: In(pickedOIs.map(oi => oi.id)),
+            status: ORDER_INVENTORY_STATUS.REPLACED,
+            worksheet: foundWS
+          },
+          relations: ['targetInventory']
+        })
 
-      pickingWSD = pickingWSD.map((wsd: WorksheetDetail) => {
-        return {
-          ...wsd,
-          status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
-          updater: user
+        if (replacedWSD && replacedWSD.length) {
+          let replacedOI: OrderInventory[] = replacedWSD.map((wsd: WorksheetDetail) => wsd.targetInventory)
+          replacedOI = replacedOI.map((oi: OrderInventory) => {
+            return {
+              ...oi,
+              status: ORDER_INVENTORY_STATUS.REPLACED,
+              updater: user
+            }
+          })
+          await tx.getRepository(OrderInventory).save(replacedOI)
         }
-      })
-      await tx.getRepository(WorksheetDetail).save(pickingWSD)
-    }
-
-    // find worksheet and update status to PENDING_CANCEL
-    let foundWS: Worksheet[] = await tx.getRepository(Worksheet).find({
-      where: {
-        domain,
-        releaseGood: foundRO
       }
-    })
 
-    foundWS = foundWS.map((ws: Worksheet) => {
-      return {
-        ...ws,
-        status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
-        updater: user
+      if (pickingOIs && pickingOIs.length) {
+        let pickingWSD: WorksheetDetail[] = await tx.getRepository(WorksheetDetail).find({
+          where: {
+            domain, targetInventory: In(pickingOIs.map(oi => oi.id)),
+            worksheet: foundWS
+          }
+        })
+
+        pickingWSD = pickingWSD.map((wsd: WorksheetDetail) => {
+          return {
+            ...wsd,
+            status: ORDER_INVENTORY_STATUS.PENDING_CANCEL,
+            updater: user
+          }
+        })
+        await tx.getRepository(WorksheetDetail).save(pickingWSD)
       }
-    })
-    await tx.getRepository(Worksheet).save(foundWS)
+    }
 
     // find DO and change status to pending cancel
     let foundDO: DeliveryOrder[] = await tx.getRepository(DeliveryOrder).find({
@@ -186,43 +191,43 @@ export const pendingCancellationReleaseOrder = {
       updater: user
     })
 
-    // notification logics
-    // get Office Admin Users
-    const users: any[] = await tx
-      .getRepository('users_roles')
-      .createQueryBuilder('ur')
-      .select('ur.users_id', 'id')
-      .where(qb => {
-        const subQuery = qb
-          .subQuery()
-          .select('role.id')
-          .from(Role, 'role')
-          .where("role.name = 'Office Admin'")
-          .andWhere('role.domain_id = :domain', { domain: domain.id })
-          .getQuery()
-        return 'ur.roles_id IN ' + subQuery
-      })
-      .getRawMany()
-
-    // send notification to Office Admin Users
-    if (users?.length && context.header?.referer) {
-      const receivers: any[] = users.map(user => user.id)
-      const msg = {
-        title: `${foundRO.name} cancellation`,
-        body: `${customerBizplace.name} is requesting to cancel order`,
-        url: context.header.referer,
-        data: { url: context.header.referer }
-      }
-
-      /**
-       * @notes Temporary off sendNotification due to suspect of causing wms down
-       */
 
-      // await sendNotification({
-      //   receivers,
-      //   message: { ...msg }
-      // })
-    }
+    /**
+     * @notes Temporary off sendNotification due to suspect of causing wms down
+     */
+    // // notification logics
+    // // get Office Admin Users
+    // const users: any[] = await tx
+    //   .getRepository('users_roles')
+    //   .createQueryBuilder('ur')
+    //   .select('ur.users_id', 'id')
+    //   .where(qb => {
+    //     const subQuery = qb
+    //       .subQuery()
+    //       .select('role.id')
+    //       .from(Role, 'role')
+    //       .where("role.name = 'Office Admin'")
+    //       .andWhere('role.domain_id = :domain', { domain: domain.id })
+    //       .getQuery()
+    //     return 'ur.roles_id IN ' + subQuery
+    //   })
+    //   .getRawMany()
+
+    // // send notification to Office Admin Users
+    // if (users?.length && context.header?.referer) {
+    //   const receivers: any[] = users.map(user => user.id)
+    //   const msg = {
+    //     title: `${foundRO.name} cancellation`,
+    //     body: `${customerBizplace.name} is requesting to cancel order`,
+    //     url: context.header.referer,
+    //     data: { url: context.header.referer }
+    //   }
+
+    //   await sendNotification({
+    //     receivers,
+    //     message: { ...msg }
+    //   })
+    // }
 
     return
   }

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)