@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

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

@@ -1,16 +1,16 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
 import { fetchExecutingBatchWorksheet } from '../../../utils'
 
 export const sortingWorksheetResolver = {
-  async sortingWorksheet(_: any, { releaseGoodNo, taskNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async sortingWorksheet(_: any, { releaseGoodNo, taskNo }, context: ResolverContext) {
+    const { domain } = context.state
     const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
-      where: { domain, name: releaseGoodNo, status: ORDER_STATUS.SORTING },
+      where: { domain: { id: domain.id }, name: releaseGoodNo, status: ORDER_STATUS.SORTING },
       relations: ['bizplace', 'bizplace.domain']
     })
     if (!releaseGood) throw new Error(`Couldn't find sorting worksheet by order no (${releaseGoodNo})`)

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

@@ -1,26 +1,24 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { ORDER_PRODUCT_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { OrderInventory, ORDER_PRODUCT_STATUS } from '@things-factory/sales-base'
 import {
   Inventory,
-  InventoryHistory,
-  InventoryNoGenerator,
   INVENTORY_STATUS,
-  INVENTORY_TRANSACTION_TYPE
+  INVENTORY_TRANSACTION_TYPE,
+  InventoryHistory,
+  InventoryNoGenerator
 } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const transfer = {
-  async transfer(_: any, { palletId, toPalletId, qty }, context: any) {
-    const {
-      tx,
-      domain,
-      bizplace,
-      user
-    }: { tx: EntityManager; domain: Domain; bizplace: Bizplace; user: User } = context.state
+  async transfer(_: any, { palletId, toPalletId, qty }, context: ResolverContext) {
+    const { tx, domain, bizplace, user }: { tx: EntityManager; domain: Domain; bizplace?: Bizplace; user: User } =
+      context.state
 
     // 1. get to inventory
     let toInventory: Inventory = await tx.getRepository(Inventory).findOne({

package/server/graphql/resolvers/worksheet/unloaded-inventories-by-reusable-pallet.ts

@@ -1,16 +1,22 @@
+import { In } from 'typeorm'
+
 import { ArrivalNotice, Bizplace } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, Pallet } from '@things-factory/warehouse-base'
-import { getRepository, In } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { WorksheetDetail } from '../../../entities'
 
 export const unloadedInventoriesByReusablePallet = {
-  async unloadedInventoriesByReusablePallet(_: any, { reusablePalletId, worksheetDetailName }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async unloadedInventoriesByReusablePallet(
+    _: any,
+    { reusablePalletId, worksheetDetailName },
+    context: ResolverContext
+  ) {
+    const { domain } = context.state
     const foundWorksheetDetail: WorksheetDetail = await getRepository(WorksheetDetail).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: worksheetDetailName,
         type: WORKSHEET_TYPE.UNLOADING,
         status: In([WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED])
@@ -24,7 +30,7 @@ export const unloadedInventoriesByReusablePallet = {
 
     foundReusablePallet = await getRepository(Pallet).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: reusablePalletId
       },
       relations: ['domain']
@@ -34,7 +40,7 @@ export const unloadedInventoriesByReusablePallet = {
     let customerBizplace: Bizplace = foundWorksheetDetail.bizplace
     return await getRepository(Inventory).find({
       where: {
-        domain,
+        domain: { id: domain.id },
         bizplace: customerBizplace,
         batchId: foundWorksheetDetail.targetProduct.batchId,
         refOrderId: arrivalNotice.id,

package/server/graphql/resolvers/worksheet/unloaded-inventories.ts

@@ -1,18 +1,18 @@
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { ArrivalNotice, Bizplace, ReturnOrder } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { getRepository } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { WorksheetDetail } from '../../../entities'
 
 export const unloadedInventories = {
-  async unloadedInventories(_: any, { worksheetDetailNames }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async unloadedInventories(_: any, { worksheetDetailNames }, context: ResolverContext) {
+    const { domain } = context.state
     const foundWorksheetDetails: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
       where: {
-        domain,
+        domain: { id: domain.id },
         name: In(worksheetDetailNames),
         type: In([WORKSHEET_TYPE.UNLOADING, WORKSHEET_TYPE.UNLOADING_RETURN]),
         status: In([WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED])
@@ -36,8 +36,8 @@ export const unloadedInventories = {
     if (arrivalNotice) {
       let foundInv = await getRepository(Inventory).find({
         where: {
-          domain,
-          bizplace: customerBizplace,
+          domain: { id: domain.id },
+          bizplace: { id: customerBizplace.id },
           refOrderId: arrivalNotice.id,
           batchId: In(foundWorksheetDetails.map(wsd => wsd.targetProduct.batchId)),
           location: In(foundWorksheetDetails.map(wsd => wsd.worksheet.bufferLocation.id)),
@@ -62,8 +62,8 @@ export const unloadedInventories = {
     if (returnOrder) {
       return await getRepository(Inventory).find({
         where: {
-          domain,
-          bizplace: customerBizplace,
+          domain: { id: domain.id },
+          bizplace: { id: customerBizplace.id },
           refOrderId: returnOrder.id,
           batchId: In(foundWorksheetDetails.map(wsd => wsd.targetInventory.batchId)),
           location: In(foundWorksheetDetails.map(wsd => wsd.worksheet.bufferLocation.id)),

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

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { ArrivalNotice } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_TYPE } from '../../../../constants'
 import { UnloadingWorksheetController, UnloadingWorksheetDetail } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
@@ -9,12 +11,13 @@ import { activatePicking } from '../picking/activate-picking'
 import { worksheetByOrderNo } from '../worksheet-by-order-no'
 
 export const activateUnloadingResolver = {
-  async activateUnloading(_: any, { worksheetNo, unloadingWorksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async activateUnloading(_: any, { worksheetNo, unloadingWorksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     let unloadingWS: Worksheet = await activateUnloading(tx, domain, user, worksheetNo, unloadingWorksheetDetails)
 
     if (!unloadingWS?.arrivalNotice?.id) {
-      unloadingWS = await tx.getRepository(Worksheet).findOne(unloadingWS.id, {
+      unloadingWS = await tx.getRepository(Worksheet).findOne({
+        where: { id: unloadingWS.id },
         relations: ['arrivalNotice']
       })
     }
@@ -23,7 +26,8 @@ export const activateUnloadingResolver = {
     const crossDocking: boolean = arrivalNotice.crossDocking
 
     if (crossDocking) {
-      arrivalNotice = await tx.getRepository(ArrivalNotice).findOne(arrivalNotice.id, {
+      arrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+        where: { id: arrivalNotice.id },
         relations: ['releaseGood']
       })
       const releaseGood = arrivalNotice.releaseGood

package/server/graphql/resolvers/worksheet/unloading/complete-product-scan-unload.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const completeProductScanUnloadResolver = {
-  async completeProductScanUnload(_: any, { worksheetDetailName, inventory }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeProductScanUnload(_: any, { worksheetDetailName, inventory }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeProductScanUnload(tx, domain, user, worksheetDetailName, inventory)
   }
 }

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

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 import { WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingPartiallyResolver = {
-  async completeUnloadingPartially(_: any, { arrivalNoticeNo, worksheetDetail }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeUnloadingPartially(_: any, { arrivalNoticeNo, worksheetDetail }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeUnloadingPartially(tx, domain, user, arrivalNoticeNo, worksheetDetail)
   }
 }

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

@@ -11,12 +11,12 @@ import { PutawayWorksheetController, UnloadingWorksheetController } from '../../
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingResolver = {
-  async completeUnloading(_: any, { arrivalNoticeNo, worksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeUnloading(_: any, { arrivalNoticeNo, worksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeUnloading(tx, domain, user, arrivalNoticeNo, worksheetDetails)
 
     const arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
-      where: { domain, name: arrivalNoticeNo },
+      where: { domain: { id: domain.id }, name: arrivalNoticeNo },
       relations: [
         'purchaseOrder',
         'bizplace',
@@ -34,7 +34,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: { id: domain.id },
+        refOrderId: arrivalNotice.id,
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
+      }
     })
 
     putawayWorksheet = await putawayWSCtrl.generatePutawayWorksheet(arrivalNotice.name, inventories)

package/server/graphql/resolvers/worksheet/unloading/scan-product-unload.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const scanProductUnloadResolver = {
-  async scanProductUnload(_: any, { worksheetDetailName, productBarcode, inventory }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async scanProductUnload(_: any, { worksheetDetailName, productBarcode, inventory }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await scanProductUnload(tx, domain, user, worksheetDetailName, productBarcode, inventory)
   }
 }

package/server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts

@@ -7,8 +7,8 @@ import { Inventory } from '@things-factory/warehouse-base'
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const scanSerialNumberUnloadResolver = {
-  async scanSerialNumberUnload(_: any, { worksheetDetailName, serialNumber, inventory }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async scanSerialNumberUnload(_: any, { worksheetDetailName, serialNumber, inventory }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await scanSerialNumberUnload(tx, domain, user, worksheetDetailName, serialNumber, inventory)
   }
 }

package/server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.ts

@@ -6,8 +6,8 @@ import { Domain } from '@things-factory/shell'
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const undoSerialNumberUnloadResolver = {
-  async undoSerialNumberUnload(_: any, { worksheetDetailName, inventoryItemId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoSerialNumberUnload(_: any, { worksheetDetailName, inventoryItemId }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoSerialNumberUnload(tx, domain, user, worksheetDetailName, inventoryItemId)
   }
 }

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

@@ -6,8 +6,8 @@ import { Domain } from '@things-factory/shell'
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const undoUnloadingResolver = {
-  async undoUnloading(_: any, { orderType, orderNo, inventoryIds }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoUnloading(_: any, { orderType, orderNo, inventoryIds }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoUnloading(tx, domain, user, orderType, orderNo, inventoryIds)
   }
 }

package/server/graphql/resolvers/worksheet/unloading/unload.ts

@@ -1,14 +1,14 @@
-import { EntityManager } from 'typeorm';
+import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base';
-import { Domain } from '@things-factory/shell';
-import { Inventory } from '@things-factory/warehouse-base';
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
 
-import { UnloadingWorksheetController } from '../../../../controllers';
+import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const unloadResolver = {
-  async unload(_: any, { worksheetDetailName, inventory, productBarcode }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async unload(_: any, { worksheetDetailName, inventory, productBarcode }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     return await unload(tx, domain, user, worksheetDetailName, inventory, productBarcode)
   }
 }

package/server/graphql/resolvers/worksheet/unloading-return/activate-unloading-return.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingReturningWorksheetController, UnloadingReturningWorksheetDetail } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const activateUnloadingReturnResolver = {
-  async activateUnloadingReturn(_: any, { worksheetNo, unloadingReturnWorksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async activateUnloadingReturn(_: any, { worksheetNo, unloadingReturnWorksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     return await activateUnloadingReturn(tx, domain, user, worksheetNo, unloadingReturnWorksheetDetails)
   }
 }

package/server/graphql/resolvers/worksheet/unloading-return/complete-unload-return-partially.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingReturningWorksheetController } from '../../../../controllers'
 import { WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadReturnPartiallyResolver = {
-  async completeUnloadReturnPartially(_: any, { returnOrderNo, worksheetDetail }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeUnloadReturnPartially(_: any, { returnOrderNo, worksheetDetail }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeUnloadReturnPartially(tx, domain, user, returnOrderNo, worksheetDetail)
   }
 }

package/server/graphql/resolvers/worksheet/unloading-return/complete-unload-returning.ts

@@ -12,12 +12,12 @@ import { SellercraftController } from '../../../../controllers/ecommerce'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadReturningResolver = {
-  async completeUnloadReturning(_: any, { returnOrderNo, worksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeUnloadReturning(_: any, { returnOrderNo, worksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeUnloadReturning(tx, domain, user, returnOrderNo, worksheetDetails)
 
     const returnOrder: ReturnOrder = await tx.getRepository(ReturnOrder).findOne({
-      where: { domain, name: returnOrderNo },
+      where: { domain: { id: domain.id }, name: returnOrderNo },
       relations: [
         'bizplace',
         'bizplace.domain',
@@ -31,7 +31,7 @@ export const completeUnloadReturningResolver = {
     const customerDomain: Domain = returnOrder.bizplace.domain
     const sellercraft: Sellercraft = await tx
       .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+      .findOneBy({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
@@ -45,7 +45,11 @@ export const completeUnloadReturningResolver = {
       putawayWorksheet = await putawayWSCtrl.findWorksheetByRefOrder(returnOrderNo, WORKSHEET_TYPE.PUTAWAY_RETURN)
     } catch (e) {
       const inventories: Inventory[] = await tx.getRepository(Inventory).find({
-        where: { domain, refOrderId: returnOrder.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
+        where: {
+          domain: { id: domain.id },
+          refOrderId: returnOrder.id,
+          status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
+        }
       })
       putawayWorksheet = await putawayWSCtrl.generatePutawayReturnWorksheet(returnOrder.name, inventories)
     }

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

@@ -1,18 +1,16 @@
-import { getRepository } from 'typeorm'
-
 import { Bizplace } from '@things-factory/biz-base'
 import { OrderInventory, ReturnOrder } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
 export const unloadingReturnWorksheetResolver = {
-  async unloadingReturnWorksheet(_: any, { returnOrderNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async unloadingReturnWorksheet(_: any, { returnOrderNo }, context: ResolverContext) {
+    const { domain } = context.state
     const returnOrder: ReturnOrder = await getRepository(ReturnOrder).findOne({
-      where: { domain, name: returnOrderNo },
+      where: { domain: { id: domain.id }, name: returnOrderNo },
       relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
     })
     if (!returnOrder) throw new Error(`Return Order doesn't exist.`)

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

@@ -1,18 +1,16 @@
-import { getRepository } from 'typeorm'
-
 import { Bizplace } from '@things-factory/biz-base'
 import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
 export const unloadingWorksheetResolver = {
-  async unloadingWorksheet(_: any, { arrivalNoticeNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
+  async unloadingWorksheet(_: any, { arrivalNoticeNo }, context: ResolverContext) {
+    const { domain } = context.state
     const arrivalNotice: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
-      where: { domain, name: arrivalNoticeNo /*status: ORDER_STATUS.PROCESSING*/ },
+      where: { domain: { id: domain.id }, name: arrivalNoticeNo /*status: ORDER_STATUS.PROCESSING*/ },
       relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
     })
     if (!arrivalNotice) throw new Error(`Arrival notice doesn't exist.`)
@@ -39,7 +37,7 @@ export const unloadingWorksheetResolver = {
 
     const vasWorksheet: Worksheet = await getRepository(Worksheet).findOne({
       where: {
-        domain,
+        domain: { id: domain.id },
         arrivalNotice,
         type: WORKSHEET_TYPE.VAS
       },

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

@@ -1,12 +1,12 @@
-import { User } from '@things-factory/auth-base'
+import { In } from 'typeorm'
+
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager, In } from 'typeorm'
+
 import { Worksheet } from '../../../entities'
 
 export const updateWorksheet = {
-  async updateWorksheet(_: any, { id, patch }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async updateWorksheet(_: any, { id, patch }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
 
     const worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
       where: {

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

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { VasWorksheetController } from '../../../../controllers'
 import { WorksheetDetail } from '../../../../entities'
 
 export const activateVasResolver = {
-  async activateVas(_: any, { worksheetNo, vasWorksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async activateVas(_: any, { worksheetNo, vasWorksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     return await activateVas(tx, domain, user, worksheetNo, vasWorksheetDetails)
   }
 }

package/server/graphql/resolvers/worksheet/vas/assign-vas-inventories.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { VasWorksheetController } from '../../../../controllers'
 
 export const assignVasInventoriesResolver = {
-  async assignVasInventories(_: any, { worksheetDetailIds, inventories }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async assignVasInventories(_: any, { worksheetDetailIds, inventories }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await assignVasInventories(tx, domain, user, worksheetDetailIds, inventories)
   }
 }

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

@@ -1,14 +1,16 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { ArrivalNotice, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_TYPE } from '../../../../constants'
 import { LoadingWorksheetController, PutawayWorksheetController, VasWorksheetController } from '../../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeVasResolver = {
-  async completeVas(_: any, { orderNo, orderType, worksheetDetails }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async completeVas(_: any, { orderNo, orderType, worksheetDetails }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await completeVAS(tx, domain, user, orderNo, orderType, worksheetDetails)
   }
 }

package/server/graphql/resolvers/worksheet/vas/execute-vas.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { VasWorksheetController } from '../../../../controllers'
 import { WorksheetDetail } from '../../../../entities'
 
 export const executeVasResolver = {
-  async executeVas(_: any, { worksheetDetail, palletId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async executeVas(_: any, { worksheetDetail, palletId }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     /**
      * @description If pallet id param is exists.
      * Meaning, the VAS order have been requested with Arrival Notice or Release Order

package/server/graphql/resolvers/worksheet/vas/undo-vas-inventory.ts

@@ -1,11 +1,13 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { VasWorksheetController } from '../../../../controllers'
 
 export const undoVasInventoryResolver = {
-  async undoVasInventory(_: any, { worksheetDetailName, palletId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoVasInventory(_: any, { worksheetDetailName, palletId }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoVasInventory(tx, domain, user, worksheetDetailName, palletId)
   }
 }

package/server/graphql/resolvers/worksheet/vas/undo-vas.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { VasWorksheetController } from '../../../../controllers'
 import { WorksheetDetail } from '../../../../entities'
 
 export const undoVasResolver = {
-  async undoVas(_: any, { worksheetDetail }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+  async undoVas(_: any, { worksheetDetail }, context: ResolverContext) {
+    const { tx, domain, user } = context.state
     await undoVas(tx, domain, user, worksheetDetail)
   }
 }