@things-factory/worksheet-base 4.3.251 → 4.3.253

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -1,10 +1,24 @@
 import { EntityManager, In } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Application, ApplicationType, User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
+import {
+  InventoryCheck,
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  PowrupController
+} from '@things-factory/sales-base'
+
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
+import {
+  Inventory,
+  INVENTORY_STATUS,
+  INVENTORY_TRANSACTION_TYPE,
+  Location,
+  generateInventoryHistory
+} from '@things-factory/warehouse-base'
+import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
@@ -53,6 +67,7 @@ export async function cycleCountAdjustment(
       'targetInventory',
       'targetInventory.inventory',
       'targetInventory.inventory.product',
+      'targetInventory.inventory.productDetail',
       'targetInventory.inventory.product.productDetails',
       'targetInventory.inventory.product.productDetails.childProductDetail',
       'targetInventory.inventory.bizplace',
@@ -77,6 +92,15 @@ export async function cycleCountAdjustment(
       relations: ['domain']
     })
 
+    const customerDomain: Domain = targetInventory.inventory.bizplace.domain
+    const customerBizplaceId: string = targetInventory.inventory.bizplace.id
+    const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+    const application: Application = await tx.getRepository(Application).findOne({
+      domain: companyBizplace.domain,
+      status: 'ACTIVE',
+      type: ApplicationType.POWRUP
+    })
+
     if (targetInventory.status === ORDER_INVENTORY_STATUS.MISSING) {
       // create STORED, CC_ADJUSTMENT history
       await generateInventoryHistory(
@@ -104,6 +128,11 @@ export async function cycleCountAdjustment(
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
         await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
       }
+
+      if (application) {
+        const powrupController: PowrupController = new PowrupController()
+        await powrupController.updateStock([inventory], customerDomain, user, tx)
+      }
     } else if (targetInventory.inspectedQty == 0) {
       // create STORED, CC_ADJUSTMENT history
       await generateInventoryHistory(
@@ -135,6 +164,11 @@ export async function cycleCountAdjustment(
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
         await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
       }
+
+      if (application) {
+        const powrupController: PowrupController = new PowrupController()
+        await powrupController.updateStock([inventory], customerDomain, user, tx)
+      }
     } else {
       const prevLocationId: string = inventory.location.id
 
@@ -191,6 +225,11 @@ export async function cycleCountAdjustment(
       await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
     }
 
+    if (application) {
+      const powrupController: PowrupController = new PowrupController()
+      await powrupController.updateStock([inventory], customerDomain, user, tx)
+    }
+
     targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
     targetInventory.updater = user
     await tx.getRepository(OrderInventory).save(targetInventory)

package/server/graphql/resolvers/worksheet/fetch-powrup-document.ts

@@ -0,0 +1,56 @@
+import { EntityManager, getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Powrup } from '@things-factory/integration-powrup'
+import { ReleaseGood, PowrupController } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { logger } from '@things-factory/env'
+
+export const fetchPowrupDocumentResolver = {
+  async fetchPowrupDocument(_: any, { releaseGoodId }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+
+    //find release goods base on id
+    let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
+      where: { domain, id: releaseGoodId },
+      relations: ['bizplace', 'bizplace.domain']
+    })
+
+    //find user powrup data
+    const powrup: Powrup = await getRepository(Powrup).findOne({
+      active: true,
+      platform: 'POWRUP'
+    })
+
+    // instantiate powrup controller
+    const powrupCtrl: PowrupController = new PowrupController()
+
+    try {
+      // fetch document if not found
+      if (powrup && !releaseGood?.airwayBill) {
+        try {
+          // try fetch order document / AWB
+          releaseGood = await powrupCtrl.fetchDocument(powrup, releaseGood)
+        } catch (error) {
+          try {
+            // retry initiate order document
+            await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, tx)
+          } catch (error) {
+            throw new Error(`initiateShipment: ${error}`)
+          }
+          throw new Error(`fetchDocument: ${error}`)
+        }
+      }
+
+      const airwayBill: string = releaseGood?.airwayBill
+      const invoice: string = releaseGood?.invoice
+      return { airwayBill, invoice }
+    } catch (error) {
+      logger.error(
+        `packing-worksheet[getPowrupDocument]:(data:${JSON.stringify({ powrup, releaseGood, domain, user })}) ${error} `
+      )
+
+      throw new Error('Waiting for AWB from marketplace. Please retry in awhile')
+    }
+  }
+}

package/server/graphql/resolvers/worksheet/index.ts

@@ -10,6 +10,7 @@ import { deleteWorksheet } from './delete-worksheet'
 import { deliveryOrderByWorksheetResolver } from './delivery-order-by-worksheet'
 import { fetchDeliveryOrderROResolver } from './fetch-delivery-order-ro'
 import { fetchSellercraftDocumentResolver } from './fetch-sellercraft-document'
+import { fetchPowrupDocumentResolver } from './fetch-powrup-document'
 import { findReleaseOrdersByTaskNoResolver } from './find-release-orders-by-task-no'
 import { findSortingReleaseOrdersByTaskNoResolver } from './find-sorting-release-orders-by-task-no'
 import { Mutations as GenerateWorksheetMutations } from './generate-worksheet'
@@ -142,6 +143,7 @@ export const Mutation = {
   ...unpackingResolver,
   ...palletizingPallets,
   ...fetchSellercraftDocumentResolver,
+  ...fetchPowrupDocumentResolver,
   ...cancelDraftReleaseOrder,
   ...cancelReplenishment,
   ...ReplenishmentMutations

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

@@ -153,11 +153,17 @@ export const packingWorksheetResolver = {
       if (worksheet.status === WORKSHEET_STATUS.DONE) {
         throw new Error(`Worksheet is completed already`)
       } else if (worksheet.status === WORKSHEET_STATUS.EXECUTING) {
-        if (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) {
+        if (
+          (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) ||
+          (orderPackages?.length == 0 && orderSource == ApplicationType.POWRUP)
+        ) {
           throw new Error('Waiting for packages from marketplace. Please retry in while.')
         }
       } else if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
-        if (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) {
+        if (
+          (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) ||
+          (orderPackages?.length == 0 && orderSource == ApplicationType.POWRUP)
+        ) {
           throw new Error('Waiting for packages from marketplace. Please retry in while.')
         }
 
@@ -274,6 +280,7 @@ export const packingWorksheetResolver = {
           refNo: releaseGood.refNo,
           refNo2: releaseGood.refNo2,
           refNo3: releaseGood.refNo3,
+          source: releaseGood.source,
           partnerDomainId: releaseGood.bizplace?.domain.id,
           startedAt: worksheet.startedAt,
           shippingProvider: shippingProvider ? shippingProvider : '',
@@ -423,11 +430,11 @@ async function getPowrupDocument(powrup: Powrup, releaseGood: ReleaseGood, domai
         } catch (error) {
           try {
             // retry initiate order shipment / RTS
-            await powrupCtrl.initiateShipment(powrup, releaseGood)
+            await powrupCtrl.initiateShipment(powrup, releaseGood, domain, user, txMgr)
           } catch (error) {
-            throw new Error(`initiateOrderShipment: ${error}`)
+            throw new Error(`initiateShipment: ${error}`)
           }
-          throw new Error(`fetchOrderDocument: ${error}`)
+          throw new Error(`fetchDocument: ${error}`)
         }
       }
     } catch (error) {

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

@@ -142,7 +142,7 @@ export async function completeBatchPicking(
                 const powrupCtrl: PowrupController = new PowrupController()
 
                 if (!foundReleaseGood?.orderPackages?.length && !foundReleaseGood?.marketPackCallSuccess) {
-                  await powrupCtrl.packOrder(powrup, foundReleaseGood)
+                  await powrupCtrl.packOrder(powrup, foundReleaseGood, domain, user, tx)
                 }
 
                 const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({

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

@@ -170,7 +170,7 @@ export async function completePicking(
                     where: { releaseGood },
                     relations: ['product', 'productDetail']
                   })
-                  await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user, tx)
+                  await powrupController.packOrder(powrup, { ...releaseGood, orderProducts }, domain, user, txMgr)
                 }
 
                 const rtsTriggerLevel: Setting = await txMgr.getRepository(Setting).findOne({
@@ -178,7 +178,7 @@ export async function completePicking(
                 })
 
                 if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
-                  await powrupController.initiateShipment(powrup, releaseGood)
+                  await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
                 }
               })
             }
@@ -416,7 +416,7 @@ export async function completePicking(
             if (vasWorksheet) {
               await activateVas(tx, domain, user, vasWorksheet.name, vasWorksheetDetails)
             }
-          } catch (e) { }
+          } catch (e) {}
         }
         // Can improve by applying "Else" since if got VAS user has to complete then only we generate loading worksheet
         if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {

package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts

@@ -3,10 +3,8 @@ import { EntityManager } from 'typeorm'
 import { Application, ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { ArrivalNotice } from '@things-factory/sales-base'
+import { ArrivalNotice, PowrupController } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { PowrupController } from '@things-factory/sales-base'
-import { Powrup } from '@things-factory/integration-powrup'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
 import { PutawayWorksheetController } from '../../../../controllers'
@@ -100,7 +98,7 @@ export const completePutawayResolver = {
       const powrupController: PowrupController = new PowrupController()
 
       // allow async run to skip user wait time
-      powrupController.updateStock(arrivalNotice.orderProducts, companyBizplace.domain, user, tx)
+      powrupController.updateStock(arrivalNotice.orderProducts, customerDomain, user)
     }
   }
 }

package/server/graphql/resolvers/worksheet/putaway-return/complete-putaway-return.ts

@@ -2,11 +2,9 @@ import { EntityManager } from 'typeorm'
 
 import { Application, ApplicationType, User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { ReturnOrder } from '@things-factory/sales-base'
+import { ReturnOrder, PowrupController } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { PowrupController } from '@things-factory/sales-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
-import { Powrup } from '@things-factory/integration-powrup'
 
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 import { SellercraftController } from '../../../../controllers/ecommerce'
@@ -48,7 +46,7 @@ export const completePutawayReturnResolver = {
 
     if (application) {
       const powrupController: PowrupController = new PowrupController()
-      await powrupController.updateStock(returnOrder.orderInventories, companyBizplace.domain, user, tx)
+      await powrupController.updateStock(returnOrder.orderInventories, customerDomain, user, tx)
     }
   }
 }

package/server/graphql/types/worksheet/index.ts

@@ -19,6 +19,7 @@ import { ProductApproval } from './product-approval'
 import { ReleaseGoodWorksheet } from './release-good-worksheet'
 import { ReturnOrderWorksheet } from './return-order-worksheet'
 import { SellercraftDocument } from './sellercraft-document'
+import { PowrupDocument } from './powrup-document'
 import { VasOrderWorksheet } from './vas-order-worksheet'
 import { Worksheet } from './worksheet'
 import { WorksheetDetailInfo } from './worksheet-detail-info'
@@ -74,6 +75,10 @@ export const Mutation = /* GraphQL */ `
     releaseGoodId: String!
   ): SellercraftDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  fetchPowrupDocument (
+    releaseGoodId: String!
+  ): PowrupDocument @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   generateSortingWorksheet (
     worksheetNo: String!
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
@@ -769,9 +774,10 @@ export const Query = /* GraphQL */ `
   findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */[
+export const Types = /* GraphQL */ [
   Worksheet,
   SellercraftDocument,
+  PowrupDocument,
   NewWorksheet,
   WorksheetPatch,
   WorksheetList,

package/server/graphql/types/worksheet/powrup-document.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const PowrupDocument = gql`
+  type PowrupDocument {
+    airwayBill: String
+    invoice: String
+  }
+`

package/server/graphql/types/worksheet/worksheet-info.ts

@@ -18,6 +18,7 @@ export const WorksheetInfo = gql`
     shippingProvider: String
     trackingNo: String
     platform: String
+    source: String
     marketplaceStoreId: String
     marketplaceOrder: MarketplaceOrder
     bufferLocation: String