@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

package/server/controllers/render-manifest.ts

@@ -1,19 +1,18 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Manifest, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
-import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
 import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderManifest({ manifestNo }, context: any) {
+export async function renderManifest({ manifestNo }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -21,19 +20,19 @@ export async function renderManifest({ manifestNo }, context: any) {
 
   // 2. find manifest
   const manifest: Manifest = await getRepository(Manifest).findOne({
-    where: { domain, name: manifestNo },
+    where: { domain: { id: domain.id }, name: manifestNo },
     relations: ['domain']
   })
 
   // find release good
   let releaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
-    where: { domain, manifest },
+    where: { domain: { id: domain.id }, manifest },
     relations: ['bizplace']
   })
 
   // 7. find grn template based on category
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.MANIFEST_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.MANIFEST_TEMPLATE }
   })
 
   const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
@@ -43,23 +42,25 @@ export async function renderManifest({ manifestNo }, context: any) {
     manifest_no: manifest?.name,
     manifest_date: DateTimeConverter.date(manifest?.createdAt).toString(),
     total_list: releaseGoods?.length || 0,
-    product_list: await Promise.all (releaseGoods.map(async(item, idx) => {
-      const customerBizplaceId: string = item.bizplace.id
-      const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId)
-      return {
-        list_no: idx + 1,
-        order_no: item?.refNo,
-        tracking_no: item?.trackingNo,
-        phone: item?.phone1,
-        delivery_date: DateTimeConverter.date(manifest?.dispatchedAt).toString(),
-        attention_to: item?.attentionTo,
-        delivery_address: item?.deliveryAddress1,
-        postal_code_city: `${item?.postalCode}, ${item?.city}`,
-        remark: item?.remark,
-        status: item?.status,
-        company_domain_name: custCompanyBizplace.domain.name
-      }
-    }))
+    product_list: await Promise.all(
+      releaseGoods.map(async (item, idx) => {
+        const customerBizplaceId: string = item.bizplace.id
+        const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId)
+        return {
+          list_no: idx + 1,
+          order_no: item?.refNo,
+          tracking_no: item?.trackingNo,
+          phone: item?.phone1,
+          delivery_date: DateTimeConverter.date(manifest?.dispatchedAt).toString(),
+          attention_to: item?.attentionTo,
+          delivery_address: item?.deliveryAddress1,
+          postal_code_city: `${item?.postalCode}, ${item?.city}`,
+          remark: item?.remark,
+          status: item?.status,
+          company_domain_name: custCompanyBizplace.domain.name
+        }
+      })
+    )
   }
 
   const formData = new FormData()

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

@@ -1,6 +1,5 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
@@ -8,18 +7,18 @@ import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Product } from '@things-factory/product-base'
 import { DeliveryOrder, OrderInventory } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderManualDO({ doNo }, context: any) {
-  const { domain }: { domain: Domain } = context.state
+export async function renderManualDO({ doNo }, context: ResolverContext) {
+  const { domain } = context.state
 
   // #1. find delivery order based on name
   const foundDO: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
-    where: { domain, name: doNo },
+    where: { domain: { id: domain.id }, name: doNo },
     relations: [
       'domain',
       'bizplace',
@@ -38,7 +37,7 @@ export async function renderManualDO({ doNo }, context: any) {
   let foundCP: ContactPoint = null
   if (foundDO?.contactPointRefId) {
     foundCP = await getRepository(ContactPoint).findOne({
-      where: { domain, id: foundDO.contactPointRefId }
+      where: { domain: { id: domain.id }, id: foundDO.contactPointRefId }
     })
   }
 
@@ -60,23 +59,23 @@ export async function renderManualDO({ doNo }, context: any) {
 
   // #5. find domain contact point
   const foundWarehouseCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: domainBizplace, type: 'WAREHOUSE' }
+    where: { domain: { id: domain.id }, bizplace: domainBizplace, type: 'WAREHOUSE' }
   })
 
   // #6. find list of order inventory
   const orderInventories: OrderInventory[] = await getRepository(OrderInventory).find({
-    where: { domain, deliveryOrder: foundDO },
+    where: { domain: { id: domain.id }, deliveryOrder: foundDO },
     relations: ['product']
   })
 
   // #7. find DO template and logo
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.DO_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.DO_TEMPLATE }
   })
 
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })

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

@@ -1,6 +1,6 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { Equal, getRepository, In } from 'typeorm'
+import { Equal, In } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
@@ -8,7 +8,7 @@ import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { ProductDetail } from '@things-factory/product-base'
 import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
 
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
@@ -16,12 +16,12 @@ import { Worksheet, WorksheetDetail } from '../entities'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderOrientageDO({ doNo }, context: any) {
+export async function renderOrientageDO({ doNo }, context: ResolverContext) {
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
   }) //.. find domain
   const foundDO: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
-    where: { domain, name: doNo },
+    where: { domain: { id: domain.id }, name: doNo },
     relations: [
       'domain',
       'bizplace',
@@ -40,7 +40,7 @@ export async function renderOrientageDO({ doNo }, context: any) {
   let foundCP: ContactPoint = null
   if (foundDO?.contactPointRefId) {
     foundCP = await getRepository(ContactPoint).findOne({
-      where: { domain, id: foundDO.contactPointRefId }
+      where: { domain: { id: domain.id }, id: foundDO.contactPointRefId }
     })
   }
 
@@ -64,29 +64,29 @@ export async function renderOrientageDO({ doNo }, context: any) {
 
   // 5. find domain contact point
   const foundWarehouseCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: domainBizplace, type: 'WAREHOUSE' }
+    where: { domain: { id: domain.id }, bizplace: domainBizplace, type: 'WAREHOUSE' }
   })
 
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, releaseGood: foundRO },
+    where: { domain: { id: domain.id }, releaseGood: foundRO },
     relations: ['updater']
   })
 
   //find reusable pallet
   const foundRP: Pallet[] = await getRepository(Pallet).find({
-    where: { domain, refOrderNo: foundRO.name }
+    where: { domain: { id: domain.id }, refOrderNo: foundRO.name }
   })
 
   //find list of loaded inventory
   const targetInventories: OrderInventory[] = await getRepository(OrderInventory).find({
-    where: { domain, deliveryOrder: foundDO },
+    where: { domain: { id: domain.id }, deliveryOrder: foundDO },
     relations: ['inventory']
   })
   const orderInvIds: string[] = targetInventories.map((oi: any) => oi.id)
 
   const foundWSD: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
     where: {
-      domain,
+      domain: { id: domain.id },
       targetInventory: In(orderInvIds),
       type: WORKSHEET_TYPE.LOADING,
       status: Equal(WORKSHEET_STATUS.DONE)
@@ -103,12 +103,12 @@ export async function renderOrientageDO({ doNo }, context: any) {
   })
 
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.DO_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.DO_TEMPLATE }
   })
 
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })
@@ -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,
@@ -274,15 +274,64 @@ export async function renderOrientageDO({ doNo }, context: any) {
     company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
     warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
     company_email: foundWarehouseCP.email,
-    customer_name: foundCP ? foundCP.name : null,
-    customer_delivery_address: foundCP ? foundCP.address : null,
-    customer_billing_address: foundCP ? foundCP.billingAddress : null,
-    customer_phone: foundCP ? foundCP.phone : null,
+    customer_name:
+      foundCP?.name ||
+      foundDO.attentionTo ||
+      foundDO.attentionCompany ||
+      foundRO?.attentionTo ||
+      foundRO?.attentionCompany ||
+      null,
+    customer_delivery_address:
+      foundCP?.address ||
+      [
+        foundDO?.deliveryAddress1,
+        foundDO?.deliveryAddress2,
+        foundDO?.deliveryAddress3,
+        foundDO?.deliveryAddress4,
+        foundDO?.deliveryAddress5,
+        foundDO?.postalCode,
+        foundDO?.city,
+        foundDO?.state,
+        foundDO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      [
+        foundRO?.deliveryAddress1,
+        foundRO?.deliveryAddress2,
+        foundRO?.deliveryAddress3,
+        foundRO?.deliveryAddress4,
+        foundRO?.deliveryAddress5,
+        foundRO?.postalCode,
+        foundRO?.city,
+        foundRO?.state,
+        foundRO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      null,
+    customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || null,
+    customer_phone: foundCP?.phone || foundDO?.phone1 || foundRO.phone1 || null,
     customer_fax: foundCP ? foundCP.fax : null,
-    customer_email: foundCP ? foundCP.email : null,
-    customer_company: foundCP ? foundCP.companyName : null,
+    customer_email: foundCP?.email || foundRO.email || null,
+    customer_company: foundCP?.companyName || foundDO.attentionCompany || foundRO.attentionCompany || null,
     own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
-    destination: foundDO.to || '',
+    destination:
+      foundDO.to ||
+      [
+        foundDO?.deliveryAddress1,
+        foundDO?.deliveryAddress2,
+        foundDO?.deliveryAddress3,
+        foundDO?.deliveryAddress4,
+        foundDO?.deliveryAddress5,
+        foundDO?.postalCode,
+        foundDO?.city,
+        foundDO?.state,
+        foundDO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      '',
     ref_no: ownRefNo,
     ref_no1: ownRefNo2 ? ownRefNo2 : '',
     ref_no2: ownRefNo3 ? ownRefNo3 : '',

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

@@ -1,6 +1,6 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { getRepository, IsNull, Not } from 'typeorm'
+import { IsNull, Not } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
@@ -14,7 +14,7 @@ import {
   ORDER_STATUS,
   OrderProduct
 } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
 import { Worksheet } from '../entities'
@@ -22,7 +22,7 @@ import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderOrientageGRN({ grnNo }, context: any) {
+export async function renderOrientageGRN({ grnNo }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -30,7 +30,7 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
 
   // 2. find grn
   const foundGRN: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
-    where: { domain, name: grnNo },
+    where: { domain: { id: domain.id }, name: grnNo },
     relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
   })
 
@@ -56,29 +56,39 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
 
   // 5. find domain contact point
   const foundCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: domainBizplace }
+    where: { domain: { id: domain.id }, bizplace: domainBizplace }
   })
 
   // 6. find unloading worksheet
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, arrivalNotice: foundGAN, type: ORDER_PRODUCT_STATUS.UNLOADING, status: ORDER_STATUS.DONE },
+    where: {
+      domain: { id: domain.id },
+      arrivalNotice: foundGAN,
+      type: ORDER_PRODUCT_STATUS.UNLOADING,
+      status: ORDER_STATUS.DONE
+    },
     relations: ['worksheetDetails']
   })
 
   const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
-    where: { domain, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()), actualPackQty: Not(IsNull()) },
+    where: {
+      domain: { id: domain.id },
+      arrivalNotice: foundGAN,
+      actualPalletQty: Not(IsNull()),
+      actualPackQty: Not(IsNull())
+    },
     relations: ['product', 'product.productDetails']
   })
 
   // 7. find grn template based on category
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.GRN_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.GRN_TEMPLATE }
   })
 
   // 8. find grn logo
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })
@@ -123,16 +133,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,15 +152,15 @@ 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
@@ -158,8 +168,8 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
             ? 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 || ''
       }
     })

package/server/controllers/render-po.ts

@@ -1,20 +1,19 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { 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 { InvoiceProduct, ReleaseGood, PurchaseOrder, PurchaseOrderOtherCharge, OrderProduct } from '@things-factory/sales-base'
-
-import { Domain } from '@things-factory/shell'
+import { OrderProduct, PurchaseOrder, PurchaseOrderOtherCharge } from '@things-factory/sales-base'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE } from '../constants'
 import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderPO({ req, timezoneOffSet }, context: any) {
+export async function renderPO({ req, timezoneOffSet }, context: ResolverContext) {
   try {
     const domain: Domain = await getRepository(Domain).findOne({
       where: { id: context.state.domain.id }
@@ -31,6 +30,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
             .innerJoinAndSelect('bizplace.company', 'company')
             .innerJoinAndSelect('company.domain', 'company_domain')
             .leftJoinAndSelect('contact_points', 'cp', 'po.supplier_id = cp.id')
+            .leftJoinAndSelect('arrival_notices', 'an', 'an.purchase_order_id = po.id')
             .where('po.id = :poId')
             .andWhere('po.domain = :domainId')
             .setParameters({ poId, domainId: domain.id })
@@ -63,7 +63,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
 
             const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
 
-            const poocQb: SelectQueryBuilder<PurchaseOrderOtherCharge> = await getRepository(PurchaseOrderOtherCharge)
+            const poocQb: SelectQueryBuilder<PurchaseOrderOtherCharge> = getRepository(PurchaseOrderOtherCharge)
               .createQueryBuilder('pooc')
               .where('pooc.purchase_order_id = :poId')
               .andWhere('pooc.apply_in_items = false')
@@ -71,15 +71,15 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
 
             let poOtherCharges: any[] = await poocQb.getRawMany()
 
-
-            const qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct)
+            const qb: SelectQueryBuilder<OrderProduct> = getRepository(OrderProduct)
               .createQueryBuilder('op')
               .innerJoin('domains', 'd', 'op.domain_id = d.id')
-              .leftJoinAndSelect('purchase_orders', 'po', 'po.id = op.purchase_order_id')
-              .leftJoinAndSelect('products', 'p', 'op.product_id = p.id')
+              .innerJoinAndSelect('purchase_orders', 'po', 'po.id = op.purchase_order_id')
+              .innerJoinAndSelect('products', 'p', 'op.product_id = p.id')
               .where('op.purchase_order_id = :poId')
               .andWhere('op.domain = :domainId')
               .setParameters({ poId, domainId: domain.id })
+              .orderBy('p.sku')
 
             let items: any[] = await qb.getRawMany()
 
@@ -89,17 +89,21 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
                 product_sku: item.p_sku,
                 product_name: item.p_name,
                 product_desc: item.p_description,
+                product_remark: item.op_remark,
                 product_qty: item.op_pack_qty,
                 product_uom: item.op_uom,
                 product_other_charges: item.ip_other_charges,
-                product_unit_price: (item.op_unit_price).toFixed(2),
-                product_total_price: ((((item.op_unit_price || 0) * item.op_pack_qty) - (item.op_discount_amt || 0)) * (1 + (item.op_tax_rate / 100))).toFixed(2),
+                product_unit_price: item.op_unit_price.toFixed(2),
+                product_total_price: (
+                  ((item.op_unit_price || 0) * item.op_pack_qty - (item.op_discount_amt || 0)) *
+                  (1 + item.op_tax_rate / 100)
+                ).toFixed(2),
                 product_tax_rate: item.op_tax_rate,
-                product_disc_amt: item.op_discount_amt
+                product_disc_amt: item.op_discount_amt,
+                ref_no: record.po_ref_no
               }
             })
 
-
             let date = DateTimeConverter.date(new Date(record.po_created_at - timezoneOffSet))
             let eta = DateTimeConverter.date(new Date(record.po_eta_date))
 
@@ -114,6 +118,7 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
               company_name: record.company_description,
               company_address: record.company_address,
               company_postal_code: record.company_postal_code,
+              an_name: record.an_name,
               po_number: record.po_name,
               po_order_date: date,
               po_delivery_date: eta,
@@ -126,14 +131,20 @@ export async function renderPO({ req, timezoneOffSet }, context: any) {
               product_list,
               charges_list: [
                 {
-                  field: 'SUBTOTAL', value: subtotal.toFixed(2)
+                  field: 'SUBTOTAL',
+                  value: subtotal.toFixed(2)
                 },
-                ...poOtherCharges.map(itm => { return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) } }),
+                ...poOtherCharges.map(itm => {
+                  return { field: itm.pooc_name.toUpperCase(), value: itm.pooc_total_amt.toFixed(2) }
+                }),
                 {
-                  field: 'TOTAL', value: (poOtherCharges.reduce((init, item) => {
-                    return init += (item.pooc_total_amt)
-                  }, subtotal) || 0).toFixed(2),
-                },
+                  field: 'TOTAL',
+                  value: (
+                    poOtherCharges.reduce((init, item) => {
+                      return (init += item.pooc_total_amt)
+                    }, subtotal) || 0
+                  ).toFixed(2)
+                }
               ]
             }