@things-factory/worksheet-base 4.3.0-alpha.0 → 4.3.1

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

@@ -1,4 +1,4 @@
-import { Equal, In, Not } from 'typeorm'
+import { Equal, In, IsNull, Not } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
@@ -8,6 +8,10 @@ import {
   ORDER_STATUS,
   OrderInventory,
   OrderNoGenerator,
+  OrderProduct,
+  OrderTote,
+  OrderToteItem,
+  OrderToteSeal,
   OrderVas,
   ReleaseGood
 } from '@things-factory/sales-base'
@@ -20,7 +24,9 @@ import {
   InventoryItem,
   InventoryNoGenerator,
   Location,
-  LOCATION_TYPE
+  LOCATION_TYPE,
+  Tote,
+  TOTE_STATUS
 } from '@things-factory/warehouse-base'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -388,7 +394,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     productBarcode: string,
     cartonId: string,
     binLocation?: string,
-    serialNumber?: string
+    serialNumber?: string,
+    toteNo?: string
   ): Promise<OrderInventory> {
     try {
       let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
@@ -401,6 +408,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.releaseGood',
           'targetInventory.inventory',
           'targetInventory.product',
+          'targetInventory.orderProduct',
           'targetInventory.product.productDetails',
           'targetInventory.product.productDetails.product',
           'targetInventory.product.productDetails.childProductDetail'
@@ -409,8 +417,10 @@ export class PickingWorksheetController extends VasWorksheetController {
 
       const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
+      let targetProduct: OrderProduct = targetInventory.orderProduct
       const product: Product = targetInventory.product
       let inventory: Inventory = targetInventory.inventory
+      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
 
       //validation to prevent duplicated picking
       let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
@@ -512,6 +522,10 @@ export class PickingWorksheetController extends VasWorksheetController {
         }
       }
 
+      if (toteNo) {
+        await this.toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace)
+      }
+
       await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
     } catch (error) {
       throw error
@@ -525,7 +539,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     locationName: string,
     pickedQty: number,
     binLocation?: string,
-    serialNumber?: string
+    serialNumber?: string,
+    toteNo?: string
   ): Promise<void> {
     try {
       let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
@@ -533,8 +548,10 @@ export class PickingWorksheetController extends VasWorksheetController {
         worksheetType,
         [
           'worksheet',
+          'worksheet.bizplace',
           'targetInventory',
           'targetInventory.releaseGood',
+          'targetInventory.orderProduct',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
           'targetInventory.product'
@@ -545,6 +562,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       const product: Product = targetInventory.product
       let inventory: Inventory = targetInventory.inventory
+      let targetProduct: OrderProduct = targetInventory.orderProduct
+      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
 
       //validation to prevent duplicated picking
       let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
@@ -649,6 +668,10 @@ export class PickingWorksheetController extends VasWorksheetController {
 
       targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
 
+      if (toteNo) {
+        await this.toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace)
+      }
+
       await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
 
       const fromLocation: Location = targetInventory.inventory.location
@@ -947,6 +970,14 @@ export class PickingWorksheetController extends VasWorksheetController {
       status: ORDER_STATUS.PICKING
     })
 
+    const foundNotSealedOrderTote = await this.trxMgr
+      .getRepository(OrderTote)
+      .findOne({ where: { releaseGood, closedDate: IsNull() } })
+
+    if (foundNotSealedOrderTote) {
+      throw new Error('Please seal the tote(s) before completing')
+    }
+
     let worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory'
@@ -1008,14 +1039,14 @@ export class PickingWorksheetController extends VasWorksheetController {
     worksheet.updater = this.user
     worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
+    const worksheetDetails: any = worksheet.worksheetDetails.filter(wsD => wsD.status != 'MISSING')
     worksheetDetails.forEach((wsd: WorksheetDetail) => {
       wsd.status = WORKSHEET_STATUS.DONE
       wsd.updater = this.user
     })
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
 
-    const targetInventories: OrderInventory[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+    const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => {
       let targetInventory: OrderInventory = wsd.targetInventory
       targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
       targetInventory.updater = this.user
@@ -1023,7 +1054,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     })
     await this.updateOrderTargets(targetInventories)
 
-    const releaseGoods: ReleaseGood[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+    const releaseGoods: ReleaseGood[] = worksheetDetails.map((wsd: WorksheetDetail) => {
       let releaseGood: ReleaseGood = wsd.targetInventory.releaseGood
 
       let orderStatus: string
@@ -1108,6 +1139,9 @@ export class PickingWorksheetController extends VasWorksheetController {
       }
 
       orderInventory.status = ORDER_INVENTORY_STATUS.PICKED
+      orderInventory.pickedBy = this.user?.name
+      orderInventory.pickedByUser = this.user
+      orderInventory.pickedAt = new Date()
 
       inventory.qty -= orderInventory.releaseQty
       inventory.uomValue = Math.round((inventory.uomValue - orderInventory.releaseUomValue) * 100) / 100
@@ -1367,6 +1401,75 @@ export class PickingWorksheetController extends VasWorksheetController {
     } catch (e) {}
   }
 
+  private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
+    //1. find tote
+    let foundTote: Tote = await this.trxMgr
+      .getRepository(Tote)
+      .findOne({ where: { bizplace, name: toteNo, deletedAt: IsNull() } })
+
+    if (foundTote?.status == TOTE_STATUS.DAMAGED || foundTote?.status == TOTE_STATUS.DISPATCHED) {
+      foundTote = null
+    }
+
+    //2. find order tote
+    let foundOrderTote: OrderTote = await this.trxMgr
+      .getRepository(OrderTote)
+      .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } })
+
+    //if order tote not found the create one, if tote not found means it's tote box
+    //create order tote item
+    if (!foundOrderTote) {
+      const orderTote = await this.trxMgr.getRepository(OrderTote).save({
+        name: toteNo,
+        domain: this.domain,
+        releaseGood,
+        tote: foundTote ? foundTote : null,
+        updater: this.user
+      })
+
+      const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+        domain: this.domain,
+        name: OrderNoGenerator.orderToteItem(),
+        orderProduct: targetProduct,
+        orderInventory: targetInventory,
+        orderTote,
+        qty: pickedQty,
+        updater: this.user
+      })
+    } else {
+      if (foundOrderTote.closedDate) {
+        throw new Error('Tote has been sealed, please try another tote!')
+      }
+
+      //if found order tote then check if order tote item exist
+      const foundOrderToteItem: OrderToteItem = await this.trxMgr.getRepository(OrderToteItem).findOne({
+        domain: this.domain,
+        orderProduct: targetProduct,
+        orderInventory: targetInventory,
+        orderTote: foundOrderTote
+      })
+
+      //if not order tote item doesnt exist then create one
+      if (!foundOrderToteItem) {
+        const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+          domain: this.domain,
+          name: OrderNoGenerator.orderToteItem(),
+          orderProduct: targetProduct,
+          orderInventory: targetInventory,
+          orderTote: foundOrderTote,
+          qty: pickedQty,
+          updater: this.user
+        })
+      } else {
+        //if found order tote item found then add the quantity
+        const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+          ...foundOrderToteItem,
+          qty: foundOrderToteItem.qty + pickedQty
+        })
+      }
+    }
+  }
+
   async undoSerialNumberPicking(worksheetDetailName: string, inventoryItemId: string): Promise<void> {
     const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
       where: { name: worksheetDetailName, domain: this.domain, status: Not(Equal(WORKSHEET_STATUS.DEACTIVATED)) },
@@ -1438,4 +1541,72 @@ export class PickingWorksheetController extends VasWorksheetController {
     targetInventory.updater = this.user
     await this.updateOrderTargets([targetInventory])
   }
+
+  async sealTote(sealNo: string, toteNo: string, orderNo: string): Promise<void> {
+    const checkDuplicateSeal = await this.trxMgr.getRepository(OrderToteSeal).findOne({
+      where: {
+        name: sealNo
+      }
+    })
+
+    if (checkDuplicateSeal) {
+      throw new Error('Seal has been scanned before')
+    }
+
+    const releaseGood: ReleaseGood = await this.trxMgr
+      .getRepository(ReleaseGood)
+      .findOne({ where: { domain: this.domain, name: orderNo }, relations: ['bizplace', 'bizplace.domain'] })
+
+    let sealNoSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: {
+        domain: releaseGood.bizplace.domain,
+        name: 'minimum-seal-number'
+      }
+    })
+
+    if (!sealNoSetting) {
+      sealNoSetting = await this.trxMgr.getRepository(Setting).findOne({
+        where: {
+          domain: this.domain,
+          name: 'minimum-seal-number'
+        }
+      })
+    }
+
+    const foundOrderTote: OrderTote = await this.trxMgr
+      .getRepository(OrderTote)
+      .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } })
+
+    if (!foundOrderTote) {
+      throw new Error('Tote not scanned under this order')
+    }
+
+    let totalOrderToteItems = await this.trxMgr.getRepository(OrderToteItem).count({
+      where: {
+        orderTote: foundOrderTote
+      }
+    })
+
+    if (totalOrderToteItems < 1) {
+      throw new Error('Tote carton is empty')
+    }
+
+    const newToteOrderSeal: OrderToteSeal = await this.trxMgr.getRepository(OrderToteSeal).save({
+      domain: this.domain,
+      name: sealNo,
+      orderTote: foundOrderTote,
+      updater: this.user
+    })
+
+    const totalSeal = await this.trxMgr.getRepository(OrderToteSeal).count({
+      orderTote: foundOrderTote
+    })
+
+    if (totalSeal >= parseInt(sealNoSetting?.value || 0)) {
+      await this.trxMgr.getRepository(OrderTote).save({
+        ...foundOrderTote,
+        closedDate: new Date()
+      })
+    }
+  }
 }

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

@@ -1,3 +1,5 @@
+import { IsNull, In } from 'typeorm'
+
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import {
@@ -6,11 +8,22 @@ import {
   InventoryItem,
   INVENTORY_STATUS,
   InventoryNoGenerator,
-  INVENTORY_ITEM_SOURCE
+  INVENTORY_ITEM_SOURCE,
+  Tote,
+  TOTE_STATUS
 } from '@things-factory/warehouse-base'
-import { ReleaseGood, OrderInventory, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '@things-factory/sales-base'
+import {
+  ReleaseGood,
+  OrderInventory,
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderTote,
+  OrderToteItem,
+  OrderNoGenerator
+} from '@things-factory/sales-base'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
+import { temporaryGetRemainInventoryAmount } from 'server/graphql/resolvers/worksheet/vas-transactions/common-utils'
 
 export class SortingWorksheetController extends VasWorksheetController {
   async generateSortingWorksheet(
@@ -62,7 +75,8 @@ export class SortingWorksheetController extends VasWorksheetController {
     taskNo: string,
     releaseGoodNo: string,
     productBarcode: string,
-    serialNumber: string
+    serialNumber: string,
+    toteNo: string
   ): Promise<void> {
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
@@ -75,6 +89,8 @@ export class SortingWorksheetController extends VasWorksheetController {
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.product',
+        'worksheetDetails.targetInventory.orderProduct',
+        'worksheetDetails.targetInventory.bizplace',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.product',
         'worksheetDetails.targetInventory.inventory.product.productDetails',
@@ -204,6 +220,17 @@ export class SortingWorksheetController extends VasWorksheetController {
               } else {
                 await this.updateOrderTargets([matchingOI])
               }
+
+              if (toteNo) {
+                await this.toteScanning(
+                  toteNo,
+                  matchingOI.orderProduct,
+                  matchingOI,
+                  1,
+                  releaseGood,
+                  matchingOI.bizplace
+                )
+              }
             }
           })
         )
@@ -216,7 +243,8 @@ export class SortingWorksheetController extends VasWorksheetController {
     releaseGoodNo: string,
     productId: string,
     sortingQty: number,
-    serialNumber: string
+    serialNumber: string,
+    toteNo: string
   ): Promise<void> {
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
@@ -229,6 +257,8 @@ export class SortingWorksheetController extends VasWorksheetController {
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.product',
+        'worksheetDetails.targetInventory.orderProduct',
+        'worksheetDetails.targetInventory.bizplace',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.product',
         'worksheetDetails.targetInventory.inventory.product.productDetails',
@@ -294,6 +324,17 @@ export class SortingWorksheetController extends VasWorksheetController {
             }
           }
 
+          if (toteNo) {
+            await this.toteScanning(
+              toteNo,
+              matchingOI.orderProduct,
+              matchingOI,
+              sortingQty,
+              releaseGood,
+              matchingOI.bizplace
+            )
+          }
+
           if (releaseQty != matchingOI?.sortedQty && sortingQty != 0) {
             if (product?.isRequireSerialNumberScanningOutbound) {
               matchingOI.sortedQty += sortingQty
@@ -338,34 +379,50 @@ export class SortingWorksheetController extends VasWorksheetController {
   }
 
   async completeOrderSorting(releaseGoodNo: string): Promise<ReleaseGood> {
-    let releaseGood: ReleaseGood = await this.findRefOrder(
-      ReleaseGood,
-      {
-        domain: this.domain,
-        name: releaseGoodNo,
-        status: ORDER_STATUS.SORTING
-      },
-      ['bizplace', 'orderInventories']
-    )
+    try {
+      let releaseGood: ReleaseGood = await this.findRefOrder(
+        ReleaseGood,
+        {
+          domain: this.domain,
+          name: releaseGoodNo,
+          status: ORDER_STATUS.SORTING
+        },
+        ['bizplace', 'orderInventories']
+      )
 
-    releaseGood.status = ORDER_STATUS.READY_TO_LOAD
-    releaseGood.updater = this.user
-    await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+      if (!releaseGood) {
+        throw new Error('Order is already sorted')
+      }
 
-    let inventoryItems: InventoryItem = await this.trxMgr
-      .getRepository(InventoryItem)
-      .find({ where: { outboundOrderId: releaseGood.id } })
+      const foundNotSealedOrderTote = await this.trxMgr
+        .getRepository(OrderTote)
+        .findOne({ where: { releaseGood, closedDate: IsNull() } })
 
-    if (inventoryItems.length > 0) {
-      inventoryItems.forEach((itm: InventoryItem) => {
-        itm.status = INVENTORY_STATUS.TERMINATED
-        itm.updater = this.user
-      })
+      if (foundNotSealedOrderTote) {
+        throw new Error('Please seal the tote(s) before proceeding')
+      }
 
-      await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
-    }
+      releaseGood.status = ORDER_STATUS.READY_TO_LOAD
+      releaseGood.updater = this.user
+      await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+
+      let inventoryItems: InventoryItem = await this.trxMgr
+        .getRepository(InventoryItem)
+        .find({ where: { outboundOrderId: releaseGood.id } })
+
+      if (inventoryItems.length > 0) {
+        inventoryItems.forEach((itm: InventoryItem) => {
+          itm.status = INVENTORY_STATUS.TERMINATED
+          itm.updater = this.user
+        })
+
+        await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
+      }
 
-    return releaseGood
+      return releaseGood
+    } catch (e) {
+      throw e
+    }
   }
 
   async completeWorksheetSorting(taskNo: string): Promise<Worksheet> {
@@ -383,6 +440,16 @@ export class SortingWorksheetController extends VasWorksheetController {
       ]
     })
 
+    let releaseGoodIds = worksheet.worksheetDetails.map(itm => itm.targetInventory.releaseGood.id)
+
+    const foundNotSealedOrderTote = await this.trxMgr
+      .getRepository(OrderTote)
+      .findOne({ where: { releaseGood: In(releaseGoodIds), closedDate: IsNull() } })
+
+    if (foundNotSealedOrderTote) {
+      throw new Error('Please seal the tote(s) before proceeding')
+    }
+
     this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
@@ -398,4 +465,77 @@ export class SortingWorksheetController extends VasWorksheetController {
 
     return worksheet
   }
+
+  private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
+    //1. find tote
+    let foundTote: Tote = await this.trxMgr
+      .getRepository(Tote)
+      .findOne({ where: { bizplace, name: toteNo, deletedAt: IsNull() } })
+
+    if (foundTote?.status == TOTE_STATUS.DAMAGED) {
+      throw new Error('Tote is damaged')
+    }
+
+    if (foundTote?.status == TOTE_STATUS.DISPATCHED) {
+      throw new Error('Tote is dispatched')
+    }
+
+    //2. find order tote
+    let foundOrderTote: OrderTote = await this.trxMgr
+      .getRepository(OrderTote)
+      .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } })
+
+    //if order tote not found the create one, if tote not found means it's tote box
+    //create order tote item
+    if (!foundOrderTote) {
+      const orderTote = await this.trxMgr.getRepository(OrderTote).save({
+        name: toteNo,
+        domain: this.domain,
+        releaseGood,
+        tote: foundTote ? foundTote : null,
+        updater: this.user
+      })
+
+      const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+        domain: this.domain,
+        name: OrderNoGenerator.orderToteItem(),
+        orderProduct: targetProduct,
+        orderInventory: targetInventory,
+        orderTote,
+        qty: pickedQty,
+        updater: this.user
+      })
+    } else {
+      if (foundOrderTote.closedDate) {
+        throw new Error('Tote has been sealed, please try another tote!')
+      }
+
+      //if found order tote then check if order tote item exist
+      const foundOrderToteItem: OrderToteItem = await this.trxMgr.getRepository(OrderToteItem).findOne({
+        domain: this.domain,
+        orderProduct: targetProduct,
+        orderInventory: targetInventory,
+        orderTote: foundOrderTote
+      })
+
+      //if not order tote item doesnt exist then create one
+      if (!foundOrderToteItem) {
+        const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+          domain: this.domain,
+          name: OrderNoGenerator.orderToteItem(),
+          orderProduct: targetProduct,
+          orderInventory: targetInventory,
+          orderTote: foundOrderTote,
+          qty: pickedQty,
+          updater: this.user
+        })
+      } else {
+        //if found order tote item found then add the quantity
+        const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+          ...foundOrderToteItem,
+          qty: foundOrderToteItem.qty + pickedQty
+        })
+      }
+    }
+  }
 }