@things-factory/worksheet-base 4.3.346 → 4.3.347

package/server/controllers/worksheet-controller.ts

@@ -1,8 +1,25 @@
-import { EntityManager, EntitySchema, Equal, FindOneOptions, getRepository, In, Not } from 'typeorm'
+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 {
+  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,
@@ -27,8 +44,14 @@ 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 =
@@ -742,8 +765,12 @@ export class WorksheetController {
   async activateWorksheet(
     worksheet: Worksheet,
     worksheetDetails: WorksheetDetail[],
-    changedWorksheetDetails: Partial<WorksheetDetail>[]
+    changedWorksheetDetails: Partial<WorksheetDetail>[],
+    tx?: EntityManager
   ): Promise<Worksheet> {
+
+    const transaction = tx ? tx : this.trxMgr
+
     if (!worksheet.id || worksheetDetails.some((wsd: WorksheetDetail) => !wsd.id)) {
       throw new Error(this.ERROR_MSG.UPDATE.ID_NOT_EXISTS)
     }
@@ -751,13 +778,14 @@ export class WorksheetController {
     worksheet.status = WORKSHEET_STATUS.EXECUTING
     worksheet.startedAt = new Date()
     worksheet.updater = this.user
-    worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
+    worksheet = await transaction.getRepository(Worksheet).save(worksheet)
+
 
     worksheetDetails = this.renewWorksheetDetails(worksheetDetails, changedWorksheetDetails, 'name', {
       status: WORKSHEET_STATUS.EXECUTING,
       updater: this.user
     })
-    worksheet.worksheetDetails = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
+    worksheet.worksheetDetails = await transaction.getRepository(WorksheetDetail).save(worksheetDetails)
 
     return worksheet
   }

package/server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
+
+import { WORKSHEET_TYPE } from '../../../../constants'
 import { Worksheet } from '../../../../entities'
 
 export const assignPickingWorkerResolver = {
@@ -25,9 +27,6 @@ export const assignPickingWorkerResolver = {
       },{type:WORKSHEET_TYPE.PICKING}]})
   
       if (!worksheet) throw new Error('failed to find target picking worksheet')
-      if (worksheet.status !== WORKSHEET_STATUS.DEACTIVATED)
-        throw new Error(`current status of worksheet is not able to assign worker`)
-  
       worksheet.assignee = assignee
       await tx.getRepository(Worksheet).save(worksheet)
 

package/server/graphql/resolvers/worksheet/picking/bulk-activate-picking.ts

@@ -0,0 +1,79 @@
+import { EntityManager } from 'typeorm'
+
+import {
+  ApplicationType,
+  User
+} from '@things-factory/auth-base'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { MarketplaceOrder } from '@things-factory/marketplace-base'
+import {
+  ORDER_STATUS,
+  ReleaseGood
+} from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import {
+  EcommerceController,
+  PickingWorksheetController
+} from '../../../../controllers'
+import { Worksheet } from '../../../../entities'
+
+export const activateBulkPickingResolver = {
+  async activateBulkPicking(_: any, { worksheetNo }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+
+    return await activateBulkPicking(tx, domain, user, worksheetNo)
+  }
+}
+
+export async function activateBulkPicking(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  worksheetNo: string[]
+): Promise<Worksheet[]> {
+  const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+  const worksheets = await worksheetController.activateBulkPicking(worksheetNo)
+
+  for (const worksheet of worksheets) {
+    const companyDomain: Domain = worksheet?.bizplace.company.domain
+    let releaseGood: ReleaseGood = worksheet.releaseGood
+    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 (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.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
+    }
+  }
+  return worksheets
+}

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

@@ -2,22 +2,24 @@ import { activateBatchPickingResolver } from './activate-batch-picking'
 import { activatePickingResolver } from './activate-picking'
 import { assignPickingInventoriesResolver } from './assign-picking-inventories'
 import { assignPickingWorkerResolver } from './assign-picking-worker'
-import { fetchAndAssignPickingTaskResolver } from './fetch-and-assign-picking-task'
 import { batchPickingResolver } from './batch-picking'
+import { activateBulkPickingResolver } from './bulk-activate-picking'
 import { completeBatchPickingResolver } from './complete-batch-picking'
 import { completePickingResolver } from './complete-picking'
+import { fetchAndAssignPickingTaskResolver } from './fetch-and-assign-picking-task'
 import { pickingResolver } from './picking'
-import { scanProductPickingResolver } from './scan-product-picking'
+import { replenishmentPickingResolver } from './replenishment-picking'
 import { scanProductBatchPickingResolver } from './scan-product-batch-picking'
+import { scanProductPickingResolver } from './scan-product-picking'
+import { sealToteResolver } from './seal-tote'
 import { undoPickingAssigmentResolver } from './undo-picking-assignment'
 import { undoSerialNumberPickingResolver } from './undo-serial-number-picking'
-import { sealToteResolver } from './seal-tote'
-import { replenishmentPickingResolver } from './replenishment-picking'
 
 export const Mutations = {
   ...assignPickingInventoriesResolver,
   ...undoPickingAssigmentResolver,
   ...activatePickingResolver,
+  ...activateBulkPickingResolver,
   ...activateBatchPickingResolver,
   ...pickingResolver,
   ...scanProductPickingResolver,
@@ -29,5 +31,5 @@ export const Mutations = {
   ...fetchAndAssignPickingTaskResolver,
   ...undoSerialNumberPickingResolver,
   ...sealToteResolver,
-  ...replenishmentPickingResolver
+  ...replenishmentPickingResolver,
 }

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

@@ -169,6 +169,10 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  activateBulkPicking ( 
+    worksheetNo: [String!]!
+  ): [Worksheet] @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   activatePickingReplenishment (
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction