@things-factory/operato-hub 4.3.300 → 4.3.302

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

@@ -24,6 +24,10 @@ router.get(
         filter['name'] = filter['doNo']
         delete filter['doNo']
       }
+      if (_.has(filter, 'vehicleNo')) {
+        filter['truckNo'] = filter['vehicleNo']
+        delete filter['vehicleNo']
+      }
       filter['createdAt'] = Between(fromDate, toDate)
 
       delete filter['fromDate']
@@ -32,7 +36,15 @@ router.get(
       delete filter['offset']
       const [deliveryOrders, totalCount]: DeliveryOrder[] = await getRepository(DeliveryOrder).findAndCount({
         where: filter,
-        relations: ['releaseGood', 'releaseGood.orderInventories', 'bizplace', 'domain'],
+        relations: [
+          'releaseGood',
+          'releaseGood.orderInventories',
+          'releaseGood.shippingOrder',
+          'bizplace',
+          'domain',
+          'transportDriver',
+          'transportVehicle'
+        ],
         skip: offset,
         take: limit,
         order: { createdAt: 'DESC' }
@@ -52,6 +64,20 @@ router.get(
           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: deliveryOrder.status,
           ownCollection: deliveryOrder.ownCollection,
@@ -62,11 +88,24 @@ router.get(
           urgency: deliveryOrder.urgency,
           telNo: deliveryOrder.telNo,
           refNo: deliveryOrder.refNo,
-          otherDriver: deliveryOrder.otherDriver,
           palletQty: deliveryOrder.palletQty,
           remark: deliveryOrder.remark,
           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,
@@ -120,7 +159,15 @@ router.get(
             handoverType: deliveryOrder.releaseGood.handoverType,
             dropoffAddress: deliveryOrder.releaseGood.dropoffAddress,
             noOfItems: deliveryOrder.releaseGood.noOfItems,
-            orderProducts: []
+            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
         }

package/server/routers/api/restful-apis/v1/warehouse/get-do-document.ts

@@ -0,0 +1,74 @@
+import { Between, getRepository } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { DeliveryOrder } from '@things-factory/sales-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
+import { renderOrientageDO, renderRODO } from '@things-factory/worksheet-base'
+
+router.get(
+  '/v1/warehouse/get-do-document',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      let filter = { ...context.query }
+      const { limit, offset } = filter
+      filter['bizplace'] = filter['bizplaceId']
+      filter['name'] = filter['doNo']
+
+      const fileType = filter['fileType'].toUpperCase()
+      const timezoneOffSet = parseInt(filter['timezoneOffSet'])
+      const doNo = filter['name']
+
+      delete filter['bizplaceId']
+      delete filter['doNo']
+      delete filter['fileType']
+
+      // change to switch case
+      switch (fileType) {
+        case 'HTML':
+          const deliveryOrder: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
+            where: filter,
+            relations: ['releaseGood', 'releaseGood.orderInventories', 'bizplace', 'domain'],
+            skip: offset,
+            take: limit,
+            order: { createdAt: 'DESC' }
+          })
+
+          if (!deliveryOrder) {
+            throw new ApiError('E04', `goods receival note: ${filter['name']}`)
+          }
+
+          // give content
+          let content: string = ''
+
+          // Rerouting render-grn based on subdomain
+          switch (deliveryOrder.domain.subdomain) {
+            case 'orientage-warehouse':
+              content = await renderOrientageDO({ doNo }, context)
+              break
+            case 'shah-alam-warehouse':
+              content = await renderOrientageDO({ doNo }, context)
+              break
+            default:
+              // reroute to render-grn
+              content = await renderRODO({ doNo }, context)
+              break
+          }
+          // create and format data response
+          context.body = { fileType: fileType, content: content }
+          // for testing
+          //   context.body = content
+          break
+        default:
+          throw new ApiError('E04', `file type: ${fileType}`)
+      }
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)

package/server/routers/api/restful-apis/v1/warehouse/get-grn-document.ts

@@ -0,0 +1,116 @@
+import { Between, getRepository } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { GoodsReceivalNote } from '@things-factory/sales-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
+import {
+  renderGRN,
+  renderSeebuuGRN,
+  renderElcclGRN,
+  renderFmGRN,
+  renderKimedaGRN,
+  renderOrientageGRN
+} from '@things-factory/worksheet-base'
+
+router.get(
+  '/v1/warehouse/get-grn-document',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      let filter = { ...context.query }
+      const { limit, offset } = filter
+      filter['bizplace'] = filter['bizplaceId']
+      filter['name'] = filter['grnNo']
+
+      const fileType = filter['fileType'].toUpperCase()
+      const timezoneOffSet = parseInt(filter['timezoneOffSet'])
+      const grnNo = filter['name']
+
+      delete filter['bizplaceId']
+      delete filter['grnNo']
+      delete filter['fileType']
+      delete filter['timezoneOffSet']
+
+      // change to switch case
+      switch (fileType) {
+        case 'HTML':
+          const [goodsReceivedNotes]: GoodsReceivalNote[] = await getRepository(GoodsReceivalNote).find({
+            where: filter,
+            relations: [
+              'bizplace',
+              'domain',
+              'arrivalNotice',
+              'arrivalNotice.orderProducts',
+              'arrivalNotice.orderProducts.product'
+            ]
+          })
+          if (!goodsReceivedNotes) {
+            throw new ApiError('E04', `goods receival note: ${filter['name']}`)
+          }
+
+          // give content
+          let content: string = ''
+
+          // Rerouting render-grn based on subdomain
+          switch (goodsReceivedNotes.domain.subdomain) {
+            case 'el-cold-chain-warehouse':
+              // reroute to view_elccl_grn
+              content = await renderElcclGRN({ grnNo }, context)
+              break
+            case 'orientage-warehouse':
+              content = await renderOrientageGRN({ grnNo }, context)
+              break
+            case 'shah-alam-warehouse':
+              content = await renderOrientageGRN({ grnNo }, context)
+              // reroute to view_orientage_gr
+              break
+            // seebuu-grn
+            case 'seebuu-warehouse-a':
+              // reroute to render-seebuu-grn
+              content = await renderSeebuuGRN({ grnNo }, context)
+              break
+            case 'seebuu-warehouse-c':
+              // reroute to render-seebuu-grn
+              content = await renderSeebuuGRN({ grnNo }, context)
+              break
+            case 'seebuu-warehouse-logistics':
+              // reroute to render-seebuu-grn
+              content = await renderSeebuuGRN({ grnNo }, context)
+              break
+            case 'freight-mark-warehouse':
+              // reroute to view_fm_gr
+              content = await renderFmGRN({ grnNo }, context)
+              break
+            case 'kimeda-warehouse':
+              if (!timezoneOffSet) {
+                throw new ApiError('E03', 'timezoneOffSet')
+              }
+              // reroute to view_kimeda_gr
+              content = await renderKimedaGRN({ grnNo, timezoneOffSet }, context)
+              break
+            default:
+              if (!timezoneOffSet) {
+                throw new ApiError('E03', 'timezoneOffSet')
+              }
+              // reroute to render-grn
+              content = await renderGRN({ grnNo, timezoneOffSet }, context)
+              break
+          }
+          // create and format data response
+          context.body = { fileType: fileType, content: content }
+          // for testing
+          // context.body = content
+          break
+        default:
+          throw new ApiError('E04', `file type: ${fileType}`)
+      }
+    } 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

@@ -26,7 +26,7 @@ router.get(
 
       const arrivalNotice: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
         where: filter,
-        relations: ['orderProducts', 'orderProducts.product']
+        relations: ['orderProducts', 'orderProducts.product', 'bizplace']
       })
 
       if (!arrivalNotice) {
@@ -55,6 +55,7 @@ router.get(
         refNo: arrivalNotice.refNo,
         refNo2: arrivalNotice.refNo2,
         refNo3: arrivalNotice.refNo3,
+        status: arrivalNotice.status,
         etaDate: arrivalNotice.etaDate,
         ownTransport: arrivalNotice.ownTransport,
         importCargo: arrivalNotice.importCargo,
@@ -63,6 +64,7 @@ router.get(
         deliveryOrderNo: arrivalNotice.deliveryOrderNo,
         containerNo: arrivalNotice.containerNo,
         containerSize: arrivalNotice.containerSize,
+        bizplace: { id: arrivalNotice.bizplace.id, name: arrivalNotice.bizplace.name },
         orderProducts,
         supplier: {
           name: arrivalNotice?.supplier?.name || null,

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

@@ -2,7 +2,8 @@ import _ from 'lodash'
 import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { ReleaseGood, DeliveryOrder } from '@things-factory/sales-base'
+import { Attachment } from '@things-factory/attachment-base'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -26,7 +27,14 @@ router.get(
 
       const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
         where: filter,
-        relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems']
+        relations: [
+          'orderInventories',
+          'orderInventories.product',
+          'orderInventories.productDetail',
+          'orderPackages',
+          'orderPackages.orderPackageItems',
+          'bizplace'
+        ]
       })
 
       if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']}`)
@@ -37,7 +45,9 @@ router.get(
         const orderInventoriesDataPoint = {
           product: {
             sku: orderInventory.product.sku,
-            refCode: orderInventory.product.refCode
+            productDetail: {
+              refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null
+            }
           },
           batchId: orderInventory.batchId,
           packingType: orderInventory.packingType,
@@ -63,6 +73,90 @@ router.get(
         orderPackages.push(orderPackagesDataPoint)
       }
 
+      let deliveryOrders: DeliveryOrder[] = []
+      deliveryOrders = await getRepository(DeliveryOrder).find({
+        where: { releaseGood: releaseGood.id },
+        relations: [
+          'orderInventories',
+          'orderInventories.product',
+          'orderInventories.productDetail',
+          'transportDriver',
+          'transportVehicle',
+          'creator',
+          'updater'
+        ]
+      })
+
+      if (deliveryOrders.length > 0) {
+        deliveryOrders = deliveryOrders.map(deliveryOrder => {
+          return {
+            id: deliveryOrder.id,
+            name: deliveryOrder.name,
+            to: deliveryOrder.to,
+            truckNo: deliveryOrder.truckNo,
+            ownCollection: deliveryOrder.ownCollection,
+            looseItem: deliveryOrder.looseItem,
+            deliveryDate: deliveryOrder.deliveryDate,
+            palletQty: deliveryOrder.palletQty,
+            remark: deliveryOrder.remark,
+            status: deliveryOrder.status,
+            creator: deliveryOrder.creator ? { id: deliveryOrder.creator.id, name: deliveryOrder.creator.name } : null,
+            createdAt: deliveryOrder.createdAt,
+            updater: deliveryOrder.updater ? { id: deliveryOrder.updater.id, name: deliveryOrder.updater.name } : null,
+            updatedAt: deliveryOrder.updatedAt,
+            transportDriver: deliveryOrder.transportDriver
+              ? { id: deliveryOrder.transportDriver.id, name: deliveryOrder.transportDriver.name }
+              : null,
+            transportVehicle: deliveryOrder.transportVehicle
+              ? { id: deliveryOrder.transportVehicle.id, name: deliveryOrder.transportVehicle.name }
+              : null,
+            orderInventories: deliveryOrder.orderInventories.map(oi=>{
+              return{
+                releaseQty: oi.releaseQty,
+                releaseUomValue: oi.releaseUomValue,
+                packingType: oi.packingType,
+                packingSize: oi.packingSize,
+                remark: oi.remark,
+                product: {
+                  id: oi.product.id,
+                  name: oi.product.name,
+                  description: oi.product.description,
+                  sku: oi.product.sku,
+                },
+                productDetail: { refCode: oi.productDetail.refCode ? oi.productDetail.refCode : null 
+              }
+            }}) 
+            
+            // {
+            //   product: deliveryOrder.orderInventories.map(oi => {
+            //     return {
+            //       id: oi.product.id,
+            //       name: oi.product.name,
+            //       description: oi.product.description,
+            //       sku: oi.product.sku,
+            //       productDetail: { refCode: oi.productDetail.refCode }
+            //     }
+            //   }),
+            // }
+          }
+        })
+      }
+
+      let attachments: Attachment[] = []
+      attachments = await getRepository(Attachment).find({
+        where: { refBy: releaseGood.id }
+      })
+
+      if(attachments.length >0){
+        attachments = attachments.map(attachment => {
+           
+          return{
+            name: attachment.name,
+            fullpath:  `${context.origin}/attachment/${attachment.path}`
+          }
+        })
+      }
+
       const data = {
         id: releaseGood.id,
         roNo: releaseGood.roNo,
@@ -89,6 +183,7 @@ router.get(
         routeId: releaseGood.routeId,
         stopId: releaseGood.stopId,
         status: releaseGood.status,
+        bizplace: { id: releaseGood.bizplace.id, name: releaseGood.bizplace.name },
         billTo: {
           billingAddress: releaseGood.billingAddress
         },
@@ -101,6 +196,7 @@ router.get(
           attentionTo: releaseGood.attentionTo,
           attentionCompany: releaseGood.attentionCompany,
           city: releaseGood.city,
+          ward: releaseGood.ward,
           district: releaseGood.district,
           state: releaseGood.state,
           postalCode: releaseGood.postalCode,
@@ -110,7 +206,9 @@ router.get(
           email: releaseGood.email
         },
         orderInventories,
-        orderPackages
+        orderPackages: orderPackages.length > 0 ? orderPackages: null,
+        deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
+        attachment: attachments.length > 0 ? attachments : null
       }
 
       context.body = {

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

@@ -33,7 +33,13 @@ router.get(
 
       const [releaseGoods, totalCount]: ReleaseGood[] = await getRepository(ReleaseGood).findAndCount({
         where: filter,
-        relations: ['orderInventories', 'orderInventories.product', 'orderPackages', 'orderPackages.orderPackageItems'],
+        relations: [
+          'orderInventories',
+          'orderInventories.product',
+          'orderInventories.productDetail',
+          'orderPackages',
+          'orderPackages.orderPackageItems'
+        ],
         skip: offset,
         take: limit,
         order: { createdAt: 'DESC' }
@@ -47,7 +53,9 @@ router.get(
           const orderInventoriesDataPoint = {
             product: {
               sku: orderInventory.product.sku,
-              refCode: orderInventory.product.refCode
+              productDetail: {
+                refCode: orderInventory.productDetail.refCode
+              }
             },
             batchId: orderInventory.batchId,
             packingType: orderInventory.packingType,
@@ -73,7 +81,7 @@ router.get(
         }
         const datapoint = {
           id: releaseGood.id,
-          roNo: releaseGood.roNo,
+          roNo: releaseGood.name,
           refNo: releaseGood.refNo,
           refNo2: releaseGood.refNo2,
           refNo3: releaseGood.refNo3,
@@ -109,6 +117,7 @@ router.get(
             attentionTo: releaseGood.attentionTo,
             attentionCompany: releaseGood.attentionCompany,
             city: releaseGood.city,
+            ward: releaseGood.ward,
             district: releaseGood.district,
             state: releaseGood.state,
             postalCode: releaseGood.postalCode,

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

@@ -12,3 +12,7 @@ import './get-onhand-inventory-list'
 import './get-release-order-details'
 import './get-release-order-list'
 import './update-release-order-details'
+import './get-grn-document'
+import './get-do-document'
+import './dispatch-delivery-order'
+import './update-gan-to-arrived'

package/server/routers/api/restful-apis/v1/warehouse/update-gan-to-arrived.ts

@@ -0,0 +1,109 @@
+import { getConnection, EntityManager } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+
+router.post(
+  '/v1/warehouse/update-gan-to-arrived',
+  businessMiddleware,
+  validationMiddleware,
+  loggingMiddleware,
+  async (context, next) => {
+    try {
+      await getConnection().transaction(async (tx: EntityManager) => {
+        const { domain, user } = context.state
+
+        const foundGAN: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+          where: {
+            domain: domain,
+            name: context.request.body.data.ganNo,
+            bizplace: context.request.body.data.bizplaceId
+          },
+          relations: ['bizplace', 'orderProducts']
+        })
+
+        if (!foundGAN) {
+          throw new ApiError('E04', `ganNo : ${context.request.body.data.ganNo}`)
+        } else if (foundGAN.status !== 'INTRANSIT') {
+          throw new ApiError('E02', `ganNo: ${context.request.body.data.ganNo} status is not INTRANSIT `)
+        }
+
+        if (foundGAN.orderProducts.length > 0) {
+          await Promise.all(
+            foundGAN.orderProducts.map(async orderProduct => {
+              await tx
+                .getRepository(OrderProduct)
+                .update({ id: orderProduct.id }, { status: 'ARRIVED', updater: user, updatedAt: new Date() })
+            })
+          )
+        }
+
+        await tx
+          .getRepository(ArrivalNotice)
+          .update(
+            { id: foundGAN.id, domain: domain, bizplace: context.request.body.data.bizplaceId },
+            { status: 'ARRIVED', updater: user, updatedAt: new Date() }
+          )
+
+        const updatedGAN: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+          where: {
+            domain: domain,
+            id: foundGAN.id,
+            bizplace: context.request.body.data.bizplaceId
+          },
+          relations: ['bizplace', 'orderProducts', 'orderProducts.product']
+        })
+
+        let orderProducts = []
+        for (const orderProduct of updatedGAN.orderProducts) {
+          const orderProductsDataPoint = {
+            product: {
+              sku: orderProduct.product.sku,
+              uom: orderProduct.product.uom,
+              uomValue: orderProduct.product.uomValue
+            },
+            batchId: orderProduct.batchId,
+            packingType: orderProduct.packingType,
+            packingSize: orderProduct.packingSize,
+            qty: orderProduct.packQty,
+            palletQty: orderProduct.palletQty
+          }
+          orderProducts.push(orderProductsDataPoint)
+        }
+
+        context.body = {
+          data: {
+            id: updatedGAN.id,
+            ganNo: updatedGAN.name,
+            refNo: updatedGAN.refNo,
+            refNo2: updatedGAN.refNo2,
+            refNo3: updatedGAN.refNo3,
+            status: updatedGAN.status,
+            etaDate: updatedGAN.etaDate,
+            ownTransport: updatedGAN.ownTransport,
+            importCargo: updatedGAN.importCargo,
+            container: updatedGAN.container,
+            truckNo: updatedGAN.truckNo,
+            deliveryOrderNo: updatedGAN.deliveryOrderNo,
+            containerNo: updatedGAN.containerNo,
+            containerSize: updatedGAN.containerSize,
+            bizplace: { id: updatedGAN.bizplace.id, name: updatedGAN.bizplace.name },
+            supplier: {
+              name: updatedGAN?.supplier?.name || null,
+              companyName: updatedGAN?.supplier?.companyName || null,
+              email: updatedGAN?.supplier?.email || null,
+              accountNo: updatedGAN?.supplier?.accountNo || null
+            },
+            orderProducts
+          }
+        }
+      })
+    } catch (e) {
+      if (e instanceof ApiError) ApiErrorHandler(context, e)
+      else throwInternalServerError(context, e)
+    }
+  }
+)