@things-factory/worksheet-base 5.0.0-alpha.4 → 5.0.0-alpha.40

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

@@ -1,6 +1,13 @@
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
+import {
+  Inventory,
+  INVENTORY_TRANSACTION_TYPE,
+  InventoryItem,
+  INVENTORY_STATUS,
+  InventoryNoGenerator,
+  INVENTORY_ITEM_SOURCE
+} from '@things-factory/warehouse-base'
 import { ReleaseGood, OrderInventory, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '@things-factory/sales-base'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -51,7 +58,12 @@ export class SortingWorksheetController extends VasWorksheetController {
     return await this.activateWorksheet(worksheet, worksheetDetails, sortingWorksheetDetails)
   }
 
-  async scanProductSorting(taskNo: string, releaseGoodNo: string, productBarcode: string): Promise<void> {
+  async scanProductSorting(
+    taskNo: string,
+    releaseGoodNo: string,
+    productBarcode: string,
+    serialNumber: string
+  ): Promise<void> {
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         domain: this.domain,
@@ -113,8 +125,53 @@ export class SortingWorksheetController extends VasWorksheetController {
             const releaseQty: number = matchingOI.releaseQty
             const inventory: Inventory = matchingOI.inventory
             const releaseGood: ReleaseGood = matchingOI.releaseGood
+            const product: Product = inventory.product
 
             if (releaseQty != matchingOI?.sortedQty && sortedQty == 1) {
+              // Serial Number scanning for batch picking
+              if (matchingOI?.refWorksheetId) {
+                if (product?.isRequireSerialNumberScanningOutbound) {
+                  if (!serialNumber || serialNumber == '') {
+                    throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('sorting', `require serial number`))
+                  }
+
+                  let foundSerialNumber: InventoryItem = await this.trxMgr
+                    .getRepository(InventoryItem)
+                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
+
+                  if (foundSerialNumber) {
+                    if (foundSerialNumber.inventoryId !== inventory.id) {
+                      throw new Error('Serial Number scanned is in another inventory')
+                    }
+
+                    if (foundSerialNumber.outboundOrderId) {
+                      let releaseGood: ReleaseGood = await this.trxMgr
+                        .getRepository(ReleaseGood)
+                        .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
+                      throw new Error(`Inventory Item is already picked/sorted in ${releaseGood.name}`)
+                    }
+
+                    foundSerialNumber.status = INVENTORY_STATUS.SORTING
+                    foundSerialNumber.updater = this.user
+                    foundSerialNumber.outboundOrderId = releaseGood.id
+
+                    await this.trxMgr.getRepository(InventoryItem).save(foundSerialNumber)
+                  } else {
+                    let inventoryItem: InventoryItem = new InventoryItem()
+                    inventoryItem.name = InventoryNoGenerator.inventoryItemName()
+                    inventoryItem.serialNumber = serialNumber
+                    inventoryItem.status = INVENTORY_STATUS.SORTING
+                    inventoryItem.outboundOrderId = releaseGood.id
+                    inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
+                    inventoryItem.product = product
+                    inventoryItem.inventory = inventory
+                    inventoryItem.domain = this.domain
+
+                    await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
+                  }
+                }
+              }
+
               matchingOI.sortedQty = Boolean(matchingOI?.sortedQty) ? matchingOI.sortedQty + sortedQty : sortedQty
               sortedQty -= 1
               if (matchingOI.sortedQty == releaseQty) {
@@ -128,6 +185,19 @@ export class SortingWorksheetController extends VasWorksheetController {
                 worksheetDetail.status = WORKSHEET_STATUS.DONE
                 worksheetDetail.updater = this.user
                 await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+
+                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.SORTED
+                    itm.updater = this.user
+                  })
+
+                  await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
+                }
               } else if (matchingOI?.sortedQty > releaseQty) {
                 const product: Product = matchingOI.inventory.product
                 throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize))
@@ -141,7 +211,13 @@ export class SortingWorksheetController extends VasWorksheetController {
     }
   }
 
-  async sortingProduct(taskNo: string, releaseGoodNo: string, productId: string, sortingQty: number): Promise<void> {
+  async sortingProduct(
+    taskNo: string,
+    releaseGoodNo: string,
+    productId: string,
+    sortingQty: number,
+    serialNumber: string
+  ): Promise<void> {
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         domain: this.domain,
@@ -180,14 +256,70 @@ export class SortingWorksheetController extends VasWorksheetController {
           const packingType: string = matchingOI.packingType
           const packingSize: number = matchingOI.packingSize
 
+          if (product?.isRequireSerialNumberScanningOutbound) {
+            if (!serialNumber || serialNumber == '') {
+              throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('sorting', `require serial number`))
+            }
+
+            let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
+              where: { domain: this.domain, serialNumber: serialNumber, product },
+              relations: ['product', 'inventory']
+            })
+
+            if (foundSerialNumber) {
+              if (foundSerialNumber.outboundOrderId) {
+                let releaseGood: ReleaseGood = await this.trxMgr
+                  .getRepository(ReleaseGood)
+                  .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
+                throw new Error(`Inventory Item is already picked/sorted in ${releaseGood.name}`)
+              }
+
+              foundSerialNumber.status = INVENTORY_STATUS.SORTING
+              foundSerialNumber.updater = this.user
+              foundSerialNumber.outboundOrderId = releaseGood.id
+
+              await this.trxMgr.getRepository(InventoryItem).save(foundSerialNumber)
+            } else {
+              let inventoryItem: InventoryItem = new InventoryItem()
+              inventoryItem.name = InventoryNoGenerator.inventoryItemName()
+              inventoryItem.serialNumber = serialNumber
+              inventoryItem.status = INVENTORY_STATUS.SORTING
+              inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
+              inventoryItem.outboundOrderId = releaseGood.id
+              inventoryItem.product = product
+              inventoryItem.inventory = inventory
+              inventoryItem.domain = this.domain
+
+              foundSerialNumber = await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
+            }
+          }
+
           if (releaseQty != matchingOI?.sortedQty && sortingQty != 0) {
-            matchingOI.sortedQty = releaseQty
+            if (product?.isRequireSerialNumberScanningOutbound) {
+              matchingOI.sortedQty += sortingQty
+            } else {
+              matchingOI.sortedQty = releaseQty
+            }
+
             sortingQty -= releaseQty
             if (matchingOI.sortedQty == releaseQty) {
               matchingOI.status = ORDER_INVENTORY_STATUS.SORTED
               await this.updateOrderTargets([matchingOI])
               await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.SORTING)
 
+              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.PACKED
+                  itm.updater = this.user
+                })
+
+                await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
+              }
+
               let worksheetDetail: WorksheetDetail = worksheetDetails.find(
                 wsd => wsd.targetInventory.id === matchingOI.id
               )
@@ -220,6 +352,19 @@ export class SortingWorksheetController extends VasWorksheetController {
     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
   }
 

package/server/controllers/render-fm-grn.ts

@@ -0,0 +1,266 @@
+import FormData from 'form-data'
+import _ from 'lodash'
+import fetch from 'node-fetch'
+import { getRepository, IsNull, Not } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { Partner } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { ArrivalNotice, GoodsReceivalNote, ORDER_STATUS, OrderProduct } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { InventoryItem, ReducedInventoryHistory } from '@things-factory/warehouse-base'
+
+import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
+import { Worksheet } from '../entities'
+import { DateTimeConverter } from '../utils/datetime-util'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
+  // 1. find domain
+  const domain: Domain = await getRepository(Domain).findOne({
+    where: { id: context.state.domain.id }
+  })
+
+  // 2. find grn
+  const foundGRN: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
+    where: { domain, name: grnNo },
+    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
+  })
+
+  // 3. find GAN
+  const foundGAN: ArrivalNotice = foundGRN.arrivalNotice
+  const ownRefNo = foundGAN.refNo
+
+  const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
+  // 4. find customer bizplace
+  const partnerBiz: Bizplace = foundGRN.bizplace
+
+  const partnerDomain: Partner = await getRepository(Partner).findOne({
+    where: { partnerDomain: partnerBiz.domain, domain },
+    relations: ['domain']
+  })
+
+  const domainOwner: Domain = partnerDomain.domain
+  const domainBizplace: Bizplace = await getRepository(Bizplace).findOne({
+    where: { domain: domainOwner },
+    relations: ['company']
+  })
+
+  const qbReducedInventory = getRepository(ReducedInventoryHistory)
+    .createQueryBuilder('ivh')
+    .select('product_id', 'productId')
+    .addSelect('batch_id', 'batchId')
+    .addSelect('reusable_pallet_id', 'reusablePalletId')
+    .addSelect('packing_type', 'packingType')
+    .addSelect('sum(qty)', 'qty')
+    .addSelect('sum(uom_value)', 'uomValue')
+    .addSelect('uom', 'uom')
+    .addSelect('expiration_date', 'expiryDate')
+    .addSelect('count(distinct pallet_id)', 'pallet')
+    .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
+    .where('ivh.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
+    .andWhere(`ivh.transaction_type = 'UNLOADING'`)
+    .groupBy('reusable_pallet_id')
+    .addGroupBy('product_id')
+    .addGroupBy('batch_id')
+    .addGroupBy('packing_type')
+    .addGroupBy('uom')
+    .addGroupBy('expiration_date')
+    .getRawMany()
+
+  // 5. find domain contact point
+  const foundCP: ContactPoint = await getRepository(ContactPoint).findOne({
+    where: { domain, bizplace: domainBizplace }
+  })
+
+  // 5. find domain contact point
+  const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
+    where: { domain, bizplace: partnerBiz }
+  })
+
+  // 6. find unloading worksheet
+  const foundWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
+  })
+
+  // find putaway worksheet
+  const foundPutawayWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.PUTAWAY, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
+  })
+
+  const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
+    where: { domain, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()), actualPackQty: Not(IsNull()) },
+    relations: ['product']
+  })
+
+  // 7. find grn template based on category
+  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+    where: { domain, category: TEMPLATE_TYPE.GRN_TEMPLATE }
+  })
+
+  // 8. find grn logo
+  const foundLogo: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.LOGO
+    }
+  })
+
+  // 9. find signature
+  const foundSignature: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.SIGNATURE
+    }
+  })
+
+  const foundCop: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.COP
+    }
+  })
+
+  const inboundInventories: any[] = await qbReducedInventory
+
+  const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+  let logo = null
+  if (foundLogo?.path) {
+    logo = 'data:' + foundLogo.mimetype + ';base64,' + (await STORAGE.readFile(foundLogo.path, 'base64'))
+  }
+
+  let signature = null
+  if (foundSignature?.path) {
+    signature = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundSignature.path, 'base64'))
+  }
+
+  let cop = null
+  if (foundCop?.path) {
+    cop = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundCop.path, 'base64'))
+  }
+
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    if (t >= 0) foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+  const data = {
+    logo_url: logo,
+    sign_url: signature,
+    cop_url: cop,
+    customer_biz: partnerBiz.name,
+    customer_address: partnerBiz.address,
+    company_domain: domainBizplace.company.name,
+    company_phone: foundCP.phone,
+    company_email: foundCP.email,
+    company_brn: domainBizplace.company.brn,
+    company_address: domainBizplace.company.address,
+    warehouse_address: foundCP.address,
+    warehouse_address2: foundCP.address2,
+    warehouse_postcode: foundCP.postCode,
+    warehouse_city: foundCP.city,
+    warehouse_state: foundCP.state,
+    warehouse_phone: foundCP.phone,
+    warehouse_fax: foundCP.fax,
+    warehouse_email: foundCP.email,
+    order_no: foundGRN.name,
+    gan_no: foundGAN.name,
+    gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
+    unload_date: DateTimeConverter.date(foundWS.endedAt),
+    ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
+    ref_no_only: ownRefNo ? ` ${foundGAN.refNo}` : '',
+    ref_no1: foundGAN.refNo2 ? `${foundGAN.refNo2}` : '',
+    ref_no2: foundGAN.refNo3 ? `${foundGAN.refNo3}` : '',
+    received_date: DateTimeConverter.date(foundWS.endedAt),
+    truck_no: foundGAN.truckNo || '',
+    container_no: foundGAN.containerNo || '',
+    container_size: foundGAN.containerSize || '',
+    delivery_order_no: foundGAN.deliveryOrderNo ? foundGAN.deliveryOrderNo : '',
+    account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
+    unloaded_by: foundWS ? foundWS.updater.name : '',
+    putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
+    product_list: targetProducts
+      .reduce((acc, item) => {
+        acc.push(
+          ...inboundInventories
+            .filter(
+              ih =>
+                ih.productId == item.product.id &&
+                ih.batchId == item.batchId &&
+                ih.packingType == item.packingType &&
+                ih.uom == item.uom
+            )
+            .map(unloadInvHistory => {
+              return {
+                product_sku: `${item.product.sku}`,
+                product_brand_sku: `${item.product.brandSku}`,
+                product_name: `${item.product.name}(${item.product.description})`,
+                product_desc: item.product.description,
+                product_nameOnly: item.product.name,
+                product_type: item.packingType,
+                product_size: item.packingSize,
+                product_batch: item.batchId,
+                batch_id_ref: item?.batchIdRef ? item.batchIdRef : '',
+                pallet_qty: item.actualPalletQty,
+                product_qty: unloadInvHistory.qty || item.actualPackQty,
+                product_pack_qty: item.packQty,
+                descrepancy_qty: (unloadInvHistory.qty || item.actualPackQty) - item.packQty,
+                product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
+                product_total_uom_value: `${
+                  Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100
+                }`,
+                product_uom: `${unloadInvHistory.uom || item.uom}`,
+                product_gross_weight: item.product.grossWeight || null,
+                unit_price: item.unitPrice || null,
+                expiry_date: unloadInvHistory.expiryDate && unloadInvHistory.expiryDate != '' ? new Date(unloadInvHistory.expiryDate).toISOString().split('T')[0] : '',
+                manufacture_date: item.manufactureDate,
+                reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
+                remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
+              }
+            })
+        )
+        return acc
+      }, [])
+      .map((item, idx) => ({ list_no: idx + 1, ...item })),
+    serialNumber: foundInventoryItem
+  }
+
+  const formData = new FormData()
+  formData.append('template', template)
+  formData.append('jsonString', JSON.stringify(data))
+
+  const response = await fetch(REPORT_API_URL, {
+    method: 'POST',
+    body: formData
+  })
+
+  return await response.text()
+}

package/server/controllers/render-grn.ts

@@ -1,7 +1,8 @@
+import _ from 'lodash'
 import FormData from 'form-data'
 import fetch from 'node-fetch'
 import { getRepository, IsNull, Not } from 'typeorm'
-
+import { InventoryItem } from '@things-factory/warehouse-base'
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
@@ -32,6 +33,10 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
   const foundGAN: ArrivalNotice = foundGRN.arrivalNotice
   const ownRefNo = foundGAN.refNo
 
+  const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
+    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
+  )
+
   // 4. find customer bizplace
   const partnerBiz: Bizplace = foundGRN.bizplace
 
@@ -47,25 +52,25 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
   })
 
   const qbReducedInventory = getRepository(ReducedInventoryHistory)
-    .createQueryBuilder(`ivh`)
-    .select(`product_id`, `productId`)
-    .addSelect(`batch_id`, `batchId`)
-    .addSelect(`reusable_pallet_id`, `reusablePalletId`)
-    .addSelect(`packing_type`, `packingType`)
-    .addSelect(`sum(qty)`, `qty`)
-    .addSelect(`sum(uom_value)`, `uomValue`)
-    .addSelect(`uom`, `uom`)
-    .addSelect(`count(distinct pallet_id)`, `pallet`)
-    .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, `expiryDate`)
-    .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, `palletId`)
-    .where(`ivh.domain_id = :domainId`, { domainId: domain.id })
-    .andWhere(`ivh.ref_order_id = :refOrderId`, { refOrderId: foundGAN.id })
+    .createQueryBuilder('ivh')
+    .select('product_id', 'productId')
+    .addSelect('batch_id', 'batchId')
+    .addSelect('reusable_pallet_id', 'reusablePalletId')
+    .addSelect('packing_type', 'packingType')
+    .addSelect('sum(qty)', 'qty')
+    .addSelect('sum(uom_value)', 'uomValue')
+    .addSelect('uom', 'uom')
+    .addSelect('count(distinct pallet_id)', 'pallet')
+    .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, 'expiryDate')
+    .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
+    .where('ivh.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
     .andWhere(`ivh.transaction_type = 'UNLOADING'`)
-    .groupBy(`reusable_pallet_id`)
-    .addGroupBy(`product_id`)
-    .addGroupBy(`batch_id`)
-    .addGroupBy(`packing_type`)
-    .addGroupBy(`uom`)
+    .groupBy('reusable_pallet_id')
+    .addGroupBy('product_id')
+    .addGroupBy('batch_id')
+    .addGroupBy('packing_type')
+    .addGroupBy('uom')
     .getRawMany()
 
   // 5. find domain contact point
@@ -142,6 +147,32 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     cop = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundCop.path, 'base64'))
   }
 
+  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
+
+  const tempIndexArr = []
+
+  const tempTotalQuantity = []
+
+  Object.keys(filterInventoryItem).forEach(k => {
+    const tempIndex = foundInventoryItem.findIndex(i => {
+      return i.sku == k
+    })
+
+    tempIndexArr.push(tempIndex)
+  })
+
+  Object.values(filterInventoryItem).forEach(k => {
+    const tempQuantity = k.length
+
+    tempTotalQuantity.push(tempQuantity)
+  })
+
+  tempIndexArr.forEach((t, index) => {
+    if (t >= 0)
+      foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+  })
+
+
   const data = {
     logo_url: logo,
     sign_url: signature,
@@ -166,6 +197,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
     unload_date: DateTimeConverter.date(foundWS.endedAt),
     ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
+    ref_no_only: ownRefNo ? ` ${foundGAN.refNo}` : '',
     ref_no1: foundGAN.refNo2 ? `${foundGAN.refNo2}` : '',
     ref_no2: foundGAN.refNo3 ? `${foundGAN.refNo3}` : '',
     received_date: DateTimeConverter.date(foundWS.endedAt),
@@ -188,6 +220,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
       return {
         list_no: idx + 1,
         product_sku: `${item.product.sku}`,
+        product_brand_sku: `${item.product.brandSku}`,
         product_name: `${item.product.name}(${item.product.description})`,
         product_desc: item.product.description,
         product_nameOnly: item.product.name,
@@ -198,17 +231,18 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
         pallet_qty: item.actualPalletQty,
         product_qty: unloadInvHistory.qty || item.actualPackQty,
         product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
-        product_total_uom_value: `${
-          Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100
-        }`,
+        product_total_uom_value: `${Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100
+          }`,
         product_uom: `${unloadInvHistory.uom || item.uom}`,
         product_gross_weight: item.product.grossWeight || null,
         unit_price: item.unitPrice || null,
         expiry_date: unloadInvHistory.expiryDate || '',
+        manufacture_date: item.manufactureDate,
         reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
         remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
       }
-    })
+    }),
+    serialNumber: foundInventoryItem
   }
 
   const formData = new FormData()