@things-factory/worksheet-base 4.0.0-y.0 → 4.0.0

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -1,21 +1,29 @@
+import { Brackets, Equal, In, Not, SelectQueryBuilder } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
 import {
   generateCycleCount,
   InventoryCheck,
-  OrderInventory,
-  OrderNoGenerator,
   ORDER_INVENTORY_STATUS,
-  ORDER_STATUS
+  ORDER_STATUS,
+  OrderInventory,
+  OrderNoGenerator
 } from '@things-factory/sales-base'
-import { Inventory, Location, INVENTORY_STATUS } from '@things-factory/warehouse-base'
-import { Brackets, Equal, Not, SelectQueryBuilder, In } from 'typeorm'
+import { Inventory, INVENTORY_STATUS, Location } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { WorksheetController } from '../worksheet-controller'
 import { WorksheetNoGenerator } from '../../utils'
+import { WorksheetController } from '../worksheet-controller'
 
 export class CycleCountWorksheetController extends WorksheetController {
-  async generateCycleCountWorksheet(executionDate: string, customerId: string, orderInventoryIds: string[] = [], limit: number): Promise<Worksheet> {
+  async generateCycleCountWorksheet(
+    executionDate: string,
+    customerId: string,
+    orderInventoryIds: string[] = [],
+    orderInventory: OrderInventory[],
+    limit: number
+  ): Promise<Worksheet> {
     // Find out warehouse and customer bizplace
     const customerBizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOne(customerId)
     let foundCycleCountWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
@@ -27,11 +35,13 @@ export class CycleCountWorksheetController extends WorksheetController {
       },
       relations: ['worksheetDetails', 'worksheetDetails.targetInventory', 'inventoryCheck']
     })
-  
+
     // Create second round of cycle count with specified order inventories
     if (orderInventoryIds.length) {
       // Update status of target inventories (NOT_TALLY => INSPECTING)
-      let targetInventories: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).findByIds(orderInventoryIds)
+      let targetInventories: OrderInventory[] = await this.trxMgr
+        .getRepository(OrderInventory)
+        .findByIds(orderInventoryIds)
       targetInventories.forEach((targetInventory: OrderInventory) => {
         targetInventory.status = ORDER_INVENTORY_STATUS.INSPECTING
         targetInventory.updater = this.user
@@ -68,7 +78,13 @@ export class CycleCountWorksheetController extends WorksheetController {
         throw new Error(`Unfinished cycle count worksheet exists.`)
       }
 
-      const cycleCount: InventoryCheck = await generateCycleCount(this.trxMgr, this.domain, this.user, executionDate, customerId)
+      const cycleCount: InventoryCheck = await generateCycleCount(
+        this.trxMgr,
+        this.domain,
+        this.user,
+        executionDate,
+        customerId
+      )
 
       // Find out inventories which is target for cycle counting
       const qb: SelectQueryBuilder<Inventory> = this.trxMgr.getRepository(Inventory).createQueryBuilder('INV')
@@ -83,11 +99,42 @@ export class CycleCountWorksheetController extends WorksheetController {
           })
         )
 
+      if (orderInventory && orderInventory.length > 0) {
+        let keyval = {
+          batchId: 'batch_id',
+          batchIdRef: 'batch_id_ref',
+          packingType: 'packing_type',
+          packingSize: 'packing_size',
+          productId: 'product_id'
+        }
+
+        qb.andWhere(
+          new Brackets(qb => {
+            orderInventory.forEach((itm, idx) => {
+              // sample itm value
+              // batchId: 'WO00019730', batchIdRef: null, packingType: 'CARBOY', packingSize: 1, productId: '1d679587-c713-42d6-bd0a-74e587e39cc7'
+              qb.orWhere(
+                new Brackets(qb2 => {
+                  let first = true
+                  for (var prop in itm) {
+                    if (first) {
+                      first = false
+                      qb2.where(`INV.${keyval[prop]} ${itm[prop] == null ? 'is null' : " = '" + itm[prop] + "'"}`)
+                    } else {
+                      qb2.andWhere(`INV.${keyval[prop]} ${itm[prop] == null ? 'is null' : " = '" + itm[prop] + "'"}`)
+                    }
+                  }
+                })
+              )
+            })
+          })
+        )
+      } else {
         if (limit > 0) {
-          qb.orderBy("RANDOM()")
-            .limit(limit)
+          qb.orderBy('RANDOM()').limit(limit)
         }
-        
+      }
+
       let inventories: Inventory[] = await qb.getMany()
 
       if (!inventories.length) {
@@ -234,7 +281,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     await this.updateOrderTargets([targetInventory])
 
     //If all tally, remove lockedQty, lockedWeight, lockedUomValue
-    if(!isChanged) {
+    if (!isChanged) {
       inventory.lockedQty = 0
       inventory.lockedWeight = 0
       inventory.lockedUomValue = 0
@@ -256,9 +303,9 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventory.inspectedUomValue = null
     targetInventory.inspectedLocation = null
     targetInventory.status =
-    targetInventory.status === ORDER_INVENTORY_STATUS.RELOCATED
-      ? ORDER_INVENTORY_STATUS.MISSING
-      : ORDER_INVENTORY_STATUS.INSPECTING
+      targetInventory.status === ORDER_INVENTORY_STATUS.RELOCATED
+        ? ORDER_INVENTORY_STATUS.MISSING
+        : ORDER_INVENTORY_STATUS.INSPECTING
     targetInventory.updater = this.user
     await this.updateOrderTargets([targetInventory])
 
@@ -285,15 +332,22 @@ export class CycleCountWorksheetController extends WorksheetController {
     worksheetDetail.status = WORKSHEET_STATUS.NOT_TALLY
     worksheetDetail.updater = this.user
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-  
+
     targetInventory.status = ORDER_INVENTORY_STATUS.MISSING
     targetInventory.updater = this.user
-    await this.updateOrderTargets([targetInventory])  
+    await this.updateOrderTargets([targetInventory])
   }
 
-  async addExtraPallet(cycleCountNo: string, palletId: string, inspectedBatchNo: string, inspectedQty: number, inspectedUomValue: number, locationName: string): Promise<void> {
+  async addExtraPallet(
+    cycleCountNo: string,
+    palletId: string,
+    inspectedBatchNo: string,
+    inspectedQty: number,
+    inspectedUomValue: number,
+    locationName: string
+  ): Promise<void> {
     const inventoryCheck: InventoryCheck = await this.findRefOrder(
-      InventoryCheck, 
+      InventoryCheck,
       {
         name: cycleCountNo,
         status: ORDER_STATUS.INSPECTING
@@ -304,26 +358,31 @@ export class CycleCountWorksheetController extends WorksheetController {
     const bizplace: Bizplace = inventoryCheck.bizplace
     const qb: SelectQueryBuilder<Inventory> = this.trxMgr.getRepository(Inventory).createQueryBuilder('INV')
     let inventory: Inventory = await qb
-    .where('INV.domain = :domainId', { domainId: this.domain.id })
-    .andWhere('INV.bizplace = :bizplaceId', { bizplaceId: bizplace.id })
-    .andWhere('INV.palletId = :palletId', { palletId })
-    .andWhere('INV.status = :status', { status: INVENTORY_STATUS.STORED })
-    .andWhere(
-      new Brackets(qb => {
-        qb.where('INV.lockedQty ISNULL')
-        qb.orWhere('INV.lockedQty = 0')
-      })
-    )
-    .getOne()
+      .where('INV.domain = :domainId', { domainId: this.domain.id })
+      .andWhere('INV.bizplace = :bizplaceId', { bizplaceId: bizplace.id })
+      .andWhere('INV.palletId = :palletId', { palletId })
+      .andWhere('INV.status = :status', { status: INVENTORY_STATUS.STORED })
+      .andWhere(
+        new Brackets(qb => {
+          qb.where('INV.lockedQty ISNULL')
+          qb.orWhere('INV.lockedQty = 0')
+        })
+      )
+      .getOne()
     if (!inventory) throw new Error('Failed to find inventory')
 
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
-      where: { domain: this.domain, type: WORKSHEET_TYPE.CYCLE_COUNT, status: WORKSHEET_STATUS.EXECUTING, inventoryCheck }
+      where: {
+        domain: this.domain,
+        type: WORKSHEET_TYPE.CYCLE_COUNT,
+        status: WORKSHEET_STATUS.EXECUTING,
+        inventoryCheck
+      }
     })
     const location: Location = await this.trxMgr.getRepository(Location).findOne({
       where: { domain: this.domain, name: locationName }
     })
-    
+
     let targetInventory: OrderInventory = new OrderInventory()
     targetInventory.domain = this.domain
     targetInventory.bizplace = bizplace
@@ -338,7 +397,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventory.inspectedLocation = location
     targetInventory.creator = this.user
     targetInventory.updater = this.user
-    await this.updateOrderTargets([targetInventory])  
+    await this.updateOrderTargets([targetInventory])
 
     let worksheetDetail: WorksheetDetail = new WorksheetDetail()
     worksheetDetail.domain = this.domain
@@ -353,34 +412,40 @@ export class CycleCountWorksheetController extends WorksheetController {
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
   }
 
-  async relocatePallet( worksheetDetailName: string, inspectedBatchNo: string, inspectedQty: number, inspectedUomValue: number, inspectedLocationName: string ): Promise<void> {
+  async relocatePallet(
+    worksheetDetailName: string,
+    inspectedBatchNo: string,
+    inspectedQty: number,
+    inspectedUomValue: number,
+    inspectedLocationName: string
+  ): Promise<void> {
     let worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
       where: { domain: this.domain, name: worksheetDetailName, type: WORKSHEET_TYPE.CYCLE_COUNT },
       relations: ['targetInventory', 'targetInventory.inventory', 'targetInventory.inventory.location']
     })
-    
+
     if (!worksheetDetail) throw new Error('Failed to find worksheet detail')
-    
+
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     const location: Location = targetInventory?.inventory?.location
     if (location.name === inspectedLocationName) throw new Error(`You can't relocate at same location`)
-  
+
     const inspectedLocation: Location = await this.trxMgr.getRepository(Location).findOne({
       where: { name: inspectedLocationName, domain: this.domain }
     })
-  
+
     worksheetDetail.status = WORKSHEET_STATUS.NOT_TALLY
     worksheetDetail.updater = this.user
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-  
+
     targetInventory.inspectedLocation = inspectedLocation
     targetInventory.inspectedBatchNo = inspectedBatchNo
     targetInventory.inspectedQty = inspectedQty
     targetInventory.inspectedWeight = 0
-    targetInventory.inspectedUomValue = inspectedUomValue    
+    targetInventory.inspectedUomValue = inspectedUomValue
     targetInventory.status = ORDER_INVENTORY_STATUS.RELOCATED
     targetInventory.updater = this.user
-    await this.updateOrderTargets([targetInventory])  
+    await this.updateOrderTargets([targetInventory])
   }
 
   async completeCycleCount(inventoryCheckNo: string): Promise<Worksheet> {

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

@@ -1,6 +1,7 @@
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { OrderInventory, ORDER_INVENTORY_STATUS, ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
+import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
@@ -18,6 +19,13 @@ export class PackingWorksheetController extends VasWorksheetController {
     )
     const orderInventories: OrderInventory[] = releaseGood.orderInventories
 
+    const existingPackingWorksheet: Worksheet = await this.trxMgr
+      .getRepository(Worksheet)
+      .findOne({
+        where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
+      })
+
+    if (existingPackingWorksheet) throw new Error('There is existing packing worksheet that has been generated')
     let worksheet: Worksheet = await this.createWorksheet(releaseGood, WORKSHEET_TYPE.PACKING)
 
     if (orderInventories.every((oi: OrderInventory) => oi.inventory?.id) || releaseGood.crossDocking) {
@@ -44,6 +52,8 @@ export class PackingWorksheetController extends VasWorksheetController {
   async activatePacking(worksheetNo: string): Promise<Worksheet> {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.PACKING, [
       'releaseGood',
+      'releaseGood.bizplace',
+      'releaseGood.bizplace.domain',
       'worksheetDetails',
       'worksheetDetails.targetInventory'
     ])
@@ -67,12 +77,14 @@ export class PackingWorksheetController extends VasWorksheetController {
     return worksheet
   }
 
-  async packing(worksheetDetailName: string, packedQty: number): Promise<void> {
+  async packing(worksheetDetailName: string, packedQty: number): Promise<WorksheetDetail> {
     let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
       worksheetDetailName,
       WORKSHEET_TYPE.PACKING,
       [
         'worksheet',
+        'worksheet.bizplace',
+        'worksheet.bizplace.domain',
         'targetInventory',
         'targetInventory.releaseGood',
         'targetInventory.inventory',
@@ -96,15 +108,18 @@ export class PackingWorksheetController extends VasWorksheetController {
 
     worksheetDetail.status = WORKSHEET_STATUS.DONE
     worksheetDetail.updater = this.user
-    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+    worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+    return worksheetDetail
   }
 
-  async scanProductPacking(worksheetDetailName: string, productBarcode: string): Promise<void> {
+  async scanProductPacking(worksheetDetailName: string, productBarcode: string): Promise<WorksheetDetail> {
     let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
       worksheetDetailName,
       WORKSHEET_TYPE.PACKING,
       [
         'worksheet',
+        'worksheet.bizplace',
+        'worksheet.bizplace.domain',
         'targetInventory',
         'targetInventory.releaseGood',
         'targetInventory.inventory',
@@ -147,6 +162,8 @@ export class PackingWorksheetController extends VasWorksheetController {
     } else {
       await this.trxMgr.getRepository(OrderInventory).save(targetInventory)
     }
+
+    return worksheetDetail
   }
 
   async completePacking(releaseGoodNo: string): Promise<Worksheet> {

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

@@ -1,27 +1,29 @@
+import { In } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { generateId } from '@things-factory/id-rule-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
   OrderInventory,
   OrderNoGenerator,
   OrderVas,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS,
   ReleaseGood
 } from '@things-factory/sales-base'
-import { generateId } from '@things-factory/id-rule-base'
 import { Setting } from '@things-factory/setting-base'
-import { In } from 'typeorm'
 import {
   Inventory,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
-  LOCATION_TYPE,
-  Location
+  Location,
+  LOCATION_TYPE
 } from '@things-factory/warehouse-base'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE, TASK_NUMBER_SETTING_KEY, TASK_NUMBER_RULE_TYPE } from '../../constants'
+
+import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { WorksheetNoGenerator } from '../../utils'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
   async generatePickingWorksheet(releaseGoodNo: string): Promise<Worksheet> {
@@ -157,7 +159,9 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.PICKING, [
       'releaseGood',
       'releaseGood.bizplace',
+      'domain',
       'bizplace',
+      'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain',
       'worksheetDetails',
@@ -203,8 +207,10 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.BATCH_PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory',
+      'worksheetDetails.targetInventory.releaseGood',
       'worksheetDetails.targetInventory.product',
       'bizplace',
+      'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain'
     ])
@@ -251,6 +257,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     batchId: string,
     productId: string,
     packingType: string,
+    packingSize: number,
     worksheetDetails: Partial<WorksheetDetail>[]
   ): Promise<void> {
     // 1. Remove prev worksheet details if it's exists
@@ -265,7 +272,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       worksheet.worksheetDetails,
       batchId,
       productId,
-      packingType
+      packingType,
+      packingSize
     )
     // Delete order inventories
     if (prevWorksheetDetails?.length) {
@@ -301,6 +309,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       newTargetInventory.batchId = batchId
       newTargetInventory.product = product
       newTargetInventory.packingType = packingType
+      newTargetInventory.packingSize = packingSize
       newTargetInventory.creator = this.user
       newTargetInventory.updater = this.user
       newTargetInventory = await this.trxMgr.getRepository(OrderInventory).save(newTargetInventory)
@@ -319,7 +328,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     worksheetNo: string,
     batchId: string,
     productId: string,
-    packingType: string
+    packingType: string,
+    packingSize: number
   ): Promise<void> {
     const worksheet: Worksheet = await this.findWorksheetByNo(worksheetNo, [
       'worksheetDetails',
@@ -333,6 +343,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       batchId,
       productId,
       packingType,
+      packingSize,
       ['targetInventory', 'targetInventory.inventory']
     )
 
@@ -363,6 +374,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           batchId,
           product: { id: productId },
           packingType,
+          packingSize,
           status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
         },
         { status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
@@ -849,6 +861,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       },
       relations: [
         'bizplace',
+        'bizplace.domain',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.releaseGood'
@@ -901,6 +914,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     standardBatchId: string,
     standardProductId: string,
     standardPackingType: string,
+    standardPackingSize: number,
     relations: string[] = ['targetInventory', 'targetInventory.product']
   ): Promise<WorksheetDetail[]> {
     for (let wsd of worksheetDetails) {
@@ -913,7 +927,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       (wsd: WorksheetDetail) =>
         wsd.targetInventory.batchId === standardBatchId &&
         wsd.targetInventory.product.id === standardProductId &&
-        wsd.targetInventory.packingType === standardPackingType
+        wsd.targetInventory.packingType === standardPackingType &&
+        wsd.targetInventory.packingSize === standardPackingSize
     )
 
     for (let wsd of worksheetDetails) {