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

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

@@ -87,6 +87,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
     const releaseGood: ReleaseGood = worksheet.releaseGood
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
+    let location: Location = inventory.location
 
     const originLocation: Location = inventory.location
     const originPalletId: string = inventory.palletId
@@ -95,6 +96,17 @@ export class ReturningWorksheetController extends VasWorksheetController {
       where: { domain: this.domain, name: toLocationName },
       relations: ['warehouse']
     })
+
+    if (worksheet.type === 'WAREHOUSE_RETURN' && releaseGood.recall) {
+      if (
+        ![LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE].some(l => {
+          return l === toLocation.type
+        })
+      ) {
+        throw new Error('Location should be assigned only to Quarantine or Reserve Zone')
+      }
+    }
+
     if (!toLocation) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(toLocationName))
 
     const isPalletDiff: boolean = originPalletId !== palletId
@@ -158,6 +170,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
       const releaseGood: ReleaseGood = worksheet.releaseGood
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       let inventory: Inventory = targetInventory.inventory
+      let invLocation: Location = inventory.location
 
       if (inventory.cartonId !== cartonId) {
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('cartonId', cartonId, inventory.cartonId))
@@ -178,6 +191,16 @@ export class ReturningWorksheetController extends VasWorksheetController {
         relations: ['warehouse']
       })
 
+      if (worksheet.type === 'WAREHOUSE_RETURN' && releaseGood.recall) {
+        if (
+          ![LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE].some(l => {
+            return l === location.type
+          })
+        ) {
+          throw new Error('Location should be assigned only to Quarantine or Reserve Zone')
+        }
+      }
+
       if (!location) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(toLocationName))
       const warehouse: Warehouse = location.warehouse
       const zone: string = warehouse.zone

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

@@ -1,29 +1,29 @@
-import { IsNull, In } from 'typeorm'
+import { In, IsNull } from 'typeorm'
 
-import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { Product, ProductDetail } from '@things-factory/product-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderTote,
+  OrderToteItem,
+  ReleaseGood
+} from '@things-factory/sales-base'
 import {
   Inventory,
+  INVENTORY_ITEM_SOURCE,
+  INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
   InventoryItem,
-  INVENTORY_STATUS,
   InventoryNoGenerator,
-  INVENTORY_ITEM_SOURCE,
   Tote,
   TOTE_STATUS
 } from '@things-factory/warehouse-base'
-import {
-  ReleaseGood,
-  OrderInventory,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS,
-  OrderTote,
-  OrderToteItem,
-  OrderNoGenerator
-} from '@things-factory/sales-base'
-import { Worksheet, WorksheetDetail } from '../../entities'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
-import { temporaryGetRemainInventoryAmount } from 'server/graphql/resolvers/worksheet/vas-transactions/common-utils'
+import { Worksheet, WorksheetDetail } from '../../entities'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class SortingWorksheetController extends VasWorksheetController {
   async generateSortingWorksheet(
@@ -511,11 +511,11 @@ export class SortingWorksheetController extends VasWorksheetController {
       }
 
       //if found order tote then check if order tote item exist
-      const foundOrderToteItem: OrderToteItem = await this.trxMgr.getRepository(OrderToteItem).findOne({
-        domain: this.domain,
-        orderProduct: targetProduct,
-        orderInventory: targetInventory,
-        orderTote: foundOrderTote
+      const foundOrderToteItem: OrderToteItem = await this.trxMgr.getRepository(OrderToteItem).findOneBy({
+        domain: { id: this.domain.id },
+        orderProduct: { id: targetProduct.id },
+        orderInventory: { id: targetInventory.id },
+        orderTote: { id: foundOrderTote.id }
       })
 
       //if not order tote item doesnt exist then create one

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

@@ -1,12 +1,12 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { EntityManager, getManager, getRepository } from 'typeorm'
+import { EntityManager, getManager } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { ArrivalNotice, GoodsReceivalNote, ORDER_PRODUCT_STATUS, ORDER_STATUS } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE, TRANSACTION_TYPE } from '../constants'
 import { Worksheet } from '../entities'
@@ -14,7 +14,7 @@ import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderElcclGRN({ grnNo }, context: any) {
+export async function renderElcclGRN({ grnNo }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -22,7 +22,7 @@ export async function renderElcclGRN({ 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.company', 'arrivalNotice']
   })
 
@@ -35,29 +35,34 @@ export async function renderElcclGRN({ grnNo }, context: any) {
 
   // 5. find domain contact point
   const foundCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: partnerBiz }
+    where: { domain: { id: domain.id }, 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 },
+    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']
   // })
 
   // 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
     }
   })
@@ -65,14 +70,14 @@ export async function renderElcclGRN({ grnNo }, context: any) {
   // 9. find signature
   const foundSignature: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.SIGNATURE
     }
   })
 
   const foundCop: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.COP
     }
   })

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

@@ -1,14 +1,14 @@
 import FormData from 'form-data'
 import _ from 'lodash'
 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'
 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 { Domain, getRepository } from '@things-factory/shell'
 import { InventoryItem, ReducedInventoryHistory } from '@things-factory/warehouse-base'
 
 import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
@@ -17,7 +17,7 @@ import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
+export async function renderFmGRN({ grnNo, timezoneOffSet }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -25,7 +25,7 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, 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']
   })
 
@@ -76,40 +76,55 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, 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 }
   })
 
   // 5. find domain contact point
   const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: partnerBiz }
+    where: { domain: { id: domain.id }, 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 },
+    where: {
+      domain: { id: domain.id },
+      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 },
+    where: {
+      domain: { id: domain.id },
+      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()) },
+    where: {
+      domain: { id: domain.id },
+      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 }
+    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
     }
   })
@@ -117,14 +132,14 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
   // 9. find signature
   const foundSignature: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.SIGNATURE
     }
   })
 
   const foundCop: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.COP
     }
   })
@@ -240,7 +255,10 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
                 product_uom: `${unloadInvHistory.uom || item.uom}`,
                 product_gross_weight: item.product.grossWeight || null,
                 unit_price: item.unitPrice || null,
-                expiry_date: unloadInvHistory.expiryDate && unloadInvHistory.expiryDate != '' ? new Date(unloadInvHistory.expiryDate).toISOString().split('T')[0] : '',
+                expiry_date:
+                  unloadInvHistory.expiryDate && unloadInvHistory.expiryDate != ''
+                    ? new Date(unloadInvHistory.expiryDate).toISOString().split('T')[0]
+                    : '',
                 manufacture_date: item.manufactureDate,
                 reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
                 remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')

package/server/controllers/render-grn.ts

@@ -1,15 +1,15 @@
-import _ from 'lodash'
 import FormData from 'form-data'
+import _ from 'lodash'
 import fetch from 'node-fetch'
-import { getRepository, IsNull, Not } from 'typeorm'
-import { InventoryItem } from '@things-factory/warehouse-base'
+import { 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 { Domain, getRepository } from '@things-factory/shell'
+import { InventoryItem, ReducedInventoryHistory } from '@things-factory/warehouse-base'
 
 import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
 import { Worksheet } from '../entities'
@@ -17,7 +17,7 @@ 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) {
+export async function renderGRN({ grnNo, timezoneOffSet }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -25,7 +25,7 @@ export async function renderGRN({ grnNo, timezoneOffSet }, 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']
   })
 
@@ -76,40 +76,55 @@ export async function renderGRN({ grnNo, timezoneOffSet }, 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 }
   })
 
   // 5. find domain contact point
   const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: partnerBiz }
+    where: { domain: { id: domain.id }, 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 },
+    where: {
+      domain: { id: domain.id },
+      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 },
+    where: {
+      domain: { id: domain.id },
+      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()) },
+    where: {
+      domain: { id: domain.id },
+      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 }
+    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
     }
   })
@@ -117,14 +132,14 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
   // 9. find signature
   const foundSignature: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.SIGNATURE
     }
   })
 
   const foundCop: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.COP
     }
   })

package/server/controllers/render-invoices.ts

@@ -1,19 +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 } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+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 renderInvoices({ req, timezoneOffSet }, context: any) {
+export async function renderInvoices({ req, timezoneOffSet }, context: ResolverContext) {
   try {
     const domain: Domain = await getRepository(Domain).findOne({
       where: { id: context.state.domain.id }

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

@@ -1,13 +1,15 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { EntityManager, getManager, IsNull, Not } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
-import { Bizplace } from '@things-factory/biz-base'
 import { Partner } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Product } from '@things-factory/product-base'
 import { ArrivalNotice, JobSheet, OrderProduct } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { EntityManager, getManager, getRepository, IsNull, Not } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+
 import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
 import { Worksheet } from '../entities'
 import { DateTimeConverter } from '../utils/datetime-util'
@@ -21,13 +23,13 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
 
   // find GAN
   const foundGAN: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
-    where: { domain, name: ganNo },
+    where: { domain: { id: domain.id }, name: ganNo },
     relations: ['bizplace', 'bizplace.company', 'bizplace.domain']
   })
 
   // find job sheet
   const foundJS: JobSheet = await getRepository(JobSheet).findOne({
-    where: { domain, bizplace: foundGAN.bizplace, arrivalNoticeRefNo: foundGAN.name }
+    where: { domain: { id: domain.id }, bizplace: foundGAN.bizplace, arrivalNoticeRefNo: foundGAN.name }
   })
 
   // customer bizplace
@@ -45,12 +47,12 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
   })
 
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.JOB_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.JOB_TEMPLATE }
   })
 
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })
@@ -63,13 +65,13 @@ export async function renderJobSheet({ ganNo, timezoneOffSet }, context) {
 
   // find unloading worksheet for getting unloading time
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING },
+    where: { domain: { id: domain.id }, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING },
     relations: ['updater']
   })
 
   // find list of unloaded product
   const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
-    where: { domain, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()) },
+    where: { domain: { id: domain.id }, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()) },
     relations: ['product']
   })
 

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

@@ -1,13 +1,13 @@
 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'
 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 { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
 import { Worksheet } from '../entities'
@@ -15,7 +15,7 @@ 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, timezoneOffSet }, context: any) {
+export async function renderKimedaGRN({ grnNo, timezoneOffSet }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -23,7 +23,7 @@ export async function renderKimedaGRN({ grnNo, timezoneOffSet }, 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']
   })
 
@@ -47,40 +47,55 @@ export async function renderKimedaGRN({ grnNo, timezoneOffSet }, 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 }
   })
 
   // 5. find domain contact point
   const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: partnerBiz }
+    where: { domain: { id: domain.id }, 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 },
+    where: {
+      domain: { id: domain.id },
+      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 },
+    where: {
+      domain: { id: domain.id },
+      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()) },
+    where: {
+      domain: { id: domain.id },
+      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 }
+    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
     }
   })
@@ -88,14 +103,14 @@ export async function renderKimedaGRN({ grnNo, timezoneOffSet }, context: any) {
   // 9. find signature
   const foundSignature: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.SIGNATURE
     }
   })
 
   const foundCop: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.COP
     }
   })