@things-factory/worksheet-base 4.3.212 → 4.3.213

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -81,7 +81,11 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
   }
 
-  async unload(worksheetDetailName: string, inventory: Partial<Inventory>, productBarcode: string): Promise<void> {
+  async unload(
+    worksheetDetailName: string,
+    inventory: Partial<Inventory>,
+    productBarcode: string
+  ): Promise<string> {
     const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
       where: {
         name: worksheetDetailName,
@@ -97,73 +101,73 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'targetProduct',
         'targetProduct.product',
         'targetProduct.productDetail',
-        'targetProduct.product.productDetails',
-        'targetProduct.product.productDetails.childProductDetail',
         'targetInventory',
         'targetInventory.inventory',
         'targetInventory.product',
-        'targetInventory.productDetail',
-        'targetInventory.product.productDetails',
-        'targetInventory.product.productDetails.childProductDetail'
+        'targetInventory.productDetail'
       ]
     })
+
     if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
     const targetProduct: OrderProduct = worksheetDetail.targetProduct
 
     if (targetProduct && targetProduct.status == ORDER_PRODUCT_STATUS.EDITED)
       throw new Error('this product is pending for changes approval')
 
-    const bizplace: Bizplace = worksheetDetail.bizplace
-    const companyDomain: Domain = bizplace?.company?.domain
-    const worksheet: Worksheet = worksheetDetail.worksheet
-    const arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
-    const returnOrder: ReturnOrder = worksheet.returnOrder
+    const arrivalNotice: ArrivalNotice = worksheetDetail.worksheet.arrivalNotice
+    const returnOrder: ReturnOrder = worksheetDetail.worksheet.returnOrder
+    const location: Location = worksheetDetail.worksheet.bufferLocation
+    const targetOrderInventory: OrderInventory = worksheetDetail?.targetInventory
+    const originInventory: OrderInventory = targetOrderInventory?.inventory || null
     const orderId: string = Boolean(arrivalNotice?.id) ? arrivalNotice.id : returnOrder.id
-    const targetInventory: OrderInventory = worksheetDetail?.targetInventory
-    const originInventory: OrderInventory = targetInventory ? targetInventory.inventory : null
-    const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
-    const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
-    const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
+
     let productDetail: ProductDetail = Boolean(arrivalNotice)
       ? targetProduct.productDetail
-      : targetInventory.productDetail
-    const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
-    const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
-    const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
-    const manufactureDate: number = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null
+      : targetOrderInventory.productDetail
     let qty: number = inventory.qty
     let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
-    const location: Location = worksheet.bufferLocation
-    const warehouse: Warehouse = location.warehouse
-    const zone: string = location.zone
-    const unitCost: number = Boolean(arrivalNotice)
-      ? targetProduct?.unitPrice
-        ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
-            (1 + targetProduct.taxRate / 100)) /
-          targetProduct.packQty
-        : 0
-      : null
-
-    const palletId: string = inventory?.palletId
-    const cartonId: string = inventory?.cartonId
-    let matchingProduct
 
     if (!inventory?.palletId) {
+      if (!inventory?.cartonId) {
+        throw new Error('missing carton Id')
+      }
+
+      await this.checkCartonDuplication(inventory.cartonId, orderId)
       inventory.palletId = await generateId({
         domain: this.domain,
         type: RULE_TYPE.LOT_NUMBER_ID,
         seed: { date: DateGenerator.generateDate() }
       })
-      await this.checkCartonDuplication(cartonId, orderId)
     } else {
-      await this.checkPalletDuplication(palletId)
+      await this.checkPalletDuplication(inventory.palletId)
+    }
+
+    let newInventory: Partial<Inventory> = new Inventory()
+    newInventory = {
+      bizplace: worksheetDetail.bizplace,
+      name: InventoryNoGenerator.inventoryName(),
+      palletId: inventory.palletId,
+      cartonId: inventory.cartonId || undefined,
+      refOrderId: orderId,
+      productDetail,
+      warehouse: location.warehouse,
+      zone: location.zone,
+      location: location,
+      expirationDate: inventory?.expirationDate ? new Date(inventory.expirationDate) : undefined,
+      status: INVENTORY_STATUS.UNLOADED
     }
 
+    if (inventory.reusablePallet?.id) {
+      newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+    }
+
+    // Find matching product based on GTIN
     if (productBarcode) {
+      let matchingProduct
       matchingProduct = await this.getDirectQty(
         {
           ...productDetail,
-          product: targetInventory?.product
+          product: targetOrderInventory?.product
         },
         productBarcode,
         qty
@@ -176,55 +180,79 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       uom = arrivalNotice ? targetProduct.uom : matchingProduct.uom
     }
 
-    if (!uom) {
-      uom = productDetail.uom
-    }
-
+    // Calculate uom value 
     const uomValue: number =
       Math.round(
         qty *
-          (Boolean(arrivalNotice)
-            ? targetProduct.uomValue
-            : targetInventory.returnUomValue / targetInventory.returnQty) *
-          100
+        (Boolean(arrivalNotice)
+          ? targetProduct.uomValue
+          : targetOrderInventory.returnUomValue / targetOrderInventory.returnQty) *
+        100
       ) / 100
 
-    let newInventory: Partial<Inventory> = new Inventory()
-    newInventory.bizplace = bizplace
-    newInventory.name = InventoryNoGenerator.inventoryName()
-    newInventory.palletId = inventory.palletId
-    newInventory.cartonId = inventory.cartonId
-    newInventory.batchId = batchId
-    newInventory.product = product
-    newInventory.productDetail = productDetail
-    newInventory.packingType = packingType
-    newInventory.packingSize = packingSize
-    newInventory.uom = uom
-    newInventory.remark = remark
-    newInventory.qty = qty
-    newInventory.uomValue = uomValue
-    newInventory.refOrderId = orderId
-    newInventory.unitCost = unitCost
-    if (inventory.reusablePallet?.id) {
-      newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
-    }
+
+    // case 1: Arrival Notice -> Update Order Product
     if (arrivalNotice) {
-      newInventory.manufactureDate = manufactureDate
-      newInventory.batchIdRef = batchIdRef
-      newInventory.orderProductId = targetProduct?.id
-    } else if (returnOrder) {
-      newInventory.orderInventoryId = targetInventory?.id
-      newInventory.refInventory = targetInventory?.inventory
+      newInventory = {
+        ...newInventory,
+        batchId: targetProduct.batchId,
+        batchIdRef: targetProduct.batchIdRef,
+        product: targetProduct.product,
+        packingType: targetProduct.packingType,
+        packingSize: targetProduct.packingSize,
+        remark: targetProduct.remark,
+        manufactureDate: targetProduct.manufactureDate,
+        orderProductId: targetProduct?.id,
+        uom: uom || productDetail.uom,
+        qty: qty,
+        uomValue: uomValue,
+        unitCost: targetProduct?.unitPrice
+          ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
+            (1 + targetProduct.taxRate / 100)) /
+          targetProduct.packQty
+          : 0
+      }
+
+      const updateOP = {
+        id: targetProduct.id,
+        actualPalletQty: ++targetProduct.actualPalletQty,
+        actualPackQty: targetProduct.actualPackQty + qty,
+        status: ORDER_PRODUCT_STATUS.UNLOADED,
+        productDetail: productDetail
+      }
+
+      // targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADED
+      // targetProduct.productDetail = productDetail
+      await this.updateOrderTargets([updateOP], OrderProduct)
     }
-    newInventory.warehouse = warehouse
-    newInventory.location = location
-    newInventory.zone = zone
-    newInventory.status = INVENTORY_STATUS.UNLOADED
+    // case 2: Return Order -> Update Order Inventory
+    else if (returnOrder) {
+      newInventory = {
+        ...newInventory,
+        batchId: targetOrderInventory.batchId,
+        batchIdRef: null,
+        product: targetOrderInventory.product,
+        packingType: targetOrderInventory.packingType,
+        packingSize: targetOrderInventory.packingSize,
+        remark: targetOrderInventory.remark,
+        uom: uom || productDetail.uom,
+        qty: qty,
+        uomValue: uomValue,
+        unitCost: targetOrderInventory.unitCost,
+        orderInventoryId: targetOrderInventory?.id,
+        refInventory: targetOrderInventory?.inventory
+      }
 
-    if (inventory?.expirationDate) {
-      newInventory.expirationDate = new Date(inventory.expirationDate)
+      const updateOI = {
+        id: targetOrderInventory.id,
+        actualPalletQty: ++targetOrderInventory.actualPalletQty,
+        actualPackQty: targetOrderInventory.actualPackQty + qty,
+        status: ORDER_PRODUCT_STATUS.UNLOADED
+      }
+      await this.updateOrderTargets([updateOI], OrderInventory)
     }
 
+    // Create New History Transaction
     newInventory = await this.transactionInventory(
       newInventory,
       Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
@@ -233,20 +261,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       INVENTORY_TRANSACTION_TYPE.UNLOADING
     )
 
-    if (arrivalNotice) {
-      targetProduct.actualPalletQty++
-      targetProduct.actualPackQty += qty
-      targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADED
-      targetProduct.updater = this.user
-      targetProduct.productDetail = productDetail
-      this.updateOrderTargets([targetProduct])
-    } else if (returnOrder) {
-      targetInventory.actualPalletQty++
-      targetInventory.actualPackQty += qty
-      targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADED
-      targetInventory.updater = this.user
-      this.updateOrderTargets([targetInventory])
-    }
+    return arrivalNotice.name
   }
 
   async scanSerialNumberUnload(
@@ -343,8 +358,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const unitCost: number = Boolean(arrivalNotice)
       ? targetProduct?.unitPrice
         ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
-            (1 + targetProduct.taxRate / 100)) /
-          targetProduct.packQty
+          (1 + targetProduct.taxRate / 100)) /
+        targetProduct.packQty
         : 0
       : null
 
@@ -367,10 +382,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.uomValue =
         Math.round(
           qty *
-            (Boolean(arrivalNotice)
-              ? targetProduct.uomValue
-              : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
         ) / 100
       newInventory.manufactureDate = manufactureDate
       newInventory.refOrderId = orderId
@@ -407,10 +422,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       foundInventory.uomValue +=
         Math.round(
           qty *
-            (Boolean(arrivalNotice)
-              ? targetProduct.uomValue
-              : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
         ) / 100
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
@@ -549,8 +564,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const unitCost: number = Boolean(arrivalNotice)
       ? targetProduct?.unitPrice
         ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
-            (1 + targetProduct.taxRate / 100)) /
-          targetProduct.packQty
+          (1 + targetProduct.taxRate / 100)) /
+        targetProduct.packQty
         : 0
       : null
 
@@ -573,10 +588,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.uomValue =
         Math.round(
           qty *
-            (Boolean(arrivalNotice)
-              ? targetProduct.uomValue
-              : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
         ) / 100
       newInventory.manufactureDate = manufactureDate
       newInventory.refOrderId = orderId
@@ -613,10 +628,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       foundInventory.uomValue +=
         Math.round(
           qty *
-            (Boolean(arrivalNotice)
-              ? targetProduct.uomValue
-              : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
         ) / 100
       foundInventory.productDetail = productDetail
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
@@ -801,10 +816,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         inventory.uomValue =
           Math.round(
             inventory.qty *
-              (Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE)
-                ? targetProduct.uomValue
-                : targetInventory.returnUomValue) *
-              100
+            (Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue) *
+            100
           ) / 100
         inventory.updater = this.user
         await this.trxMgr.getRepository(Inventory).save(inventory)
@@ -888,10 +903,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     inventory.uomValue =
       Math.round(
         inventory.qty *
-          (Boolean(arrivalNotice)
-            ? targetProduct.uomValue
-            : targetInventory.returnUomValue / targetInventory.returnQty) *
-          100
+        (Boolean(arrivalNotice)
+          ? targetProduct.uomValue
+          : targetInventory.returnUomValue / targetInventory.returnQty) *
+        100
       ) / 100
     await this.trxMgr
       .getRepository(Inventory)
@@ -939,19 +954,24 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       const bizplace: Bizplace = worksheet.bizplace
       let worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
 
-      const targetProducts: OrderProduct[] = worksheetDetails.map((wsd: WorksheetDetail) => {
-        let targetProduct: OrderProduct = wsd.targetProduct
+      const targetProductsId = worksheet.worksheetDetails.map(wsd => { return wsd.targetProduct.id })
+      await this.trxMgr
+        .getRepository(OrderInventory)
+        .update({ id: In(targetProductsId) }, { status: ORDER_PRODUCT_STATUS.UNLOADING, updater: this.user })
 
-        if (!targetProduct.palletQty) {
-          const { palletQty }: { palletQty: number } = this.findMatchedWSD(wsd.name, unloadingWorksheetDetails)
-          targetProduct.palletQty = palletQty
-        }
-        targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
-        targetProduct.updater = this.user
+      // const targetProducts: OrderProduct[] = worksheetDetails.map((wsd: WorksheetDetail) => {
+      //   let targetProduct: OrderProduct = wsd.targetProduct
 
-        return targetProduct
-      })
-      await this.updateOrderTargets(targetProducts)
+      //   if (!targetProduct.palletQty) {
+      //     const { palletQty }: { palletQty: number } = this.findMatchedWSD(wsd.name, unloadingWorksheetDetails)
+      //     targetProduct.palletQty = palletQty
+      //   }
+      //   targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
+      //   targetProduct.updater = this.user
+
+      //   return targetProduct
+      // })
+      // await this.updateOrderTargets(targetProducts)
 
       arrivalNotice.status = ORDER_STATUS.PROCESSING
       arrivalNotice.updater = this.user

package/server/controllers/worksheet-controller.ts

@@ -439,7 +439,7 @@ export class WorksheetController {
     let existingWorksheet: Worksheet
     try {
       existingWorksheet = await this.findWorksheetByRefOrder(refOrder, type)
-    } catch (e) {}
+    } catch (e) { }
 
     if (existingWorksheet)
       throw new Error(
@@ -594,6 +594,13 @@ export class WorksheetController {
    * Update order targets like (OrderProduct, OrderInventory, OrderVas)
    */
   async updateOrderTargets(orderTargets: OrderTargetTypes[], entitySchema?: EntitySchema): Promise<any> {
+
+    if (orderTargets.some((orderTarget: any) => !orderTarget.id)) throw new Error(this.ERROR_MSG.UPDATE.ID_NOT_EXISTS)
+
+    orderTargets.forEach((orderTarget: OrderTargetTypes) => {
+      if (!orderTarget.updater?.id) orderTarget = this.setStamp(orderTarget)
+    })
+
     if (!entitySchema) {
       if (orderTargets[0] instanceof OrderProduct) {
         entitySchema = OrderProduct
@@ -604,12 +611,25 @@ export class WorksheetController {
       }
     }
 
-    if (orderTargets.some((orderTarget: any) => !orderTarget.id)) throw new Error(this.ERROR_MSG.UPDATE.ID_NOT_EXISTS)
-    orderTargets.forEach((orderTarget: OrderTargetTypes) => {
-      if (!orderTarget.updater?.id) orderTarget = this.setStamp(orderTarget)
-    })
+    if (!entitySchema) { throw new Error('updateOrderTargets - missing entity Schema.') }
+
+    if (entitySchema === OrderProduct) {
+      // update all order targets with 1 action
+      await Promise.all(orderTargets.map(async orderTarget => {
+        try {
+          await this.trxMgr.getRepository(OrderProduct).update({
+            id: orderTarget.id
+          }, orderTarget)
+        } catch (error) {
+          console.error(error)
+        }
+      }))
 
-    return await this.trxMgr.getRepository(entitySchema).save(orderTargets)
+      // find all based on Ids
+      return await this.trxMgr.getRepository(entitySchema).findByIds(orderTargets.map(ot => ot.id))
+    } else {
+      return await this.trxMgr.getRepository(entitySchema).save(orderTargets)
+    }
   }
 
   /**
@@ -631,18 +651,18 @@ export class WorksheetController {
     orderTargetStatus: string,
     additionalProps: Partial<Worksheet> = {}
   ): Promise<Worksheet> {
+
     const worksheet: Worksheet = await this.createWorksheet(refOrder, worksheetType, additionalProps)
 
     orderTargets.forEach((orderTarget: OrderTargetTypes) => {
       orderTarget.status = orderTargetStatus
     })
+
     orderTargets = await this.updateOrderTargets(orderTargets)
 
     worksheet.worksheetDetails = await this.createWorksheetDetails(worksheet, worksheetType, orderTargets)
-
     refOrder.status = refOrderStatus
     await this.updateRefOrder(refOrder)
-
     return worksheet
   }
 

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

@@ -74,12 +74,16 @@ export const completePutawayResolver = {
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
+
+      // allow async run to skip user wait time
+      sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
     }
 
     if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-      await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+
+      // allow async run to skip user wait time
+      ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
     }
   }
 }

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

@@ -3,10 +3,14 @@ import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
 import { PutawayWorksheetController } from '../../../../controllers'
 
+import { findPutawayWorksheetByArrivalNoticeNo } from '../putaway-worksheet'
+
 export const putawayResolver = {
-  async putaway(_: any, { worksheetDetailName, palletId, cartonId, toLocation }, context: any) {
+  async putaway(_: any, { arrivalNoticeNo, worksheetDetailName, palletId, cartonId, toLocation }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
     await putaway(tx, domain, user, worksheetDetailName, palletId, cartonId, toLocation)
+
+    return await findPutawayWorksheetByArrivalNoticeNo(arrivalNoticeNo, context)
   }
 }