@things-factory/operato-hub 4.3.329 → 4.3.331

package/server/graphql/resolvers/email/send-emails.ts

@@ -1,15 +1,26 @@
 import * as cronParser from 'cron-parser'
 import gql from 'graphql-tag'
-import { getRepository, In } from 'typeorm'
-
-import { Partner, User } from '@things-factory/auth-base'
+import {
+  getRepository,
+  In
+} from 'typeorm'
+
+import {
+  Partner,
+  User
+} from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { objDataToExcel, sendEmailSes } from '@things-factory/email-base'
+import {
+  objDataToExcel,
+  sendEmailSes
+} from '@things-factory/email-base'
 import { logger } from '@things-factory/env'
 import { GraphqlLocalClient } from '@things-factory/shell'
 
 import { Email } from '../../../entities'
 
+const { PerformanceObserver, performance } = require('node:perf_hooks')
+
 const EMAIL_SEARCH_INTERVAL = 35
 
 export const sendEmailsResolver = {
@@ -30,7 +41,7 @@ export const sendEmailsResolver = {
 
         if (dag < now && dag > thirtyMinsAgo) {
           try {
-            processEmailCronJob(email, startDate.toISOString(), now.toISOString()) // removed await
+              processEmailCronJob(email, startDate.toISOString(), now.toISOString()) // removed await
           } catch (e) {
             logger.error(`[auto_email_log_by_id(${email.id})] ${e}`)
           }
@@ -39,171 +50,197 @@ export const sendEmailsResolver = {
     } catch (e) {
       logger.error(`[auto_email_log] ${e}`)
     }
-
     return true
   }
 }
 
 function replaceValues(variablesString: string, values: any = []) {
-  for (let obj of values) {
-    variablesString = variablesString.replace(obj.name, obj.value)
-  }
-  return JSON.parse(variablesString)
+
+    for (let obj of values) {
+      variablesString = variablesString.replace(obj.name, obj.value)
+    }
+    return JSON.parse(variablesString)
+
 }
 
 // NOTE: might show unused because of usage in eval function
 function flattenObject(obj, delimiter = '|') {
-  var objResult = {}
-  for (var items in obj) {
-    if (!Object.hasOwnProperty.bind(obj)(items)) continue
 
-    if (!!obj[items] && typeof obj[items] == 'object') {
-      var flatObject = flattenObject(obj[items], delimiter)
-      for (var x in flatObject) {
-        if (!Object.hasOwnProperty.bind(flatObject)(x)) continue
+    var objResult = {}
+    for (var items in obj) {
+      if (!Object.hasOwnProperty.bind(obj)(items)) continue
+
+      if (!!obj[items] && typeof obj[items] == 'object') {
+        var flatObject = flattenObject(obj[items], delimiter)
+        for (var x in flatObject) {
+          if (!Object.hasOwnProperty.bind(flatObject)(x)) continue
 
-        objResult[items + delimiter + x] = flatObject[x]
+          objResult[items + delimiter + x] = flatObject[x]
+        }
+      } else {
+        objResult[items] = obj[items]
       }
-    } else {
-      objResult[items] = obj[items]
     }
-  }
-  return objResult
+    return objResult
 }
 
 async function processEmailCronJob(email, fromDate, toDate) {
-  let attachments: any = []
-  // black list filtration
-  // let partnerBlackList = JSON.parse(email.partnerBlackList) || []
-
-  // partner list
-  let partnerList = JSON.parse(email.partnerList) || []
-
-  const partners: Partner[] = await getRepository(Partner).find({
-    where: { domain: email.domain, id: In(partnerList) },
-    relations: ['partnerDomain']
-  })
-
-  // retrieve and process xlsx attachmennts
-  for (let attachment of email.emailAttachments) {
-    let client = GraphqlLocalClient.client
-    let attachmentVariables = JSON.parse(attachment.attachmentVariables)
-    let numberOfMonths: number = attachmentVariables?.numberOfMonths || 1
-    let numberOfWeeks: number = attachmentVariables?.numberOfWeeks ? attachmentVariables.numberOfWeeks * 7 : 7
-    let numberOfDays: number = attachmentVariables?.numberOfDays || 1
-
-    for (let partner of partners) {
-      const bizplace: Bizplace = await getRepository(Bizplace).findOne({
-        where: { domain: partner.partnerDomain }
-      })
-
-      // date params processing
-      // let dateValue = new Date()
-      // let yesterday = dateValue.getDate() - 1
-      // let yesterdayBegin: any = new Date(dateValue.setDate(yesterday))
-      // let yesterdayEnd: any = new Date(dateValue.setDate(yesterday))
-
-      // yesterdayBegin.setHours(0, 0, 0, 0)
-      // yesterdayEnd.setHours(23, 59, 59, 999)
-
-      let timezoneOffset = email?.timezoneOffset || 0
-
-      let curDate = new Date()
-      let curDateForMonth = new Date(curDate)
-      let curDateForWeek = new Date(curDate)
-      let curDateForDay = new Date(curDate)
-
-      let prevMonth = curDateForMonth.getMonth() - numberOfMonths
-      let prevMonthBegin: any = new Date(curDateForMonth.setMonth(prevMonth))
-      prevMonthBegin.setHours(0, 0, 0, 0)
-      let prevMonthBeginDateTime = new Date(prevMonthBegin - timezoneOffset * 60000).toISOString()
-
-      let prevWeek = curDateForWeek.getDate() - numberOfWeeks // subtract 1 week
-      let prevWeekBegin: any = new Date(curDateForWeek.setDate(prevWeek))
-      prevWeekBegin.setHours(0, 0, 0, 0)
-      let prevWeekBeginDateTime = new Date(prevWeekBegin - timezoneOffset * 60000).toISOString()
-
-      let prevDay = curDateForDay.getDate() - numberOfDays // subtract 1 day
-      let prevDayBegin: any = new Date(curDateForDay.setDate(prevDay))
-      prevDayBegin.setHours(0, 0, 0, 0)
-      let prevDayBeginDateTime = new Date(prevDayBegin - timezoneOffset * 60000).toISOString()
-
-      let endDate: any = curDate
-      endDate.setHours(23, 59, 59, 999)
-      let endDateTime = new Date(endDate - timezoneOffset * 60000).toISOString()
-
-      // let fromDate = new Date(yesterdayBegin - timezoneOffset * 60000).toISOString()
-      // let toDate = new Date(yesterdayEnd - timezoneOffset * 60000).toISOString()
-
-      // to trace UTC conversion in production
-      logger.info(`[email_utc_conversion] fromDate: ${fromDate}, toDate: ${toDate}`)
-
-      let variables = replaceValues(attachment.variables, [
-        { name: '{{bizplaceId}}', value: `"${bizplace.id}"` },
-        { name: '{{timezoneOffset}}', value: `${timezoneOffset}` },
-        { name: '{{lastRunDateTime}}', value: `"${fromDate}"` },
-        { name: '{{toDateTime}}', value: `"${endDateTime}"` },
-        { name: '{{prevMonthBeginDateTime}}', value: `"${prevMonthBeginDateTime}"` },
-        { name: '{{prevWeekBeginDateTime}}', value: `"${prevWeekBeginDateTime}"` },
-        { name: '{{prevDayBeginDateTime}}', value: `"${prevDayBeginDateTime}"` }
-      ])
-
-      let user: User = email.creator
-      delete user.creatorId
-      delete user.updaterId
-
-      // might show unused because of usage in eval
-      const response = await client.query({
-        query: gql`
-          ${attachment.gqlString}
-        `,
-        variables: variables || {},
-        context: { state: { domain: email.domain, user } }
-      } as any)
-
-      let mappedResponse = eval(attachment.mappingFunction)
-
-      let header = JSON.parse(attachment.headers)
-
-      let excelResponse = await objDataToExcel({ name: 'name', data: { header, data: mappedResponse } })
-
-      attachments.push({
-        filename: `${bizplace.name} - ${attachment.name}.xlsx`,
-        content: excelResponse,
-        contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-      })
+
+  try {
+    performance.mark(`processEmailCronJob start:(${email.id})`)
+    // processEmailStartTime = performance.now()
+    let attachments: any = []
+    // black list filtration
+    // let partnerBlackList = JSON.parse(email.partnerBlackList) || []
+
+    // partner list
+    let partnerList = JSON.parse(email.partnerList) || []
+
+    const partners: Partner[] = await getRepository(Partner).find({
+      where: { domain: email.domain, id: In(partnerList) },
+      relations: ['partnerDomain']
+    })
+
+    // retrieve and process xlsx attachmennts
+    for (let attachment of email.emailAttachments) {
+      let client = GraphqlLocalClient.client
+      let attachmentVariables = JSON.parse(attachment.attachmentVariables)
+      let numberOfMonths: number = attachmentVariables?.numberOfMonths || 1
+      let numberOfWeeks: number = attachmentVariables?.numberOfWeeks ? attachmentVariables.numberOfWeeks * 7 : 7
+      let numberOfDays: number = attachmentVariables?.numberOfDays || 1
+
+      for (let partner of partners) {
+        const bizplace: Bizplace = await getRepository(Bizplace).findOne({
+          where: { domain: partner.partnerDomain }
+        })
+
+        // date params processing
+        // let dateValue = new Date()
+        // let yesterday = dateValue.getDate() - 1
+        // let yesterdayBegin: any = new Date(dateValue.setDate(yesterday))
+        // let yesterdayEnd: any = new Date(dateValue.setDate(yesterday))
+
+        // yesterdayBegin.setHours(0, 0, 0, 0)
+        // yesterdayEnd.setHours(23, 59, 59, 999)
+
+        let timezoneOffset = email?.timezoneOffset || 0
+
+        let curDate = new Date()
+        let curDateForMonth = new Date(curDate)
+        let curDateForWeek = new Date(curDate)
+        let curDateForDay = new Date(curDate)
+
+        let prevMonth = curDateForMonth.getMonth() - numberOfMonths
+        let prevMonthBegin: any = new Date(curDateForMonth.setMonth(prevMonth))
+        prevMonthBegin.setHours(0, 0, 0, 0)
+        let prevMonthBeginDateTime = new Date(prevMonthBegin - timezoneOffset * 60000).toISOString()
+
+        let prevWeek = curDateForWeek.getDate() - numberOfWeeks // subtract 1 week
+        let prevWeekBegin: any = new Date(curDateForWeek.setDate(prevWeek))
+        prevWeekBegin.setHours(0, 0, 0, 0)
+        let prevWeekBeginDateTime = new Date(prevWeekBegin - timezoneOffset * 60000).toISOString()
+
+        let prevDay = curDateForDay.getDate() - numberOfDays // subtract 1 day
+        let prevDayBegin: any = new Date(curDateForDay.setDate(prevDay))
+        prevDayBegin.setHours(0, 0, 0, 0)
+        let prevDayBeginDateTime = new Date(prevDayBegin - timezoneOffset * 60000).toISOString()
+
+        let endDate: any = curDate
+        endDate.setHours(23, 59, 59, 999)
+        let endDateTime = new Date(endDate - timezoneOffset * 60000).toISOString()
+
+        // let fromDate = new Date(yesterdayBegin - timezoneOffset * 60000).toISOString()
+        // let toDate = new Date(yesterdayEnd - timezoneOffset * 60000).toISOString()
+
+        // to trace UTC conversion in production
+        logger.info(`[email_utc_conversion] fromDate: ${fromDate}, toDate: ${toDate}`)
+
+        let variables = replaceValues(attachment.variables, [
+          { name: '{{bizplaceId}}', value: `"${bizplace.id}"` },
+          { name: '{{timezoneOffset}}', value: `${timezoneOffset}` },
+          { name: '{{lastRunDateTime}}', value: `"${fromDate}"` },
+          { name: '{{toDateTime}}', value: `"${endDateTime}"` },
+          { name: '{{prevMonthBeginDateTime}}', value: `"${prevMonthBeginDateTime}"` },
+          { name: '{{prevWeekBeginDateTime}}', value: `"${prevWeekBeginDateTime}"` },
+          { name: '{{prevDayBeginDateTime}}', value: `"${prevDayBeginDateTime}"` }
+        ])
+
+        let user: User = email.creator
+        delete user.creatorId
+        delete user.updaterId
+
+        // might show unused because of usage in eval
+        const response = await client.query({
+          query: gql`
+            ${attachment.gqlString}
+          `,
+          variables: variables || {},
+          context: { state: { domain: email.domain, user } }
+        } as any)
+
+        let excelResponse
+
+        try {
+          performance.mark(`objDataToExcel start:${email.id}`)
+          let mappedResponse = eval(attachment.mappingFunction)
+
+          let header = JSON.parse(attachment.headers)
+
+          excelResponse = await objDataToExcel({ name: 'name', data: { header, data: mappedResponse } })
+
+          performance.mark(`objDataToExcel end:${email.id}`)
+
+        } catch (e) {
+          performance.mark(`objDataToExcel end:${email.id}`)   
+          logger.error(`[send-email] objDataToExcel(${email.id}): ${e}`)
+        } finally {
+          let perf = performance.measure(`emailId:${email.id}`, `objDataToExcel start:${email.id}`, `objDataToExcel end:${email.id}`)
+          logger.info(`objDataToExcel performance: ${perf.toJSON()}`)
+        }
+
+        attachments.push({
+          filename: `${bizplace.name} - ${attachment.name}.xlsx`,
+          content: excelResponse,
+          contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+        })
+      }
     }
-  }
 
-  // modify content and subject
-  let bizplace: Bizplace = await getRepository(Bizplace).findOne({
-    where: { domain: email.domain },
-    relations: ['company']
-  })
-
-  let modifiedContent = email.content.replace('{{companyName}}', bizplace.company.name)
-
-  let modifiedSubject = email.subject.replace('{{warehouseName}}', email.domain.name)
-  modifiedSubject = modifiedSubject.replace('{{reportDate}}', new Date().toLocaleDateString('en-GB'))
-  //
-
-  let res = await sendEmailSes({
-    attachments,
-    subject: modifiedSubject,
-    content: modifiedContent,
-    toMailList:
-      email.emailRecipients
-        .filter(er => er.type == 'to')
-        .map(er => {
-          return er.emailAddress
-        }) || [],
-    ccMailList:
-      email.emailRecipients
-        .filter(er => er.type == 'cc')
-        .map(er => {
-          return er.emailAddress
-        }) || []
-  })
-
-  await getRepository(Email).update({ id: email.id }, { lastSent: new Date().toISOString() })
+    // modify content and subject
+    let bizplace: Bizplace = await getRepository(Bizplace).findOne({
+      where: { domain: email.domain },
+      relations: ['company']
+    })
+
+    let modifiedContent = email.content.replace('{{companyName}}', bizplace.company.name)
+    let modifiedSubject = email.subject.replace('{{warehouseName}}', email.domain.name)
+    modifiedSubject = modifiedSubject.replace('{{reportDate}}', new Date().toLocaleDateString('en-GB'))
+
+    let res = await sendEmailSes({
+      attachments,
+      subject: modifiedSubject,
+      content: modifiedContent,
+      toMailList:
+        email.emailRecipients
+          .filter(er => er.type == 'to')
+          .map(er => {
+            return er.emailAddress
+          }) || [],
+      ccMailList:
+        email.emailRecipients
+          .filter(er => er.type == 'cc')
+          .map(er => {
+            return er.emailAddress
+          }) || []
+    })
+
+    await getRepository(Email).update({ id: email.id }, { lastSent: new Date().toISOString() })
+    performance.mark(`processEmailCronJob end:(${email.id})`)
+  } catch (e) {
+    performance.mark(`processEmailCronJob end:(${email.id})`)
+    logger.error(`[send-email] processEmailCronJob(${email.id}): ${e}`)
+  } finally {
+    let perf = performance.measure(`emailId:${email.id}`, `processEmailCronJob start:(${email.id})`, `processEmailCronJob end:(${email.id})`)
+    logger.info(`processEmailCronJob performance: ${perf.toJSON()}`)
+  }
 }

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -421,6 +421,7 @@ export const params = {
     'shippingOrder.containerNo',
     'shippingOrder.shipName'
   ],
+  'complete-delivery-order': ['remark', 'bizplaceId', 'name'],
   'update-gan-to-arrived': ['ganNo', 'bizplaceId']
 }
 
@@ -796,6 +797,10 @@ export const reqParams = {
       type: 'field'
     }
   ],
+  'complete-delivery-order': [
+    { name: 'name', required: true, type: 'field' },
+    { name: 'bizplaceId', required: true, type: 'field' }
+  ],
   'update-gan-to-arrived': [
     { name: 'ganNo', required: true, type: 'field' },
     {

package/server/routers/api/restful-apis/v1/warehouse/complete-delivery-order.ts

@@ -0,0 +1,190 @@
+import { getConnection, EntityManager } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { TransportVehicle, TRUCK_STATUS } from '@things-factory/warehouse-base'
+import {
+  ORDER_TYPES,
+  ORDER_STATUS,
+  ORDER_INVENTORY_STATUS,
+  OrderInventory,
+  DeliveryOrder
+} from '@things-factory/sales-base'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+
+router.post(
+  '/v1/warehouse/complete-delivery-order',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      await getConnection().transaction(async (tx: EntityManager) => {
+        const { domain, user } = context.state
+        const data = context.request.body.data
+        const deliveryOrder: DeliveryOrder = await tx.getRepository(DeliveryOrder).findOne({
+          where: { domain, name: data.name },
+          relations: ['bizplace', 'transportDriver', 'transportVehicle', 'releaseGood', 'releaseGood.shippingOrder']
+        })
+
+        if (!deliveryOrder) throw new ApiError('E04', `Delivery order doesn't exists.`)
+        if (deliveryOrder.status !== ORDER_STATUS.DELIVERING) throw new ApiError('E04', `Status is not receivable.`)
+
+        await tx
+          .getRepository(OrderInventory)
+          .update(
+            { type: ORDER_TYPES.DELIVERY, status: ORDER_INVENTORY_STATUS.DELIVERING, domain, deliveryOrder },
+            { status: ORDER_INVENTORY_STATUS.DONE }
+          )
+
+        let orderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+          where: { domain, deliveryOrder: deliveryOrder }
+        })
+
+        const updateDoPatch =
+          data.remark && data.remark !== ''
+            ? {
+                remark: data.remark,
+                status: ORDER_STATUS.DONE,
+                updater: user
+              }
+            : {
+                status: ORDER_STATUS.DONE,
+                updater: user
+              }
+
+        await tx.getRepository(DeliveryOrder).update({ id: deliveryOrder.id }, updateDoPatch)
+
+        if (!deliveryOrder?.ownCollection) {
+          await tx.getRepository(TransportVehicle).update(
+            { id: deliveryOrder.transportVehicle },
+            {
+              status: TRUCK_STATUS.IDLE,
+              updater: user
+            }
+          )
+        }
+
+        context.body = {
+          data: {
+            id: deliveryOrder.id,
+            doNo: deliveryOrder.name,
+            from: deliveryOrder.from,
+            to: deliveryOrder.to,
+            contactPointRefId: deliveryOrder.contactPointRefId,
+            truckNo: deliveryOrder.truckNo,
+            transportDriver: deliveryOrder.transportDriver
+              ? {
+                  id: deliveryOrder.transportDriver.id,
+                  name: deliveryOrder.transportDriver.name,
+                  driverCode: deliveryOrder.transportDriver.driverCode
+                }
+              : null,
+            transportVehicle: deliveryOrder.transportVehicle
+              ? {
+                  id: deliveryOrder.transportVehicle.id,
+                  name: deliveryOrder.transportVehicle.name
+                }
+              : null,
+            otherDriver: deliveryOrder.otherDriver,
+            deliveryDate: deliveryOrder.deliveryDate,
+            status: ORDER_STATUS.DONE,
+            ownCollection: deliveryOrder.ownCollection,
+            looseItem: deliveryOrder.looseItem,
+            deliveryDateTime: deliveryOrder.deliveryDateTime,
+            loadWeight: deliveryOrder.loadWeight,
+            cargoType: deliveryOrder.cargoType,
+            urgency: deliveryOrder.urgency,
+            telNo: deliveryOrder.telNo,
+            refNo: deliveryOrder.refNo,
+            palletQty: deliveryOrder.palletQty,
+            remark: data.remark && data.remark !== '' ? data.remark : null,
+            description: deliveryOrder.description,
+            reusablePallet: deliveryOrder.reusablePallet,
+            attentionTo: deliveryOrder.attentionTo,
+            attentionCompany: deliveryOrder.attentionCompany,
+            //shipmentInformation
+            city: deliveryOrder.city,
+            country: deliveryOrder.country,
+            deliveryAddress1: deliveryOrder.deliveryAddress1,
+            phone1: deliveryOrder.phone1,
+            postalCode: deliveryOrder.postalCode,
+            state: deliveryOrder.state,
+            billingAddress: deliveryOrder.billingAddress,
+            billingCity: deliveryOrder.billingCity,
+            billingCountry: deliveryOrder.billingCountry,
+            billingPostalCode: deliveryOrder.billingPostalCode,
+            billingState: deliveryOrder.billingState,
+            bizplace: {
+              id: deliveryOrder.bizplace.id,
+              name: deliveryOrder.bizplace.name,
+              description: deliveryOrder.bizplace.description
+            },
+            domain: {
+              id: domain.id,
+              name: domain.name
+            },
+            releaseGood: {
+              id: deliveryOrder.releaseGood.id,
+              roNo: deliveryOrder.releaseGood.name,
+              description: deliveryOrder.releaseGood.description,
+              status: deliveryOrder.releaseGood.status,
+              refNo: deliveryOrder.releaseGood.refNo,
+              refNo2: deliveryOrder.releaseGood.refNo2,
+              refNo3: deliveryOrder.releaseGood.refNo3,
+              truckNo: deliveryOrder.releaseGood.truckNo,
+              exportOption: deliveryOrder.releaseGood.exportOption,
+              ownTransport: deliveryOrder.releaseGood.ownTransport,
+              crossDocking: deliveryOrder.releaseGood.crossDocking,
+              releaseDateTime: deliveryOrder.releaseGood.releaseDateTime,
+              releaseDate: deliveryOrder.releaseGood.releaseDate,
+              remark: deliveryOrder.releaseGood.remark,
+              courierOption: deliveryOrder.releaseGood.courierOption,
+              packingOption: deliveryOrder.releaseGood.packingOption,
+              type: deliveryOrder.releaseGood.type,
+              acceptedAt: deliveryOrder.releaseGood.acceptedAt,
+              marketplaceOrderStatus: deliveryOrder.releaseGood.marketplaceOrderStatus,
+              billingAddress: deliveryOrder.releaseGood.billingAddress,
+              deliveryAddress1: deliveryOrder.releaseGood.deliveryAddress1,
+              deliveryAddress2: deliveryOrder.releaseGood.deliveryAddress2,
+              deliveryAddress3: deliveryOrder.releaseGood.deliveryAddress3,
+              deliveryAddress4: deliveryOrder.releaseGood.deliveryAddress4,
+              deliveryAddress5: deliveryOrder.releaseGood.deliveryAddress5,
+              attentionTo: deliveryOrder.releaseGood.attentionTo,
+              attentionCompany: deliveryOrder.releaseGood.attentionCompany,
+              city: deliveryOrder.releaseGood.city,
+              state: deliveryOrder.releaseGood.state,
+              postalCode: deliveryOrder.releaseGood.postalCode,
+              country: deliveryOrder.releaseGood.country,
+              phone1: deliveryOrder.releaseGood.phone1,
+              phone2: deliveryOrder.releaseGood.phone2,
+              email: deliveryOrder.releaseGood.email,
+              transporter: deliveryOrder.releaseGood.transporter,
+              trackingNo: deliveryOrder.releaseGood.trackingNo,
+              airwayBill: deliveryOrder.releaseGood.airwayBill,
+              invoice: deliveryOrder.releaseGood.invoice,
+              pickupAddress: deliveryOrder.releaseGood.pickupAddress,
+              pickupTime: deliveryOrder.releaseGood.pickupTime,
+              handoverType: deliveryOrder.releaseGood.handoverType,
+              dropoffAddress: deliveryOrder.releaseGood.dropoffAddress,
+              noOfItems: deliveryOrder.releaseGood.noOfItems,
+              orderProducts: [],
+              shippingOrder: deliveryOrder.releaseGood.shippingOrder
+                ? {
+                    containerArrivalDate: deliveryOrder.releaseGood.shippingOrder.containerArrivalDate,
+                    containerLeavingDate: deliveryOrder.releaseGood.shippingOrder.containerLeavingDate,
+                    containerNo: deliveryOrder.releaseGood.shippingOrder.containerNo,
+                    shipName: deliveryOrder.releaseGood.shippingOrder.shipName
+                  }
+                : null
+            },
+            orderInventories: { ...orderInventories }
+          }
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/warehouse/get-inbound-order-details.ts

@@ -1,11 +1,11 @@
+import _ from 'lodash'
 import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { ArrivalNotice } from '@things-factory/sales-base'
 
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import _ from 'lodash'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
 
 router.get(
   '/v1/warehouse/get-inbound-order-details',
@@ -44,6 +44,8 @@ router.get(
           batchId: orderProduct.batchId,
           packingType: orderProduct.packingType,
           packingSize: orderProduct.packingSize,
+          uom: orderProduct.uom,
+          uomValue: orderProduct.uomValue,
           qty: orderProduct.packQty,
           palletQty: orderProduct.palletQty
         }

package/server/routers/api/restful-apis/v1/warehouse/get-inbound-order-list.ts

@@ -1,11 +1,11 @@
+import _ from 'lodash'
 import { Between, getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { ArrivalNotice } from '@things-factory/sales-base'
 
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
-import _ from 'lodash'
-import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
 
 router.get(
   '/v1/warehouse/get-inbound-order-list',
@@ -52,6 +52,8 @@ router.get(
             batchId: orderProduct.batchId,
             packingType: orderProduct.packingType,
             packingSize: orderProduct.packingSize,
+            uom: orderProduct.uom,
+            uomValue: orderProduct.uomValue,
             qty: orderProduct.packQty,
             palletQty: orderProduct.palletQty
           }

package/server/routers/api/restful-apis/v1/warehouse/index.ts

@@ -16,3 +16,4 @@ import './get-grn-document'
 import './get-do-document'
 import './dispatch-delivery-order'
 import './update-gan-to-arrived'
+import './complete-delivery-order'