@things-factory/worksheet-base 3.8.1 → 3.8.5

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

@@ -17,8 +17,7 @@ import {
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
   Location,
-  LOCATION_TYPE,
-  LOCATION_STATUS
+  LOCATION_TYPE
 } from '@things-factory/warehouse-base'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -191,7 +190,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (vasWorksheet) {
         await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
       }
-    } catch (e) { }
+    } catch (e) {}
 
     const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
@@ -367,19 +366,17 @@ export class PickingWorksheetController extends VasWorksheetController {
     await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetailIds)
     await this.trxMgr.getRepository(OrderInventory).delete(targetInventoryIds)
 
-    await this.trxMgr
-      .getRepository(OrderInventory)
-      .update(
-        {
-          refWorksheetId: worksheet.id,
-          batchId,
-          product: { id: productId },
-          packingType,
-          packingSize,
-          status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
-        },
-        { status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
-      )
+    await this.trxMgr.getRepository(OrderInventory).update(
+      {
+        refWorksheetId: worksheet.id,
+        batchId,
+        product: { id: productId },
+        packingType,
+        packingSize,
+        status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
+      },
+      { status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
+    )
   }
 
   async scanProductPicking(
@@ -412,16 +409,14 @@ export class PickingWorksheetController extends VasWorksheetController {
       const product: Product = targetInventory.product
       let inventory: Inventory = targetInventory.inventory
 
-      //validation to prevent duplicated picking      
+      //validation to prevent duplicated picking
       let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
         where: { domain: this.domain, id: targetInventory.id, status: ORDER_INVENTORY_STATUS.PICKING }
       })
-      if (!oiValidate)
-        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
+      if (!oiValidate) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
       //validation to prevent over release
-      if (inventory.qty <= 0)
-        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+      if (inventory.qty <= 0) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
       if (inventory.cartonId !== cartonId)
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId))
@@ -461,16 +456,17 @@ export class PickingWorksheetController extends VasWorksheetController {
       }
 
       if (product?.isRequireSerialNumberScanning) {
-        if ((!serialNumber || serialNumber == ''))
+        if (!serialNumber || serialNumber == '')
           throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
 
         if (serialNumber) {
-          targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...(JSON.parse(targetInventory.serialNumber)), serialNumber] : [serialNumber])
+          targetInventory.serialNumber = JSON.stringify(
+            targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]
+          )
         }
       }
 
       await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
-
     } catch (error) {
       throw error
     }
@@ -495,7 +491,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.releaseGood',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
-          'targetInventory.product',
+          'targetInventory.product'
         ]
       )
 
@@ -504,27 +500,26 @@ export class PickingWorksheetController extends VasWorksheetController {
       const product: Product = targetInventory.product
       let inventory: Inventory = targetInventory.inventory
 
-      //validation to prevent duplicated picking      
+      //validation to prevent duplicated picking
       let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
         where: { domain: this.domain, id: targetInventory.id, status: ORDER_INVENTORY_STATUS.PICKING }
       })
-      if (!oiValidate)
-        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
+      if (!oiValidate) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
       //validation to prevent over release
-      if (inventory.qty <= 0)
-        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+      if (inventory.qty <= 0) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
       if (inventory.palletId !== palletId)
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Pallet ID', palletId, inventory.palletId))
 
-
       if (product?.isRequireSerialNumberScanning) {
-        if ((!serialNumber || serialNumber == ''))
+        if (!serialNumber || serialNumber == '')
           throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
 
         if (serialNumber) {
-          targetInventory.serialNumber = JSON.stringify(targetInventory.serialNumber ? [...(JSON.parse(targetInventory.serialNumber)), serialNumber] : [serialNumber])
+          targetInventory.serialNumber = JSON.stringify(
+            targetInventory.serialNumber ? [...JSON.parse(targetInventory.serialNumber), serialNumber] : [serialNumber]
+          )
         }
       }
 
@@ -828,16 +823,16 @@ export class PickingWorksheetController extends VasWorksheetController {
       status: ORDER_STATUS.PICKING
     })
 
-    const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
+    let worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory'
     ])
-    this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
+    await this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
     let orderStatus: string
     if (releaseGood?.packingOption) {
       orderStatus = ORDER_STATUS.READY_TO_PACK
-    } else if (!releaseGood?.courierOption && !releaseGood?.packingOption) {
+    } else {
       orderStatus = ORDER_STATUS.LOADING
     }
 
@@ -938,7 +933,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         name: 'enable-bin-picking'
       }
     })
-    if (binPickingSetting != undefined && (binPickingSetting.value).toLowerCase() == 'true') {
+    if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
       if (binLocation) {
         const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
           where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }
@@ -995,4 +990,3 @@ export class PickingWorksheetController extends VasWorksheetController {
     return orderInventory
   }
 }
-

package/server/controllers/worksheet-controller.ts

@@ -387,7 +387,7 @@ export class WorksheetController {
     type: string,
     additionalProps: Partial<Worksheet> = {}
   ): Promise<Worksheet> {
-    let refOrderType: string = this.getRefOrderField(refOrder)
+    let refOrderType: string = await this.getRefOrderField(refOrder)
     const bizplace: Bizplace = await this.extractBizplaceFromRefOrder(refOrder)
 
     const worksheet: Partial<Worksheet> = {
@@ -676,7 +676,7 @@ export class WorksheetController {
       'worksheetDetails.targetVas'
     ])
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
+    let worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
 
     worksheetDetails
       .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
@@ -687,7 +687,7 @@ export class WorksheetController {
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
 
     if (worksheetType === WORKSHEET_TYPE.UNLOADING) {
-      const targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetProduct: OrderProduct = wsd.targetProduct
         targetProduct.status = ORDER_PRODUCT_STATUS.TERMINATED
         targetProduct.updater = this.user
@@ -696,7 +696,7 @@ export class WorksheetController {
 
       await this.updateOrderTargets(targetProducts)
     } else if (worksheetType === WORKSHEET_TYPE.VAS) {
-      const targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetVAS: OrderVas = wsd.targetVas
         targetVAS.status = ORDER_VAS_STATUS.TERMINATED
         targetVAS.updater = this.user
@@ -712,7 +712,7 @@ export class WorksheetController {
       worksheetType === WORKSHEET_TYPE.WAREHOUSE_RETURN ||
       worksheetType === WORKSHEET_TYPE.UNLOADING_RETURN
     ) {
-      const targetInventories: OrderInventory[] = worksheet.worksheetDetails
+      let targetInventories: OrderInventory[] = worksheet.worksheetDetails
         .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
         .map((wsd: WorksheetDetail) => {
           let targetInventory: OrderInventory = wsd.targetInventory

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PickingWorksheetController } from '../../../../controllers/'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 

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

@@ -45,7 +45,7 @@ export async function completePicking(
   releaseGoodNo: string
 ): Promise<void> {
   const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+  let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
     relations: [
       'bizplace',
@@ -53,6 +53,7 @@ export async function completePicking(
       'bizplace.company',
       'bizplace.company.domain',
       'orderInventories',
+      'orderInventories.inventory',
       'orderInventories.product'
     ]
   })
@@ -84,7 +85,7 @@ export async function completePicking(
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+      releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
       await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
     } else {
       const companyDomain: Domain = releaseGood.bizplace.company.domain

package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts

@@ -1,6 +1,7 @@
 import { EntityManager, getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+import { ReleaseGood, OrderInventory } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -10,69 +11,79 @@ import { pickingWorksheet } from '../picking-worksheet'
 import { activatePicking } from './activate-picking'
 
 export const fetchAndAssignPickingTaskResolver = {
-  async fetchAndAssignPickingTask(_: any, {}, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
-    if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
-      throw new Error('Target user is not belong to current domain')
+  async fetchAndAssignPickingTask(_: any, { }, context: any) {
+    try {
+      const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+      const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
+      if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
+        throw new Error('Target user is not belong to current domain')
 
-    if (!assignee) throw new Error('failed to find target user')
+      if (!assignee) throw new Error('failed to find target user')
 
-    let worksheet: Worksheet
-    worksheet = await tx.getRepository(Worksheet).findOne({
-      relations: ['releaseGood'],
-      where: [
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.EXECUTING,
-          assignee: assignee
-        },
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.DEACTIVATED,
-          assignee: assignee
-        }
-      ],
-      order: {
-        name: 'ASC'
-      }
-    })
+      let worksheet: any
+      let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+        .select('ws.id')
+        .addSelect('ws.name')
+        .addSelect('ws.status')
+        .addSelect('ws.release_good_id')
+        .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, assignee: assignee.id, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+        .andWhere(qb => {
+          const subQuery = qb
+            .subQuery()
+            .select('COUNT(*) AS totalPS')
+            .from(OrderInventory, 'OrderInventory')
+            .where('OrderInventory.release_good_id = ws.release_good_id')
+            .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+            .groupBy('OrderInventory.release_good_id')
+            .having('COUNT(*) > 0')
+            .getQuery()
+          return 'NOT EXISTS ' + subQuery
+        })
 
-    if (!worksheet) {
-      worksheet = await tx.getRepository(Worksheet).findOne({
-        relations: ['releaseGood'],
-        where: [
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.EXECUTING,
-            assignee: null
-          },
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.DEACTIVATED,
-            assignee: null
-          }
-        ]
-      })
+      worksheet = await worksheetQb.getRawOne();
 
-      await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
-    }
+      if (!worksheet) {
+        let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+          .select('ws.id')
+          .addSelect('ws.name')
+          .addSelect('ws.status')
+          .addSelect('ws.release_good_id')
+          .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+          .andWhere(qb => {
+            const subQuery = qb
+              .subQuery()
+              .select('COUNT(*) AS totalPS')
+              .from(OrderInventory, 'OrderInventory')
+              .where('OrderInventory.release_good_id = ws.release_good_id')
+              .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+              .groupBy('OrderInventory.release_good_id')
+              .having('COUNT(*) > 0')
+              .getQuery()
+            return 'NOT EXISTS ' + subQuery
+          })
+
+        worksheet = await worksheetQb.getRawOne();
+
+        if (!worksheet) throw new Error('no suitable worksheet found')
+        await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
+      }
 
-    if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.name)
+      if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.ws_name)
 
-    const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-picking-product' }
-    })
+      const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
+        where: { domain, name: 'rule-for-picking-product' }
+      })
 
-    const sortingRule = JSON.parse(locationSortingRules.value)
-    const locationSortingRule = Object.keys(sortingRule).map(field => {
-      return { name: field, desc: sortingRule[field] === 'DESC' }
-    })
+      const sortingRule = JSON.parse(locationSortingRules.value)
+      const locationSortingRule = Object.keys(sortingRule).map(field => {
+        return { name: field, desc: sortingRule[field] === 'DESC' }
+      })
 
-    return await pickingWorksheet(domain, worksheet.releaseGood.name, locationSortingRule, tx)
+      const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne(worksheet.release_good_id)
+
+      return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)
+    } catch (error) {
+      throw error
+    }
   }
 }