@things-factory/worksheet-base 5.0.0-alpha.3 → 5.0.0-alpha.30

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-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
 
@@ -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()

package/server/controllers/render-invoices.ts

@@ -1,11 +1,11 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
+import { getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
-import { Invoice, ReleaseGood } from '@things-factory/sales-base'
+import { InvoiceProduct, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
@@ -22,20 +22,34 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
     let result = await Promise.all(
       req.roIds.map(async roId => {
         try {
-          const foundReleaseGoods: ReleaseGood = await getRepository(ReleaseGood).findOne({
-            where: { domain, id: roId },
-            relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
-          })
-
-          if (foundReleaseGoods) {
-            const foundInvoice: Invoice = await getRepository(Invoice).findOne({
-              where: { releaseGood: foundReleaseGoods },
-              relations: ['invoiceProducts', 'invoiceProducts.product', 'domain', 'creator', 'updater']
-            })
-
-            const partnerBiz: Bizplace = foundReleaseGoods.bizplace
+          const qb: SelectQueryBuilder<ReleaseGood> = await getRepository(ReleaseGood)
+            .createQueryBuilder('rg')
+            .innerJoinAndSelect('rg.domain', 'domain')
+            .innerJoinAndSelect('rg.bizplace', 'bizplace')
+            .innerJoinAndSelect('bizplace.domain', 'bizplace_domain')
+            .innerJoinAndSelect('bizplace.company', 'company')
+            .innerJoinAndSelect('company.domain', 'company_domain')
+            .innerJoinAndSelect('invoices', 'iv', 'rg.ref_no = iv.ref_no_1')
+            .leftJoinAndSelect('marketplace_orders', 'mo', 'rg.id = mo.release_order_id::uuid')
+            .leftJoinAndSelect('marketplace_order_shippings', 'mos', 'rg.id = mos.release_order_id::uuid')
+            .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
+            .where('rg.id = :roId')
+            .andWhere('rg.domain = :domainId')
+            .setParameters({ roId, domainId: domain.id })
+
+          let record: any = await qb.getRawOne()
+
+          if (record) {
+            const partnerBiz: Partial<Bizplace> = {
+              id: record.bizplace_id,
+              name: record.bizplace_name,
+              address: record.bizplace_address
+            }
 
-            const partnerCompanyDomain: Domain = foundReleaseGoods.bizplace.company.domain
+            const partnerCompanyDomain: Partial<Domain> = {
+              id: record.company_domain_id,
+              name: record.company_domain_name
+            }
 
             const foundTemplate: Attachment = await getRepository(Attachment).findOne({
               where: { domain: partnerCompanyDomain, category: TEMPLATE_TYPE.INVOICE_TEMPLATE }
@@ -44,43 +58,74 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
             const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
 
             let fullBillingAddress = [
-              foundInvoice.billingAddress1,
-              foundInvoice.billingAddress2,
-              foundInvoice.billingAddress3,
-              foundInvoice.billingAddress4,
-              foundInvoice.billingAddress5
+              record.iv_billing_address_1,
+              record.iv_billing_address_2,
+              record.iv_billing_address_3,
+              record.iv_billing_address_4,
+              record.iv_billing_address_5
             ]
 
             let fullDeliveryAddress = [
-              foundInvoice.deliveryAddress1,
-              foundInvoice.deliveryAddress2,
-              foundInvoice.deliveryAddress3,
-              foundInvoice.deliveryAddress4,
-              foundInvoice.deliveryAddress5
+              record.iv_delivery_address_1,
+              record.iv_delivery_address_2,
+              record.iv_delivery_address_3,
+              record.iv_delivery_address_4,
+              record.iv_delivery_address_5
             ]
 
-            let date = DateTimeConverter.date(
-              new Date((foundInvoice.issuedOn || foundInvoice.createdAt) - timezoneOffSet)
+            const qb: SelectQueryBuilder<InvoiceProduct> = await getRepository(InvoiceProduct)
+              .createQueryBuilder('ip')
+              .innerJoin('invoices', 'iv', 'iv.id = ip.invoice_id')
+              .leftJoin('release_goods', 'rg', 'rg.ref_no = iv.ref_no_1')
+              .where('rg.id = :roId')
+              .andWhere('rg.domain = :domainId')
+              .setParameters({ roId, domainId: domain.id })
+
+            let items: any[] = await qb.getRawMany()
+
+            const product_list = items.map((item, idx) => {
+              return {
+                list_no: idx + 1,
+                product_sku: item.ip_sku,
+                product_name: item.ip_name,
+                product_desc: item.ip_description,
+                product_qty: item.ip_qty,
+                product_other_charges: item.ip_other_charges,
+                product_paid_price: getRoundedValue(item.ip_paid_price || item.ip_unit_price),
+                product_unit_price: getRoundedValue(item.ip_unit_price),
+                product_total_paid_price: getRoundedValue(
+                  (item.ip_paid_price || item.ip_unit_price) * parseInt(item.ip_qty || 0)
+                ),
+                product_total_unit_price: getRoundedValue(item.ip_unit_price * parseInt(item.ip_qty || 0)),
+                original_price: getRoundedValue(parseFloat(item.ip_unit_price || 0)),
+                product_discount: getRoundedValue(parseFloat(item.ip_discount || 0)),
+                shipping_fee_paid_by_customer: getRoundedValue(parseFloat(item.ip_shipping_fee_paid_by_customer || 0))
+              }
+            })
+
+            const sumProductTotalPaidPrice: number = product_list.reduce(
+              (total, item) => total + item.product_total_paid_price,
+              0
             )
+
+            let date = DateTimeConverter.date(new Date((record.iv_issued_on || record.iv_created_at) - timezoneOffSet))
             const data = {
-              order_no: foundReleaseGoods.name,
-              ref_no: foundReleaseGoods.refNo,
-              deliver_to: foundInvoice.deliverTo,
-              deliver_to_phone: foundInvoice.deliverToPhone || '',
-              bill_to: foundInvoice.billTo,
-              bill_to_phone: foundInvoice.billToPhone || '',
+              order_no: record.rg_name,
+              ref_no: record.rg_ref_no,
+              from: record.iv_from,
               customer_address: partnerBiz.address,
-              delivery_date: date,
-              store_name: foundInvoice.from,
-              billing_address_1: foundInvoice.billingAddress1,
-              billing_address_2: foundInvoice.billingAddress2,
-              billing_address_3: foundInvoice.billingAddress3,
-              billing_address_4: foundInvoice.billingAddress4,
-              billing_address_5: foundInvoice.billingAddress5,
-              billing_postcode: foundInvoice.billingPostcode,
-              billing_city: foundInvoice.billingCity,
-              billing_state: foundInvoice.billingState,
-              billing_country: foundInvoice.billingCountry,
+              store_name: record.iv_from,
+              bill_to: record.iv_bill_to,
+              bill_to_phone: record.iv_bill_to_phone,
+              billing_address_1: record.iv_billing_address_1,
+              billing_address_2: record.iv_billing_address_2,
+              billing_address_3: record.iv_billing_address_3,
+              billing_address_4: record.iv_billing_address_4,
+              billing_address_5: record.iv_billing_address_5,
+              billing_postcode: record.iv_billing_postcode,
+              billing_city: record.iv_billing_city,
+              billing_state: record.iv_billing_state,
+              billing_country: record.iv_billing_country,
               full_billing_address: fullBillingAddress
                 .reduce((acc, itm) => {
                   if (itm && itm.trim() != '') {
@@ -90,15 +135,18 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
                   return acc
                 }, [])
                 .join(' '),
-              delivery_address_1: foundInvoice.deliveryAddress1,
-              delivery_address_2: foundInvoice.deliveryAddress2,
-              delivery_address_3: foundInvoice.deliveryAddress3,
-              delivery_address_4: foundInvoice.deliveryAddress4,
-              delivery_address_5: foundInvoice.deliveryAddress5,
-              delivery_postcode: foundInvoice.deliveryPostcode,
-              delivery_city: foundInvoice.deliveryCity,
-              delivery_state: foundInvoice.deliveryState,
-              delivery_country: foundInvoice.deliveryCountry,
+              delivery_date: date,
+              deliver_to: record.iv_deliver_to,
+              deliver_to_phone: record.iv_deliver_to_phone,
+              delivery_address_1: record.iv_delivery_address_1,
+              delivery_address_2: record.iv_delivery_address_2,
+              delivery_address_3: record.iv_delivery_address_3,
+              delivery_address_4: record.iv_delivery_address_4,
+              delivery_address_5: record.iv_delivery_address_5,
+              delivery_postcode: record.iv_delivery_postcode,
+              delivery_city: record.iv_delivery_city,
+              delivery_state: record.iv_delivery_state,
+              delivery_country: record.iv_delivery_country,
               full_delivery_address: fullDeliveryAddress
                 .reduce((acc, itm) => {
                   if (itm && itm.trim() != '') {
@@ -108,22 +156,16 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
                   return acc
                 }, [])
                 .join(' '),
-              product_list: foundInvoice.invoiceProducts.map((item, idx) => {
-                return {
-                  list_no: idx + 1,
-                  product_sku: item.sku,
-                  product_name: item.name,
-                  product_desc: item.description,
-                  product_qty: item.qty,
-                  product_other_charges: item.otherCharges,
-                  product_paid_price: parseFloat(item.paidPrice || item.unitPrice).toFixed(2),
-                  product_unit_price: parseFloat(item.unitPrice).toFixed(2),
-                  product_total_paid_price: (
-                    parseFloat(item.paidPrice || item.unitPrice) * parseFloat(item.qty)
-                  ).toFixed(2),
-                  product_total_unit_price: (parseFloat(item.unitPrice) * parseFloat(item.qty)).toFixed(2)
-                }
-              })
+              fulfillment_center: record.fc_name,
+              voucher_amount: getRoundedValue(parseFloat(record.mo_voucher_amount || 0)),
+              actual_shipping_fee: getRoundedValue(parseFloat(record.mos_actual_shipping_fee || 0)),
+              sub_total: sumProductTotalPaidPrice,
+              grand_total: getRoundedValue(
+                sumProductTotalPaidPrice -
+                  parseFloat(record.mo_voucher_amount || 0) +
+                  parseFloat(record.mos_actual_shipping_fee || 0)
+              ),
+              product_list
             }
 
             const formData = new FormData()
@@ -137,18 +179,23 @@ export async function renderInvoices({ req, timezoneOffSet }, context: any) {
 
             return await response.text()
           }
-          return ''
+          return null
         } catch (ex) {
-          return ''
+          return null
         }
       })
     )
 
-    if (result.length <= 0) {
+    if (result.filter(x => x != null).length <= 0) {
       throw Error('No invoice found!')
     }
+
     return result.join()
   } catch (ex) {
     throw ex
   }
 }
+
+function getRoundedValue(value = 0) {
+  return Math.round((value + Number.EPSILON) * 100) / 100
+}

package/server/controllers/render-orientage-do.ts

@@ -150,20 +150,20 @@ export async function renderOrientageDO({ doNo }, context: any) {
         pack_size: matchedProductDetail
           ? matchedProductDetail.uomValue
             ? matchedProductDetail.uomValue +
-              ' ' +
-              matchedProductDetail.uom +
-              (inventory.product.volumeSize
-                ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
-                : '')
+            ' ' +
+            matchedProductDetail.uom +
+            (inventory.product.volumeSize
+              ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
+              : '')
             : null
           : inventory.product.primaryValue
-          ? inventory.product.primaryValue +
+            ? inventory.product.primaryValue +
             ' ' +
             inventory.product.primaryUnit +
             (inventory.product.volumeSize
               ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
               : '')
-          : null,
+            : null,
         aux_value_3: matchedProductDetail ? matchedProductDetail.auxValue3 : inventory.product.auxValue3,
         product_qty: targetInventory.inventory.warehouse !== 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
         product_qty_damage: targetInventory.inventory.warehouse === 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
@@ -176,15 +176,15 @@ export async function renderOrientageDO({ doNo }, context: any) {
             ? matchedProductDetail.volume
             : 0
           : inventory?.product?.volume
-          ? inventory.product.volume
-          : 0,
+            ? inventory.product.volume
+            : 0,
         total_volume: matchedProductDetail
           ? matchedProductDetail.volume
             ? Number((matchedProductDetail.volume * targetInventory.releaseQty).toFixed(4))
             : 0
           : inventory?.product?.volume
-          ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
-          : 0,
+            ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
+            : 0,
         remark: targetInventory.remark,
         inventory_remark: inventory.remark,
         cross_docking: targetInventory.crossDocking,

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

@@ -123,16 +123,16 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
         pack_size: matchedProductDetail
           ? matchedProductDetail.uomValue
             ? matchedProductDetail.uomValue +
-              ' ' +
-              matchedProductDetail.uom +
-              (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
+            ' ' +
+            matchedProductDetail.uom +
+            (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
             : null
           : item.product.primaryValue
-          ? item.product.primaryValue +
+            ? item.product.primaryValue +
             ' ' +
             item.product.primaryUnit +
             (item.product.volumeSize ? ' x ' + (parseFloat(item.product.volumeSize) / 100).toFixed(2) + ' L' : '')
-          : null,
+            : null,
         pack_qty: item.packQty ? item.packQty : 0,
         actual_pack_qty: item.actualPackQty ? item.actualPackQty : 0,
         container_no: foundGAN.containerNo ? foundGAN.containerNo : '',
@@ -142,23 +142,24 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
             ? matchedProductDetail.volume
             : 0
           : item?.product?.volume
-          ? item.product.volume
-          : 0,
+            ? item.product.volume
+            : 0,
         total_volume: matchedProductDetail
           ? matchedProductDetail.volume
             ? Number((matchedProductDetail.volume * item.actualPackQty).toFixed(4))
             : 0
           : item?.product?.volume
-          ? Number((item.product.volume * item.actualPackQty).toFixed(4))
-          : 0,
+            ? Number((item.product.volume * item.actualPackQty).toFixed(4))
+            : 0,
+        manufacture_year: item.manufactureDate ? new Date(item.manufactureDate).getFullYear() : null,
         manufacture_date: item.manufactureDate ? item.manufactureDate : null,
         literage: matchedProductDetail
           ? matchedProductDetail.packingSize
             ? parseFloat(matchedProductDetail.packingSize) * parseFloat(item.product.volumeSize)
             : 0
           : item.packingSize
-          ? parseFloat(item.packingSize) * parseFloat(item.product.volumeSize)
-          : 0,
+            ? parseFloat(item.packingSize) * parseFloat(item.product.volumeSize)
+            : 0,
         remark: item.remark || ''
       }
     })