@things-factory/worksheet-base 4.3.237 → 4.3.238

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -1,26 +1,12 @@
-import {
-  EntityManager,
-  Equal,
-  getConnection,
-  getManager,
-  In,
-  IsNull,
-  Not
-} from 'typeorm'
+import { EntityManager, Equal, getConnection, getManager, In, IsNull, Not } from 'typeorm'
 
 import { ApplicationType } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
-import {
-  Sellercraft,
-  SellercraftStatus
-} from '@things-factory/integration-sellercraft'
-import {
-  Product,
-  ProductBarcode,
-  ProductDetail
-} from '@things-factory/product-base'
+import { Powrup } from '@things-factory/integration-powrup'
+import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
 import {
   GenerateBatchPickInfo,
   ORDER_INVENTORY_STATUS,
@@ -50,21 +36,10 @@ import {
   TOTE_STATUS
 } from '@things-factory/warehouse-base'
 
-import {
-  TASK_NUMBER_RULE_TYPE,
-  TASK_NUMBER_SETTING_KEY,
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE
-} from '../../constants'
-import { SellercraftController } from '../../controllers'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../entities'
-import {
-  isInventoryObsolete,
-  WorksheetNoGenerator
-} from '../../utils'
+import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
+import { SellercraftController, PowrupController } from '../../controllers'
+import { Worksheet, WorksheetDetail } from '../../entities'
+import { isInventoryObsolete, WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
@@ -292,6 +267,30 @@ export class PickingWorksheetController extends VasWorksheetController {
           })
           break
 
+        case ApplicationType.POWRUP:
+          getManager().transaction(async txMgr => {
+            const powrup: Powrup = await txMgr.getRepository(Powrup).findOne({ active: true })
+
+            if (powrup) {
+              const powrupCtrl: PowrupController = new PowrupController(txMgr, this.domain, this.user)
+
+              if (!releaseGood?.orderPackages?.length) {
+                const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
+                  where: { releaseGood },
+                  relations: ['product', 'productDetail']
+                })
+
+                // asynchronously pack order
+                await powrupCtrl.packOrder(powrup, {
+                  ...releaseGood,
+                  orderProducts,
+                  domain: worksheet.domain
+                })
+              }
+            }
+          })
+          break
+
         default:
           break
       }
@@ -331,16 +330,16 @@ export class PickingWorksheetController extends VasWorksheetController {
     const pickingOrderInventory: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_STATUS.PICKING },
       relations: [
-      'releaseGood',
-      'releaseGood.domain',
-      'releaseGood.lastMileDelivery', 
-      'releaseGood.bizplace',
-      'releaseGood.bizplace.domain',
-      'releaseGood.orderPackages',
-      'releaseGood.orderPackages.orderPackageItems',
-      'releaseGood.orderPackages.orderPackageItems.orderProduct',
-      'releaseGood.orderPackages.orderPackageItems.orderProduct.product'
-    ]
+        'releaseGood',
+        'releaseGood.domain',
+        'releaseGood.lastMileDelivery',
+        'releaseGood.bizplace',
+        'releaseGood.bizplace.domain',
+        'releaseGood.orderPackages',
+        'releaseGood.orderPackages.orderPackageItems',
+        'releaseGood.orderPackages.orderPackageItems.orderProduct',
+        'releaseGood.orderPackages.orderPackageItems.orderProduct.product'
+      ]
     })
 
     let releaseGoods: ReleaseGood[] = pickingOrderInventory.reduce((data, oi: OrderInventory) => {
@@ -383,6 +382,26 @@ export class PickingWorksheetController extends VasWorksheetController {
                 })
                 break
 
+              case ApplicationType.POWRUP:
+                getManager().transaction(async txMgr => {
+                  const powrup: Powrup = await txMgr.getRepository(Powrup).findOne({ active: true })
+
+                  if (powrup) {
+                    const powrupCtrl: PowrupController = new PowrupController(txMgr, this.domain, this.user)
+
+                    if (!releaseGood?.orderPackages?.length) {
+                      const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
+                        where: { releaseGood },
+                        relations: ['product', 'productDetail']
+                      })
+
+                      // asynchronously pack order
+                      await powrupCtrl.packOrder(powrup, { ...releaseGood, orderProducts })
+                    }
+                  }
+                })
+                break
+
               default:
                 break
             }
@@ -1354,7 +1373,9 @@ export class PickingWorksheetController extends VasWorksheetController {
     worksheet.endedAt = new Date()
     worksheet.updater = this.user
 
-    const worksheetDetails: any = worksheet.worksheetDetails.filter(wsD => wsD.status != 'MISSING' && wsD.status != 'CANCELLED')
+    const worksheetDetails: any = worksheet.worksheetDetails.filter(
+      wsD => wsD.status != 'MISSING' && wsD.status != 'CANCELLED'
+    )
     worksheetDetails.forEach((wsd: WorksheetDetail) => {
       wsd.status = WORKSHEET_STATUS.DONE
       wsd.updater = this.user

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

@@ -1,11 +1,13 @@
 import { EntityManager } from 'typeorm'
 
 import { ApplicationType, User } from '@things-factory/auth-base'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+// import { PowrupController } from '@things-factory/warehouse-base'
 
-import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
+import { PackingWorksheetController, SellercraftController, PowrupController } from '../../../../controllers'
 
 export const packingResolver = {
   async packing(_: any, { orderPackageItemId, releaseQty, serialNumber }, context: any) {
@@ -40,6 +42,15 @@ export async function packing(
       }
       break
 
+    case ApplicationType.POWRUP:
+      const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+      if (powrup) {
+        const powrupCtrl: PowrupController = new PowrupController(tx, domain, user)
+        await powrupCtrl.fetchDocument(powrup, releaseGood)
+      }
+      break
+
     default:
       break
   }

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

@@ -2,6 +2,7 @@ import { EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
 
 import { ApplicationType, User } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
@@ -22,7 +23,7 @@ import { Domain } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
-import { PackingWorksheetController, SellercraftController } from '../../../controllers'
+import { PackingWorksheetController, SellercraftController, PowrupController } from '../../../controllers'
 import { Worksheet } from '../../../entities'
 
 export const packingWorksheetResolver = {
@@ -210,6 +211,15 @@ export const packingWorksheetResolver = {
           }
           break
 
+        case ApplicationType.POWRUP:
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+          if (powrup) {
+            // asynchronously get document from powrup
+            getPowrupDocument(powrup, releaseGood, domain, user)
+          }
+          break
+
         case ApplicationType.MMS:
           marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo },
@@ -297,7 +307,9 @@ export const packingWorksheetResolver = {
               // packingType: inventory.packingType,
               // packingSize: inventory.packingSize,
               // this is the problem
-              binLocation: binLocation ? releaseGood.orderInventories.find(oi  => oi.orderProductId == opi.orderProduct.id)?.binLocation : binLocation ,
+              binLocation: binLocation
+                ? releaseGood.orderInventories.find(oi => oi.orderProductId == opi.orderProduct.id)?.binLocation
+                : binLocation,
               isBatchPicking
               // location: inventory.location,
               // relatedOrderInv: targetInventory
@@ -397,3 +409,35 @@ async function getSellercraftDocument(sellercraft: Sellercraft, releaseGood: Rel
     }
   })
 }
+
+//trigger RTS, init document, and fetch powrup document in separated transaction
+async function getPowrupDocument(powrup: Powrup, releaseGood: ReleaseGood, domain: Domain, user: User) {
+  await getManager().transaction(async txMgr => {
+    const powrupCtrl: PowrupController = new PowrupController(txMgr, domain, user)
+    try {
+      if (!releaseGood?.airwayBill) {
+        try {
+          // try fetch order document / AWB
+          releaseGood = await powrupCtrl.fetchDocument(powrup, releaseGood)
+        } catch (error) {
+          try {
+            // retry initiate order shipment / RTS
+            await powrupCtrl.initiateShipment(powrup, releaseGood)
+          } catch (error) {
+            throw new Error(`initiateOrderShipment: ${error}`)
+          }
+          throw new Error(`fetchOrderDocument: ${error}`)
+        }
+      }
+    } catch (error) {
+      logger.error(
+        `packing-worksheet[getPowrupDocument]:(data:${JSON.stringify({
+          powrup,
+          releaseGood,
+          domain,
+          user
+        })}) ${error} `
+      )
+    }
+  })
+}

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

@@ -6,6 +6,7 @@ import { logger } from '@things-factory/env'
 import { Account } from '@things-factory/integration-accounting'
 import { sqsSendMessage } from '@things-factory/integration-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import {
@@ -24,7 +25,8 @@ import {
   PackingWorksheetController,
   PickingWorksheetController,
   SellercraftController,
-  SortingWorksheetController
+  SortingWorksheetController,
+  PowrupController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
@@ -131,6 +133,33 @@ export async function completeBatchPicking(
           }
           break
 
+        case ApplicationType.POWRUP:
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+          if (powrup) {
+            const initPowrupShipment = async (powrup: Powrup, foundReleaseGood: ReleaseGood) => {
+              await getManager().transaction(async txMgr => {
+                const powrupCtrl: PowrupController = new PowrupController(txMgr, domain, user)
+
+                if (!foundReleaseGood?.orderPackages?.length && !foundReleaseGood?.marketPackCallSuccess) {
+                  await powrupCtrl.packOrder(powrup, foundReleaseGood)
+                }
+
+                const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
+                  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+                })
+
+                if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+                  await powrupCtrl.initiateShipment(powrup, foundReleaseGood)
+                }
+              })
+            }
+
+            // asynchronouly call to initiate sellercraft order shipment/ RTS
+            initPowrupShipment(powrup, foundReleaseGood)
+          }
+          break
+
         case ApplicationType.MMS:
           const companyDomain: Domain = foundReleaseGood.bizplace.company.domain
           const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({

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

@@ -7,6 +7,7 @@ import { Account } from '@things-factory/integration-accounting'
 import { sqsSendMessage } from '@things-factory/integration-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
@@ -35,7 +36,8 @@ import {
   PackingWorksheetController,
   PickingWorksheetController,
   ReplenishmentWorksheetController,
-  SellercraftController
+  SellercraftController,
+  PowrupController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
@@ -153,6 +155,36 @@ export async function completePicking(
           }
           break
 
+        case ApplicationType.POWRUP:
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+          if (powrup) {
+            const initPowrupShipment = async powrup => {
+              await getManager().transaction(async txMgr => {
+                const powrupController: PowrupController = new PowrupController(txMgr, domain, user)
+
+                if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess) {
+                  const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
+                    where: { releaseGood },
+                    relations: ['product', 'productDetail']
+                  })
+                  await powrupController.packOrder(powrup, { ...releaseGood, orderProducts })
+                }
+
+                const rtsTriggerLevel: Setting = await txMgr.getRepository(Setting).findOne({
+                  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+                })
+
+                if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+                  await powrupController.initiateShipment(powrup, releaseGood)
+                }
+              })
+            }
+            // asynchronouly call to initiate powrup order shipment/ RTS
+            initPowrupShipment(powrup)
+          }
+          break
+
         case ApplicationType.MMS:
           const companyDomain: Domain = releaseGood.bizplace.company.domain
           let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({

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

@@ -1,10 +1,13 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Application, 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 { Domain } from '@things-factory/shell'
+// import { PowrupController } from '@things-factory/warehouse-base'
+import { Powrup } from '@things-factory/integration-powrup'
+import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
 import { PutawayWorksheetController } from '../../../../controllers'
 import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
@@ -26,13 +29,16 @@ export const completePutawayResolver = {
         'orderProducts',
         'orderProducts.product',
         'orderProducts.product.productDetails',
-        'orderProducts.product.productDetails.childProductDetail'
+        'orderProducts.product.productDetails.childProductDetail',
+        'orderProducts.productDetail'
       ]
     })
 
     // search for any active marketplace connection
     const companyDomain: Domain = arrivalNotice.bizplace.company.domain
     const customerDomain: Domain = arrivalNotice.bizplace.domain
+    const customerBizplaceId: string = arrivalNotice.bizplace.id
+    const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
 
     // const orderSource: string = arrivalNotice.source
     // switch (orderSource) {
@@ -72,6 +78,10 @@ export const completePutawayResolver = {
       .getRepository(Sellercraft)
       .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
+    // const powrup: Powrup = await tx
+    //   .getRepository(Application)
+    //   .findOne({ domain: companyBizplace.domain, status: 'ACTIVE' })
+
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
 
@@ -85,6 +95,13 @@ export const completePutawayResolver = {
       // allow async run to skip user wait time
       ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
     }
+
+    // if (powrup) {
+    //   const powrupController: PowrupController = new PowrupController(tx, domain, user)
+
+    //   // allow async run to skip user wait time
+    //   powrupController.updateStock(powrup, arrivalNotice)
+    // }
   }
 }
 

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

@@ -1,9 +1,12 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Application, User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+// import { PowrupController } from '@things-factory/warehouse-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'
@@ -22,7 +25,8 @@ export const completePutawayReturnResolver = {
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.product',
-        'orderInventories.product.productDetails'
+        'orderInventories.product.productDetails',
+        'orderInventories.productDetail'
       ]
     })
 
@@ -31,10 +35,21 @@ export const completePutawayReturnResolver = {
       .getRepository(Sellercraft)
       .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
+    // const customerBizplaceId: string = returnOrder.bizplace.id
+    // const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+    // const powrup: Powrup = await tx
+    //   .getRepository(Application)
+    //   .findOne({ domain: companyBizplace.domain, status: 'ACTIVE' })
+
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
       await sellercraftCtrl.registerProductReturn(sellercraft, returnOrder)
     }
+
+    // if (powrup) {
+    //   const powrupController: PowrupController = new PowrupController(tx, domain, user)
+    //   await powrupController.updateStock(powrup, returnOrder)
+    // }
   }
 }