@things-factory/worksheet-base 4.3.534 → 4.3.536

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

@@ -1,4 +1,4 @@
-import { Equal, In, Not } from 'typeorm'
+import { Equal, getConnection, In, Not } from 'typeorm'
 
 import { ApplicationType } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
@@ -16,6 +16,7 @@ import {
   WebspertController,
   ReleaseGood
 } from '@things-factory/sales-base'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import {
   Inventory,
   INVENTORY_ITEM_SOURCE,
@@ -77,7 +78,9 @@ export class PackingWorksheetController extends VasWorksheetController {
       'worksheetDetails.targetInventory'
     ])
 
-    if ([ORDER_INVENTORY_STATUS.PENDING_CANCEL, ORDER_INVENTORY_STATUS.CANCELLED].includes(worksheet?.releaseGood?.status)) {
+    if (
+      [ORDER_INVENTORY_STATUS.PENDING_CANCEL, ORDER_INVENTORY_STATUS.CANCELLED].includes(worksheet?.releaseGood?.status)
+    ) {
       throw new Error(`order status for ${worksheet.releaseGood.name}:${worksheet?.releaseGood?.status}`)
     }
 
@@ -169,6 +172,10 @@ export class PackingWorksheetController extends VasWorksheetController {
         break
     }
 
+    releaseGood.domain = this.domain
+
+    webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PackingStarted)
+
     return worksheet
   }
 
@@ -532,7 +539,10 @@ export class PackingWorksheetController extends VasWorksheetController {
 
     await this.trxMgr
       .getRepository(OrderPackage)
-      .update({ id: orderPackage.id }, { status: ORDER_STATUS.DONE, updater: this.user, updatedAt: new Date(), grossWeight: grossWeight })
+      .update(
+        { id: orderPackage.id },
+        { status: ORDER_STATUS.DONE, updater: this.user, updatedAt: new Date(), grossWeight: grossWeight }
+      )
 
     let releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
@@ -580,6 +590,9 @@ export class PackingWorksheetController extends VasWorksheetController {
       //     { trackingNo: `${releaseGood?.trackingNo ? releaseGood?.trackingNo.split(',').push(orderPackage.trackingNo).join(',') : orderPackage.trackingNo}` }
       //   )
       // }
+      releaseGood.domain = this.domain
+
+      webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PackingCompleted)
 
       return await this.completeWorksheet(worksheet, orderStatus)
     } else {

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

@@ -46,7 +46,7 @@ import {
   Tote,
   TOTE_STATUS
 } from '@things-factory/warehouse-base'
-
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { SellercraftController } from '../../controllers'
 import { ActiveWorksheetPickingView, Worksheet, WorksheetDetail } from '../../entities'
@@ -284,6 +284,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     releaseGood.updater = this.user
     this.updateRefOrder(releaseGood)
 
+    webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PickingStarted)
+
     worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [])
 
     // VAS will be activated after PICKING is completed
@@ -619,6 +621,10 @@ export class PickingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
     }
 
+    for (const releaseGood of releaseGoods) {
+      webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PickingStarted)
+    }
+
     return worksheet
   }
 
@@ -1665,6 +1671,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       }
     }
 
+    webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PickingCompleted)
+
     return await this.completeWorksheet(worksheet, orderStatus)
   }
 
@@ -1746,6 +1754,13 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
 
+    for (let releaseGood of releaseGoods) {
+      releaseGood.domain = this.domain
+      releaseGood.bizplace = worksheet.bizplace
+
+      webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.PickingCompleted)
+    }
+
     return worksheet
   }
 

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

@@ -1,13 +1,6 @@
-import {
-  In,
-  IsNull
-} from 'typeorm'
-
-import {
-  Product,
-  ProductBarcode,
-  ProductDetail
-} from '@things-factory/product-base'
+import { In, IsNull } from 'typeorm'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
+import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
 import {
   ORDER_INVENTORY_STATUS,
   ORDER_STATUS,
@@ -28,14 +21,8 @@ import {
   TOTE_STATUS
 } from '@things-factory/warehouse-base'
 
-import {
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE
-} from '../../constants'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../entities'
+import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
+import { Worksheet, WorksheetDetail } from '../../entities'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class SortingWorksheetController extends VasWorksheetController {
@@ -505,6 +492,14 @@ export class SortingWorksheetController extends VasWorksheetController {
     worksheet.updater = this.user
     worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
 
+    const releaseGoods: ReleaseGood[] = await this.trxMgr
+      .getRepository(ReleaseGood)
+      .find({ where: { id: In(releaseGoodIds) }, relations: ['domain', 'bizplace'] })
+
+    for (let releaseGood of releaseGoods) {
+      webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.LoadingStarted)
+    }
+
     return worksheet
   }
 

package/server/controllers/worksheet-controller.ts

@@ -1,25 +1,8 @@
-import {
-  EntityManager,
-  EntitySchema,
-  Equal,
-  FindOneOptions,
-  getRepository,
-  In,
-  Not
-} from 'typeorm'
-
-import {
-  Role,
-  User
-} from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getDomainUsers
-} from '@things-factory/biz-base'
-import {
-  Product,
-  ProductDetail
-} from '@things-factory/product-base'
+import { EntityManager, EntitySchema, Equal, FindOneOptions, getRepository, In, Not, getConnection } from 'typeorm'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
+import { Role, User } from '@things-factory/auth-base'
+import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
   DeliveryOrder,
@@ -45,14 +28,8 @@ import {
   Pallet
 } from '@things-factory/warehouse-base'
 
-import {
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE
-} from '../constants'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../entities'
+import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
+import { Worksheet, WorksheetDetail } from '../entities'
 import { WorksheetNoGenerator } from '../utils'
 
 export type ReferenceOrderType =
@@ -774,7 +751,6 @@ export class WorksheetController {
     changedWorksheetDetails: Partial<WorksheetDetail>[],
     tx?: EntityManager
   ): Promise<Worksheet> {
-
     const transaction = tx ? tx : this.trxMgr
 
     if (!worksheet.id || worksheetDetails.some((wsd: WorksheetDetail) => !wsd.id)) {
@@ -786,7 +762,6 @@ export class WorksheetController {
     worksheet.updater = this.user
     worksheet = await transaction.getRepository(Worksheet).save(worksheet)
 
-
     worksheetDetails = this.renewWorksheetDetails(worksheetDetails, changedWorksheetDetails, 'name', {
       status: WORKSHEET_STATUS.EXECUTING,
       updater: this.user
@@ -886,6 +861,10 @@ export class WorksheetController {
       refOrder.status = updatedRefOrderStatus
       refOrder.updater = this.user
       await this.updateRefOrder(refOrder)
+
+      if (!(worksheetType === WORKSHEET_TYPE.PUTAWAY) && updatedRefOrderStatus === 'DONE') {
+        webhookHandler(refOrder, refOrder.bizplace, WebhookEvents.ReleaseOrderCompleted)
+      }
     }
 
     return worksheet
@@ -1029,7 +1008,16 @@ export class WorksheetController {
       null
     if (!refOrder) {
       const wsWithRefOrd: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne(worksheet.id, {
-        relations: ['arrivalNotice', 'releaseGood', 'vasOrder', 'inventoryCheck', 'returnOrder', 'replenishment']
+        relations: [
+          'arrivalNotice',
+          'releaseGood',
+          'releaseGood.domain',
+          'releaseGood.bizplace',
+          'vasOrder',
+          'inventoryCheck',
+          'returnOrder',
+          'replenishment'
+        ]
       })
 
       refOrder =

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

@@ -1,34 +1,14 @@
-import {
-  EntityManager,
-  getManager,
-  In
-} from 'typeorm'
-
-import {
-  ApplicationType,
-  User
-} from '@things-factory/auth-base'
-import {
-  Bizplace,
-  ContactPoint,
-  getMyBizplace
-} from '@things-factory/biz-base'
+import { EntityManager, getManager, In } from 'typeorm'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 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 { 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 { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
@@ -52,10 +32,7 @@ import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
-import {
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE
-} from '../../../../constants'
+import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
 import {
   createOrderPackageAndItems,
   LoadingWorksheetController,
@@ -66,10 +43,7 @@ import {
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../../../entities'
+import { Worksheet, WorksheetDetail } from '../../../../entities'
 import { activateVas } from '../vas/activate-vas'
 
 export const completePickingResolver = {
@@ -174,9 +148,14 @@ export async function completePicking(
 
       let foundObsoleteInventories = await pickingWSCtrl.completePicking(releaseGood, worksheet, inventories)
 
-      const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
-        where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
-      }).then((setting: Setting) => { return parseInt(setting?.value || 0) })
+      const rtsTriggerLevel: Setting = await tx
+        .getRepository(Setting)
+        .findOne({
+          where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+        })
+        .then((setting: Setting) => {
+          return parseInt(setting?.value || 0)
+        })
 
       if (foundObsoleteInventories?.type) {
         const orderSource: string = releaseGood.source
@@ -228,7 +207,8 @@ export async function completePicking(
                   }
 
                   // Trigger if RTS Trigger Level Setting == 1
-                  if (rtsTriggerLevel == 1) await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
+                  if (rtsTriggerLevel == 1)
+                    await powrupController.initiateShipment(powrup, releaseGood, domain, user, txMgr)
                 })
               }
               // asynchronouly call to initiate powrup order shipment/ RTS
@@ -356,7 +336,7 @@ export async function completePicking(
 
           case ApplicationType.WEBSPERT:
             // Trigger Whole Order Process
-            WebspertController.triggerOrderProcesses(releaseGood, domain, user, (rtsTriggerLevel == 1))
+            WebspertController.triggerOrderProcesses(releaseGood, domain, user, rtsTriggerLevel == 1)
 
             break
           default:
@@ -460,6 +440,7 @@ export async function completePicking(
 
               const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
               await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
+              webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.LoadingStarted)
             } else {
               const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
               let loadingWorksheet: Worksheet = await loadingWSCtrl.updateLoadingWorksheet(

package/server/graphql/resolvers/worksheet/proceed-extra-products.ts

@@ -87,14 +87,14 @@ export const proceedExtraProductsResolver = {
             packingType: selectedOrderProduct?.adjustedPackingType
               ? selectedOrderProduct.adjustedPackingType
               : selectedOrderProduct.packingType,
-            packQty: selectedOrderProduct?.adjustedPackQty
+            packQty: selectedOrderProduct?.adjustedPackQty != null 
               ? selectedOrderProduct.adjustedPackQty
               : selectedOrderProduct.packQty,
             uom: selectedOrderProduct?.adjustedUom ? selectedOrderProduct.adjustedUom : selectedOrderProduct.uom,
             uomValue: selectedOrderProduct?.adjustedUomValue
               ? selectedOrderProduct.adjustedUomValue
               : selectedOrderProduct.uomValue,
-            totalUomValue: selectedOrderProduct?.adjustedTotalUomValue
+            totalUomValue: (selectedOrderProduct?.adjustedTotalUomValue || selectedOrderProduct?.adjustedTotalUomValue === '')
               ? selectedOrderProduct.adjustedTotalUomValue
               : selectedOrderProduct.totalUomValue,
             palletQty: selectedOrderProduct?.adjustedPalletQty

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

@@ -1,4 +1,4 @@
-import { EntityManager, In } from 'typeorm'
+import { EntityManager, In, getConnection } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -6,11 +6,11 @@ import { Account } from '@things-factory/integration-accounting'
 import { ArrivalNotice, generateGoodsReceivalNote } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
-
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import { WORKSHEET_STATUS } from '../../../../constants'
 import { PutawayWorksheetController, UnloadingWorksheetController } from '../../../../controllers'
 import { XilnexController } from '../../../../controllers/pos'
-import { Worksheet, WorksheetDetail } from '../../../../entities' 
+import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingResolver = {
   async completeUnloading(_: any, { arrivalNoticeNo, worksheetDetails }, context: any) {
@@ -36,7 +36,11 @@ export const completeUnloadingResolver = {
     let putawayWorksheet: Worksheet
 
     const inventories: Inventory[] = await tx.getRepository(Inventory).find({
-      where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) },
+      where: {
+        domain,
+        refOrderId: arrivalNotice.id,
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
+      },
       relations: ['productDetail', 'product', 'creator']
     })
 
@@ -49,7 +53,12 @@ export const completeUnloadingResolver = {
     }
 
     const bizplaceId: Bizplace = arrivalNotice.bizplace.id
-    await generateGoodsReceivalNote({ refNo: arrivalNoticeNo, customer: bizplaceId }, domain, user, tx)
+    const goodReceiveNote = await generateGoodsReceivalNote(
+      { refNo: arrivalNoticeNo, customer: bizplaceId },
+      domain,
+      user,
+      tx
+    )
 
     const customerDomain: Domain = arrivalNotice.bizplace.domain
     const xilnex: Account = await tx
@@ -68,6 +77,8 @@ export const completeUnloadingResolver = {
       url: context.header.referer,
       data: { url: context.header.referer }
     })
+
+    webhookHandler(goodReceiveNote, goodReceiveNote.bizplace, WebhookEvents.GrnCreated)
   }
 }