@things-factory/worksheet-base 4.0.0-alpha.9 → 4.0.0-beta.0

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

@@ -1,27 +1,29 @@
+import { In } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { generateId } from '@things-factory/id-rule-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
   OrderInventory,
   OrderNoGenerator,
   OrderVas,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS,
   ReleaseGood
 } from '@things-factory/sales-base'
-import { generateId } from '@things-factory/id-rule-base'
 import { Setting } from '@things-factory/setting-base'
-import { In } from 'typeorm'
 import {
   Inventory,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
-  LOCATION_TYPE,
-  Location
+  Location,
+  LOCATION_TYPE
 } from '@things-factory/warehouse-base'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE, TASK_NUMBER_SETTING_KEY, TASK_NUMBER_RULE_TYPE } from '../../constants'
+
+import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { WorksheetNoGenerator } from '../../utils'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
   async generatePickingWorksheet(releaseGoodNo: string): Promise<Worksheet> {
@@ -157,7 +159,9 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.PICKING, [
       'releaseGood',
       'releaseGood.bizplace',
+      'domain',
       'bizplace',
+      'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain',
       'worksheetDetails',
@@ -203,8 +207,10 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.BATCH_PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory',
+      'worksheetDetails.targetInventory.releaseGood',
       'worksheetDetails.targetInventory.product',
       'bizplace',
+      'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain'
     ])
@@ -251,6 +257,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     batchId: string,
     productId: string,
     packingType: string,
+    packingSize: number,
     worksheetDetails: Partial<WorksheetDetail>[]
   ): Promise<void> {
     // 1. Remove prev worksheet details if it's exists
@@ -265,7 +272,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       worksheet.worksheetDetails,
       batchId,
       productId,
-      packingType
+      packingType,
+      packingSize
     )
     // Delete order inventories
     if (prevWorksheetDetails?.length) {
@@ -301,6 +309,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       newTargetInventory.batchId = batchId
       newTargetInventory.product = product
       newTargetInventory.packingType = packingType
+      newTargetInventory.packingSize = packingSize
       newTargetInventory.creator = this.user
       newTargetInventory.updater = this.user
       newTargetInventory = await this.trxMgr.getRepository(OrderInventory).save(newTargetInventory)
@@ -319,7 +328,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     worksheetNo: string,
     batchId: string,
     productId: string,
-    packingType: string
+    packingType: string,
+    packingSize: number
   ): Promise<void> {
     const worksheet: Worksheet = await this.findWorksheetByNo(worksheetNo, [
       'worksheetDetails',
@@ -333,6 +343,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       batchId,
       productId,
       packingType,
+      packingSize,
       ['targetInventory', 'targetInventory.inventory']
     )
 
@@ -363,6 +374,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           batchId,
           product: { id: productId },
           packingType,
+          packingSize,
           status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
         },
         { status: ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() }
@@ -849,6 +861,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       },
       relations: [
         'bizplace',
+        'bizplace.domain',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.releaseGood'
@@ -901,6 +914,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     standardBatchId: string,
     standardProductId: string,
     standardPackingType: string,
+    standardPackingSize: number,
     relations: string[] = ['targetInventory', 'targetInventory.product']
   ): Promise<WorksheetDetail[]> {
     for (let wsd of worksheetDetails) {
@@ -913,7 +927,8 @@ export class PickingWorksheetController extends VasWorksheetController {
       (wsd: WorksheetDetail) =>
         wsd.targetInventory.batchId === standardBatchId &&
         wsd.targetInventory.product.id === standardProductId &&
-        wsd.targetInventory.packingType === standardPackingType
+        wsd.targetInventory.packingType === standardPackingType &&
+        wsd.targetInventory.packingSize === standardPackingSize
     )
 
     for (let wsd of worksheetDetails) {

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

@@ -97,7 +97,7 @@ export async function renderElcclGRN({ grnNo }, context: any) {
   await getManager().transaction(async (trxMgr: EntityManager) => {
     await trxMgr.query(
       `
-      create temp table tmp as(
+      create temp table tmp on commit drop as(
         select invh.*, invh2.ref_order_id as release_order_id, invh2.qty as release_qty, invh.qty as inbound_qty, 
         invh.qty + invh2.qty as remaining_qty, invh2.uom_value as release_uom_value, invh.uom_value as inbound_uom_value, 
         invh.uom_value + invh2.uom_value as remaining_uom_value
@@ -115,7 +115,7 @@ export async function renderElcclGRN({ grnNo }, context: any) {
 
     await trxMgr.query(
       `
-      create temp table tmp2 as(
+      create temp table tmp2 on commit drop as(
         select id,seq,ref_order_id,order_no,"name",pallet_id,batch_id,product_id,warehouse_id,location_id,"zone",order_ref_no,packing_type,uom as unit,qty,
         opening_qty,uom_value,opening_weight,description,status,transaction_type,created_at,updated_at,domain_id,bizplace_id,creator_id,updater_id,
         reusable_pallet_id,release_order_id,release_qty,inbound_qty,remaining_qty, inbound_qty as loose_amt, release_uom_value, inbound_uom_value,remaining_uom_value, 
@@ -139,7 +139,7 @@ export async function renderElcclGRN({ grnNo }, context: any) {
 
     await trxMgr.query(
       `
-      create temp table tmp3 as (
+      create temp table tmp3 on commit drop as (
         select main.*, concat(p2.name, ' (', p2.description, ')') as product_name, plt.name as pallet_name,
         case when main.reusable_pallet_id notnull then concat(main.qty, ' ', main.packing_type, '(S) ', plt.name) else concat(main.pallet, ' PALLET(S)')
         end as remarks,
@@ -175,10 +175,6 @@ export async function renderElcclGRN({ grnNo }, context: any) {
     `,
       [foundGAN.id]
     )
-
-    await trxMgr.query(`
-      drop table tmp, tmp2, tmp3
-    `)
   })
 
   const data = {

package/server/controllers/render-grn.ts

@@ -0,0 +1,218 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository, IsNull, Not } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { Partner } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { ArrivalNotice, GoodsReceivalNote, ORDER_STATUS, OrderProduct } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { ReducedInventoryHistory } from '@things-factory/warehouse-base'
+
+import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
+import { Worksheet } from '../entities'
+import { DateTimeConverter } from '../utils/datetime-util'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
+  // 1. find domain
+  const domain: Domain = await getRepository(Domain).findOne({
+    where: { id: context.state.domain.id }
+  })
+
+  // 2. find grn
+  const foundGRN: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
+    where: { domain, name: grnNo },
+    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
+  })
+
+  // 3. find GAN
+  const foundGAN: ArrivalNotice = foundGRN.arrivalNotice
+  const ownRefNo = foundGAN.refNo
+
+  // 4. find customer bizplace
+  const partnerBiz: Bizplace = foundGRN.bizplace
+
+  const partnerDomain: Partner = await getRepository(Partner).findOne({
+    where: { partnerDomain: partnerBiz.domain, domain },
+    relations: ['domain']
+  })
+
+  const domainOwner: Domain = partnerDomain.domain
+  const domainBizplace: Bizplace = await getRepository(Bizplace).findOne({
+    where: { domain: domainOwner },
+    relations: ['company']
+  })
+
+  const qbReducedInventory = getRepository(ReducedInventoryHistory)
+    .createQueryBuilder(`ivh`)
+    .select(`product_id`, `productId`)
+    .addSelect(`batch_id`, `batchId`)
+    .addSelect(`reusable_pallet_id`, `reusablePalletId`)
+    .addSelect(`packing_type`, `packingType`)
+    .addSelect(`sum(qty)`, `qty`)
+    .addSelect(`sum(uom_value)`, `uomValue`)
+    .addSelect(`uom`, `uom`)
+    .addSelect(`count(distinct pallet_id)`, `pallet`)
+    .addSelect(`string_agg(distinct expiration_date::varchar,', ' order by expiration_date::varchar)`, `expiryDate`)
+    .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, `palletId`)
+    .where(`ivh.domain_id = :domainId`, { domainId: domain.id })
+    .andWhere(`ivh.ref_order_id = :refOrderId`, { refOrderId: foundGAN.id })
+    .andWhere(`ivh.transaction_type = 'UNLOADING'`)
+    .groupBy(`reusable_pallet_id`)
+    .addGroupBy(`product_id`)
+    .addGroupBy(`batch_id`)
+    .addGroupBy(`packing_type`)
+    .addGroupBy(`uom`)
+    .getRawMany()
+
+  // 5. find domain contact point
+  const foundCP: ContactPoint = await getRepository(ContactPoint).findOne({
+    where: { domain, bizplace: domainBizplace }
+  })
+
+  // 5. find domain contact point
+  const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
+    where: { domain, bizplace: partnerBiz }
+  })
+
+  // 6. find unloading worksheet
+  const foundWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
+  })
+
+  // find putaway worksheet
+  const foundPutawayWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.PUTAWAY, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
+  })
+
+  const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
+    where: { domain, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()), actualPackQty: Not(IsNull()) },
+    relations: ['product']
+  })
+
+  // 7. find grn template based on category
+  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+    where: { domain, category: TEMPLATE_TYPE.GRN_TEMPLATE }
+  })
+
+  // 8. find grn logo
+  const foundLogo: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.LOGO
+    }
+  })
+
+  // 9. find signature
+  const foundSignature: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.SIGNATURE
+    }
+  })
+
+  const foundCop: Attachment = await getRepository(Attachment).findOne({
+    where: {
+      domain,
+      category: TEMPLATE_TYPE.COP
+    }
+  })
+
+  const inboundInventories: any[] = await qbReducedInventory
+
+  const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+  let logo = null
+  if (foundLogo?.path) {
+    logo = 'data:' + foundLogo.mimetype + ';base64,' + (await STORAGE.readFile(foundLogo.path, 'base64'))
+  }
+
+  let signature = null
+  if (foundSignature?.path) {
+    signature = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundSignature.path, 'base64'))
+  }
+
+  let cop = null
+  if (foundCop?.path) {
+    cop = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundCop.path, 'base64'))
+  }
+
+  const data = {
+    logo_url: logo,
+    sign_url: signature,
+    cop_url: cop,
+    customer_biz: partnerBiz.name,
+    customer_address: partnerBiz.address,
+    company_domain: domainBizplace.company.name,
+    company_phone: foundCP.phone,
+    company_email: foundCP.email,
+    company_brn: domainBizplace.company.brn,
+    company_address: domainBizplace.company.address,
+    warehouse_address: foundCP.address,
+    warehouse_address2: foundCP.address2,
+    warehouse_postcode: foundCP.postCode,
+    warehouse_city: foundCP.city,
+    warehouse_state: foundCP.state,
+    warehouse_phone: foundCP.phone,
+    warehouse_fax: foundCP.fax,
+    warehouse_email: foundCP.email,
+    order_no: foundGRN.name,
+    gan_no: foundGAN.name,
+    gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
+    unload_date: DateTimeConverter.date(foundWS.endedAt),
+    ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
+    received_date: DateTimeConverter.date(foundWS.endedAt),
+    truck_no: foundGAN.truckNo || '',
+    container_no: foundGAN.containerNo || '',
+    delivery_order_no: foundGAN.deliveryOrderNo ? foundGAN.deliveryOrderNo : '',
+    account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
+    unloaded_by: foundWS ? foundWS.updater.name : '',
+    putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
+    product_list: targetProducts.map((item, idx) => {
+      let unloadInvHistory = inboundInventories.find(
+        ih =>
+          ih.productId == item.product.id &&
+          ih.batchId == item.batchId &&
+          ih.packingType == item.packingType &&
+          ih.uom == item.uom
+      )
+
+      return {
+        list_no: idx + 1,
+        product_sku: `${item.product.sku}`,
+        product_name: `${item.product.name}(${item.product.description})`,
+        product_desc: item.product.description,
+        product_nameOnly: item.product.name,
+        product_type: item.packingType,
+        product_size: item.packingSize,
+        product_batch: item.batchId,
+        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_uom: `${unloadInvHistory.uom || item.uom}`,
+        expiry_date: unloadInvHistory.expiryDate || ``,
+        reusable_pallet_id: unloadInvHistory.reusablePalletId || ``,
+        remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
+      }
+    })
+  }
+
+  const formData = new FormData()
+  formData.append('template', template)
+  formData.append('jsonString', JSON.stringify(data))
+
+  const response = await fetch(REPORT_API_URL, {
+    method: 'POST',
+    body: formData
+  })
+
+  return await response.text()
+}

package/server/controllers/render-job-sheet.ts

@@ -79,7 +79,7 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
   return await getManager().transaction(async (trxMgr: EntityManager) => {
     await trxMgr.query(
       `
-      create temp table temp_invHistory as (
+      create temp table temp_invHistory on commit drop as (
         select i2.id as inventory_id, i2.pallet_id, i2.product_id, i2.packing_type, i2.batch_id,
         ih.id as inventory_history_id, ih.seq, ih.status, ih.transaction_type, ih.qty, ih.opening_qty, ih.uom_value, ih.opening_uom_value, 
         ih.created_at
@@ -95,52 +95,63 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
     )
 
     const invItems: any[] = await trxMgr.query(
-      ` 
-      SELECT inv.id AS "inv_id", inv.packing_type AS "packingType", inv.created_at AS "createdAt", product.name AS "productName", 
-      (	
-        select distinct on(pallet_id) COALESCE(qty, 0) AS unloadedQty from temp_invHistory invh 
-        where invh.status = 'UNLOADED' and invh.inventory_id = inv.id
-        order by pallet_id, seq asc
-      ) AS "unloadedQty", 
-      (
-        select distinct on(pallet_id) COALESCE(created_at, null) AS outboundAt from temp_invHistory invh 
-        where invh.status = 'TERMINATED' and invh.inventory_id = inv.id
-        order by pallet_id, seq desc
-      ) AS "outboundAt",
-      STRING_AGG (case when do2.name is not null then (CONCAT(do2.delivery_date, ' (', orderInv.release_qty, ') ', do2.name, ', ', case when do2.own_collection = true then 'TPT N' else 'TPT Y' end )) else null end, ', ')  AS "doName",
-      case when plt.name is not null then (CONCAT(inv.pallet_id, ' (', plt.name, ')')) else inv.pallet_id end AS "palletId",
-      SUM(orderInv.release_qty) as "qty",
-      do2.own_collection AS "ownTransport",
-      STRING_AGG (vas.name, ', ') AS "vasName" 
-      FROM inventories inv 
-      LEFT JOIN order_inventories orderInv ON orderInv.inventory_id = inv.id AND orderInv.release_good_id is not null and orderInv.status <> 'CANCELLED'
-      LEFT JOIN order_vass orderVass ON orderVass.inventory_id = inv.id  
-      LEFT JOIN vass vas ON vas.id = orderVass.vas_id  
-      LEFT JOIN pallets plt on plt.id = inv.reusable_pallet_id
-      LEFT JOIN delivery_orders do2 ON do2.id = orderInv.delivery_order_id  
-      LEFT JOIN products product ON product.id=inv.product_id 
-      inner join order_inventories oi on oi.inventory_id = inv.id
-      where oi.arrival_notice_id = $1
-      AND inv.domain_id = $2
-      GROUP BY inv.id, product.name, do2.own_collection, plt.name
-      ORDER BY inv.pallet_id, product.name asc
+      `         
+      SELECT rn,
+      inv_id, 
+      case when rn = 1 then "packingType" else null end as "packingType",
+      case when rn = 1 then "createdAt" else null end as "createdAt",
+      case when rn = 1 then "productName" else null end as "productName", 
+      case when rn = 1 then "unloadedQty" else null end as "unloadedQty",
+      case when rn = 1 then "outboundAt" else null end as "outboundAt",
+      "doName",
+      case when rn = 1 then "palletId" else null end as "palletId",
+      qty,
+      case when rn = 1 then "ownTransport" else null end as "ownTransport",
+      case when rn = 1 then "vasName" else null end as "vasName"  
+      from 
+      ( 
+        SELECT
+        row_number() over(partition by pallet_id order by inv.pallet_id, product.name asc) as rn,
+        inv.id AS "inv_id", inv.packing_type AS "packingType", inv.created_at AS "createdAt", product.name AS "productName", 
+        (	
+          select distinct on(pallet_id) COALESCE(qty, 0) AS unloadedQty from temp_invHistory invh 
+          where invh.status = 'UNLOADED' and invh.inventory_id = inv.id
+          order by pallet_id, seq asc
+        ) AS "unloadedQty", 
+        (
+          select distinct on(pallet_id) COALESCE(created_at, null) AS outboundAt from temp_invHistory invh 
+          where invh.status = 'TERMINATED' and invh.inventory_id = inv.id
+          order by pallet_id, seq desc
+        ) AS "outboundAt",
+        STRING_AGG (case when do2.name is not null then (CONCAT(do2.delivery_date, ' (', orderInv.release_qty, ') ', do2.name, ', ', case when do2.own_collection = true then 'TPT N' else 'TPT Y' end )) else null end, ', ')  AS "doName",
+        case when plt.name is not null then (CONCAT(inv.pallet_id, ' (', plt.name, ')')) else inv.pallet_id end AS "palletId",
+        SUM(orderInv.release_qty) as "qty",
+        do2.own_collection AS "ownTransport",
+        STRING_AGG (vas.name, ', ') AS "vasName" 
+        FROM inventories inv 
+        LEFT JOIN order_inventories orderInv ON orderInv.inventory_id = inv.id AND orderInv.release_good_id is not null and orderInv.status <> 'CANCELLED' AND orderinv.picked_qty > 0
+        LEFT JOIN order_vass orderVass ON orderVass.inventory_id = inv.id  
+        LEFT JOIN vass vas ON vas.id = orderVass.vas_id  
+        LEFT JOIN pallets plt on plt.id = inv.reusable_pallet_id
+        LEFT JOIN delivery_orders do2 ON do2.id = orderInv.delivery_order_id  
+        LEFT JOIN products product ON product.id=inv.product_id 
+        inner join order_inventories oi on oi.inventory_id = inv.id
+        where oi.arrival_notice_id = $1
+        AND inv.domain_id = $2
+        GROUP BY inv.id, product.name, do2.own_collection, plt.name
+        ORDER BY inv.pallet_id, product.name asc
+      ) foo
     `,
       [foundGAN.id, domain.id]
     )
 
-    await trxMgr.query(
-      `
-        drop table temp_invHistory
-      `
-    )
-
     const sumPackQty = targetProducts.map((op: OrderProduct) => op.actualPackQty).reduce((a, b) => a + b, 0)
 
     let sumPalletQty = 0
     if (foundJS?.sumPalletQty) {
       sumPalletQty = foundJS.sumPalletQty
     }
-
+    let index = 0
     const data = {
       logo_url: logo,
       customer_biz: partnerBiz.company.name,
@@ -163,9 +174,10 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
       created_on: DateTimeConverter.date(foundJS.createdAt),
       job_no: foundJS ? foundJS.name : null,
       ref_no: foundGAN.name,
-      product_list: invItems.map((item, idx) => {
+      product_list: invItems.map(item => {
+        index = item.rn == 1 ? index + 1 : index
         return {
-          idx: idx + 1,
+          idx: item.rn == 1 ? index : '',
           pallet_id: item.palletId,
           product_name: item.productName,
           product_type: item.packingType,

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

@@ -1,25 +1,21 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository, IsNull, Not } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
-import {
-  ArrivalNotice,
-  GoodsReceivalNote,
-  OrderProduct,
-  ORDER_PRODUCT_STATUS,
-  ORDER_STATUS
-} from '@things-factory/sales-base'
+import { ArrivalNotice, GoodsReceivalNote, ORDER_STATUS, OrderProduct } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { getRepository, IsNull, Not } from 'typeorm'
-import { TEMPLATE_TYPE } from '../constants'
+
+import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
 import { Worksheet } from '../entities'
 import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderKimedaGRN({ grnNo }, context: any) {
+export async function renderKimedaGRN({ grnNo, timezoneOffSet }, context: any) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -39,7 +35,7 @@ export async function renderKimedaGRN({ grnNo }, context: any) {
   const partnerBiz: Bizplace = foundGRN.bizplace
 
   const partnerDomain: Partner = await getRepository(Partner).findOne({
-    where: { partnerDomain: partnerBiz.domain },
+    where: { partnerDomain: partnerBiz.domain, domain },
     relations: ['domain']
   })
 
@@ -54,10 +50,21 @@ export async function renderKimedaGRN({ grnNo }, context: any) {
     where: { domain, bizplace: domainBizplace }
   })
 
+  // 5. find domain contact point
+  const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
+    where: { domain, bizplace: partnerBiz }
+  })
+
   // 6. find unloading worksheet
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, arrivalNotice: foundGAN, type: ORDER_PRODUCT_STATUS.UNLOADING, status: ORDER_STATUS.DONE },
-    relations: ['worksheetDetails']
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
+  })
+
+  // find putaway worksheet
+  const foundPutawayWS: Worksheet = await getRepository(Worksheet).findOne({
+    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.PUTAWAY, status: ORDER_STATUS.DONE },
+    relations: ['worksheetDetails', 'updater']
   })
 
   const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
@@ -123,15 +130,20 @@ export async function renderKimedaGRN({ grnNo }, context: any) {
     company_address: domainBizplace.company.address,
     order_no: foundGRN.name,
     gan_no: foundGAN.name,
+    gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
     unload_date: DateTimeConverter.date(foundWS.endedAt),
     ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
     received_date: DateTimeConverter.date(foundWS.endedAt),
     truck_no: foundGAN.truckNo || '',
     container_no: foundGAN.containerNo || '',
+    delivery_order_no: foundGAN.deliveryOrderNo ? foundGAN.deliveryOrderNo : '',
+    account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
+    unloaded_by: foundWS ? foundWS.updater.name : '',
+    putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
     product_list: targetProducts.map((item, idx) => {
       return {
         list_no: idx + 1,
-        product_sku: `${item.product_sku}`,
+        product_sku: `${item.product.sku}`,
         product_name: `${item.product.name}(${item.product.description})`,
         product_desc: item.product.description,
         product_nameOnly: item.product.name,