@things-factory/worksheet-base 3.7.6 → 3.7.10

package/server/controllers/render-manifest.ts

@@ -0,0 +1,68 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { config } from '@things-factory/env'
+import { Manifest, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import { TEMPLATE_TYPE } from '../constants'
+import { DateTimeConverter } from '../utils/datetime-util'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+export async function renderManifest({ manifestNo }, context: any) {
+  // 1. find domain
+  const domain: Domain = await getRepository(Domain).findOne({
+    where: { id: context.state.domain.id }
+  })
+
+  // 2. find manifest
+  const manifest: Manifest = await getRepository(Manifest).findOne({
+    where: { domain, name: manifestNo },
+    relations: ['domain']
+  })
+
+  // find release good
+  const releaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
+    where: { domain, manifest }
+  })
+
+  // 7. find grn template based on category
+  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+    where: { domain, category: TEMPLATE_TYPE.MANIFEST_TEMPLATE }
+  })
+
+  const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+  const data = {
+    shipping_provider: manifest?.shippingProvider,
+    manifest_no: manifest?.name,
+    manifest_date: DateTimeConverter.date(manifest?.createdAt).toString(),
+    total_list: releaseGoods?.length || 0,
+    product_list: releaseGoods.map((item, idx) => {
+      return {
+        list_no: idx + 1,
+        order_no: item?.refNo,
+        tracking_no: item?.trackingNo,
+        phone: item?.phone1,
+        delivery_date: DateTimeConverter.date(manifest?.dispatchedAt).toString(),
+        attention_to: item?.attentionTo,
+        delivery_address: item?.deliveryAddress1,
+        postal_code_city: `${item?.postalCode}, ${item?.city}`
+      }
+    })
+  }
+
+  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/graphql/resolvers/worksheet/loading-worksheet.ts

@@ -1,6 +1,6 @@
-import { Equal, getRepository, In, Not } from 'typeorm'
+import { Equal, getRepository, In, Not, SelectQueryBuilder } from 'typeorm'
 
-import { ORDER_INVENTORY_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { ORDER_STATUS, ORDER_INVENTORY_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -22,19 +22,16 @@ export const loadingWorksheetResolver = {
         where: { domain, name: releaseGoodNo }
       })
 
-      const orderInventoryByBin: OrderInventory = await getRepository(OrderInventory).findOne({
-        where: {
-          domain, binLocation, status: In([ORDER_INVENTORY_STATUS.LOADING, ORDER_INVENTORY_STATUS.LOADED])
-        },
-        order: {
-          createdAt: 'ASC'
-        },
-        relations: [
-          'releaseGood',
-          'releaseGood.bizplace',
-          'releaseGood.bizplace.domain'
-        ]
-      })
+      const qb: SelectQueryBuilder<OrderInventory> = getRepository(OrderInventory).createQueryBuilder('orderInventory')
+      qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
+        .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
+        .innerJoinAndSelect('bizplace.domain', 'domain')
+        .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('orderInventory.status IN (:...orderInventoryStatus)', { orderInventoryStatus: [ORDER_INVENTORY_STATUS.LOADING, ORDER_INVENTORY_STATUS.LOADED] })
+        .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
+        .andWhere('releaseGood.status = :status', { status: ORDER_STATUS.LOADING })
+
+      const orderInventoryByBin = await qb.getOne()
 
       if (orderInventoryByBin?.releaseGood) {
         releaseGoodNo = orderInventoryByBin.releaseGood.name

package/server/graphql/resolvers/worksheet/packing-worksheet.ts

@@ -1,4 +1,4 @@
-import { EntityManager, In } from 'typeorm'
+import { EntityManager, In, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
@@ -11,6 +11,7 @@ import { WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
+import { ORDER_STATUS } from '@things-factory/sales-base'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -29,20 +30,16 @@ export const packingWorksheetResolver = {
         where: { domain, name: releaseGoodNo }
       })
 
-      const orderInventoryByBin: OrderInventory = await tx.getRepository(OrderInventory).findOne({
-        where: {
-          domain, binLocation, status: In([ORDER_INVENTORY_STATUS.PACKING, ORDER_INVENTORY_STATUS.PACKED])
-        },
-        order: {
-          createdAt: 'ASC'
-        },
-        relations: [
-          'releaseGood',
-          'releaseGood.bizplace',
-          'releaseGood.bizplace.domain'
-        ]
-      })
+      const qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
+      qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
+        .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
+        .innerJoinAndSelect('bizplace.domain', 'domain')
+        .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('orderInventory.status IN (:...orderInventoryStatus)', { orderInventoryStatus: [ORDER_INVENTORY_STATUS.PACKING, ORDER_INVENTORY_STATUS.PACKED] })
+        .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
+        .andWhere('releaseGood.status = :status', { status: ORDER_STATUS.PACKING })
 
+      const orderInventoryByBin = await qb.getOne()
       if (orderInventoryByBin?.releaseGood) {
         releaseGoodNo = orderInventoryByBin.releaseGood.name
         releaseGood = orderInventoryByBin.releaseGood

package/server/graphql/resolvers/worksheet/picking/picking.ts

@@ -4,9 +4,9 @@ import { EntityManager } from 'typeorm'
 import { PickingWorksheetController } from '../../../../controllers'
 
 export const pickingResolver = {
-  async picking(_: any, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation }, context: any) {
+  async picking(_: any, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation)
+    await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber)
   }
 }
 
@@ -19,8 +19,9 @@ export async function picking(
   palletId: string,
   locationName: string,
   releaseQty: number,
-  binLocation?: string
+  binLocation?: string,
+  serialNumber?: string
 ) {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation)
+  await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber)
 }

package/server/graphql/resolvers/worksheet/picking/scan-product-picking.ts

@@ -6,7 +6,7 @@ import { PickingWorksheetController } from '../../../../controllers'
 export const scanProductPickingResolver = {
   async scanProductPicking(
     _: any,
-    { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation },
+    { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -18,7 +18,8 @@ export const scanProductPickingResolver = {
       worksheetType,
       productBarcode,
       cartonId,
-      binLocation
+      binLocation,
+      serialNumber
     )
   }
 }
@@ -31,7 +32,8 @@ export async function scanProductPicking(
   worksheetType: string,
   productBarcode: string,
   cartonId: string,
-  binLocation?: string
+  binLocation?: string,
+  serialNumber?: string
 ) {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
   await worksheetController.scanProductPicking(
@@ -39,6 +41,7 @@ export async function scanProductPicking(
     worksheetType,
     productBarcode,
     cartonId,
-    binLocation
+    binLocation,
+    serialNumber
   )
 }

package/server/graphql/types/worksheet/index.ts

@@ -291,6 +291,7 @@ export const Mutation = /* GraphQL */ `
     locationName: String!
     releaseQty: Int!
     binLocation: String
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPicking (
@@ -299,6 +300,7 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     cartonId: String!
     binLocation: String
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -666,7 +668,7 @@ export const Query = /* GraphQL */ `
   findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */ [
+export const Types = /* GraphQL */[
   Worksheet,
   AirwayBill,
   NewWorksheet,

package/server/routes.ts

@@ -2,6 +2,7 @@ import { renderElcclGRN } from './controllers/render-elccl-grn'
 import { renderGRN } from './controllers/render-grn'
 import { renderJobSheet } from './controllers/render-job-sheet'
 import { renderKimedaGRN } from './controllers/render-kimeda-grn'
+import { renderManifest } from './controllers/render-manifest'
 import { renderManualDO } from './controllers/render-manual-do'
 import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
@@ -44,4 +45,8 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_job_sheet/:ganNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderJobSheet(context.params, context)
   })
+
+  routes.get('/view_manifest/:manifestNo', async (context, next) => {
+    context.body = await renderManifest(context.params, context)
+  })
 })