@things-factory/sales-base 4.0.39 → 4.0.40

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -3,7 +3,8 @@ import { Product, ProductDetail } from '@things-factory/product-base'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { ORDER_PRODUCT_STATUS } from '../../constants'
-import { OrderProduct, ReleaseGood } from '../../service'
+import { OrderProduct } from '../../service/order-product/order-product'
+import { ReleaseGood } from '../../service/release-good/release-good'
 import { OrderController } from '../order-controller'
 
 export class SellercraftController extends OrderController {

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -17,18 +17,6 @@ import { Product } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
-import {
-  ArrivalNoticePatch,
-  CollectionOrder,
-  JobSheet,
-  NewArrivalNotice,
-  NewOrderProduct,
-  OrderProduct,
-  OrderProductPatch,
-  OrderVas,
-  ReleaseGood,
-  Vas
-} from '../'
 import {
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
@@ -40,11 +28,18 @@ import {
 import { ATTACHMENT_TYPE } from '../../constants/attachment-type'
 import { ValidationError } from '../../errors'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
+import { CollectionOrder } from '../collection-order/collection-order'
+import { JobSheet } from '../job-sheet/job-sheet'
 import { generateJobSheet } from '../job-sheet/job-sheet-mutation'
+import { OrderProduct } from '../order-product/order-product'
+import { NewOrderProduct, OrderProductPatch } from '../order-product/order-product-types'
+import { OrderVas } from '../order-vas/order-vas'
+import { ReleaseGood } from '../release-good/release-good'
 import { confirmReleaseGood, deleteReleaseGood, rejectReleaseGood } from '../release-good/release-good-mutation'
+import { Vas } from '../vas/vas'
 import { validateBulkArrivalNoticesFunction } from './'
 import { ArrivalNotice } from './arrival-notice'
-import { ArrivalNoticeList, RawArrivalNotice } from './arrival-notice-types'
+import { ArrivalNoticeList, ArrivalNoticePatch, NewArrivalNotice, RawArrivalNotice } from './arrival-notice-types'
 
 const debug = require('debug')('things-factory:operato-wms:addArrivalNotice')
 
@@ -956,6 +951,7 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
     const orderProduct: Partial<OrderProduct> = {
       product,
       batchId: raw.batchId,
+      batchIdRef: raw.batchIdRef,
       packingType: raw.packingType,
       packingSize: raw.packingSize,
       packQty: raw.packQty,

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -349,6 +349,7 @@ export async function validateBulkArrivalNoticesFunction(
         container_size: raw.containerSize || null,
         sku: raw.sku || null,
         batch_id: raw.batchId || null,
+        batch_id_ref: raw.batchIdRef || null,
         packing_type: raw.packingType || null,
         packing_size: raw.packingSize || null,
         uom: raw.uom || null,
@@ -362,7 +363,7 @@ export async function validateBulkArrivalNoticesFunction(
 
   await trxMgr.query(
     `
-      CREATE TEMP TABLE temp_order_products(
+      CREATE TEMP TABLE raw_arrival_notices(
         ref_no VARCHAR(150),
         ref_no_2 VARCHAR(150),
         ref_no_3 VARCHAR(150),
@@ -376,6 +377,7 @@ export async function validateBulkArrivalNoticesFunction(
         loose_item BOOLEAN,
         sku VARCHAR(150),
         batch_id VARCHAR(100),
+        batch_id_ref VARCHAR(100),
         packing_type VARCHAR(50),
         packing_size INT,
         uom VARCHAR(10),
@@ -389,30 +391,39 @@ export async function validateBulkArrivalNoticesFunction(
 
   await trxMgr.query(
     `
-      INSERT INTO temp_order_products 
+      CREATE TEMP TABLE temp_gan AS (
+        SELECT an.name, an.ref_no, an.ref_no_2, an.ref_no_3, an.eta_date, an.truck_no, an.own_transport, an.container, an.container_no, an.container_size, an.import_cargo, an.loose_item
+        FROM arrival_notices an
+        WHERE EXISTS (
+          SELECT raw.* FROM
+          JSON_POPULATE_RECORDSET(NULL:: arrival_notices, $1) raw
+          WHERE raw.ref_no = an.ref_no 
+          AND raw.ref_no_2 = an.ref_no_2
+          AND raw.ref_no_3 = an.ref_no_3
+          AND raw.eta_date::date = an.eta_date::date
+          AND raw.truck_no = an.truck_no
+          AND raw.own_transport = an.own_transport
+          AND raw.container = an.container
+          AND raw.container_no = an.container_no
+          AND raw.container_size = an.container_size
+          AND raw.loose_item = an.loose_item
+          AND raw.import_cargo = an.import_cargo			
+        )
+      )
+    `,
+    [json_oi]
+  )
+
+  await trxMgr.query(
+    `
+      INSERT INTO raw_arrival_notices 
       SELECT 
-        js.ref_no, 
-        js.ref_no_2, 
-        js.ref_no_3, 
-        js.eta_date, 
-        js.truck_no, 
-        js.own_transport, 
-        js.container, 
-        js.container_no, 
-        js.container_size, 
-        js.import_cargo, 
-        js.loose_item, 
-        js.sku, 
-        js.batch_id, 
-        js.packing_type, 
-        js.packing_size, 
-        js.uom, 
-        js.pack_qty, 
-        js.pallet_qty, 
-        js.unit_price, 
-        js.manufacture_year 
+        js.ref_no, js.ref_no_2, js.ref_no_3, js.eta_date, js.truck_no, js.own_transport, js.container,
+        js.container_no, js.container_size, js.import_cargo, js.loose_item, js.sku, js.batch_id,
+        js.batch_id_ref, js.packing_type, js.packing_size, js.uom, js.pack_qty, js.pallet_qty,
+        js.unit_price, js.manufacture_year 
       FROM 
-        JSON_POPULATE_RECORDSET(NULL :: temp_order_products, $1) js;
+        JSON_POPULATE_RECORDSET(NULL:: raw_arrival_notices, $1) js;
     `,
     [json_oi]
   )
@@ -420,71 +431,75 @@ export async function validateBulkArrivalNoticesFunction(
   let validatedItems = await trxMgr.query(
     `
       SELECT 
-        tp.ref_no, 
-        tp.ref_no_2, 
-        tp.ref_no_3, 
-        tp.eta_date, 
-        tp.truck_no, 
-        tp.own_transport, 
-        tp.container, 
-        tp.container_no, 
-        tp.container_size, 
-        tp.import_cargo, 
-        tp.loose_item, 
+        raw.ref_no, 
+        raw.ref_no_2, 
+        raw.ref_no_3, 
+        raw.eta_date, 
+        raw.truck_no, 
+        raw.own_transport, 
+        raw.container, 
+        raw.container_no, 
+        raw.container_size, 
+        raw.import_cargo, 
+        raw.loose_item, 
         pr.id AS product_id, 
         pd.id AS product_detail_id, 
-        pr.sku AS sku, 
+        raw.sku AS sku, 
         CASE WHEN pr.description NOT IN (NULL, '', '-') THEN CONCAT(pr.name, '(', pr.description, ')') ELSE pr.name END AS product_info, 
-        tp.batch_id, 
+        raw.batch_id,
+        raw.batch_id_ref,
         pd.packing_type, 
         pd.packing_size, 
-        tp.pack_qty, 
-        pd.uom_value, 
-        pd.uom, 
-        CONCAT(COALESCE(ROUND(pd.uom_value :: numeric, 2), 0) * COALESCE(tp.pack_qty, 0), ' ', pd.uom) AS total_uom_value, 
-        tp.pallet_qty, 
-        tp.unit_price, 
-        tp.manufacture_year, 
-        CASE WHEN an.id NOTNULL THEN CONCAT('duplicated with ', an.name) 
-        WHEN pr.id ISNULL OR pd.id ISNULL OR tp.sku ISNULL THEN 'product not found'
-        WHEN tp.pack_qty ISNULL OR tp.pack_qty <= 0 THEN 'invalid pack qty'
-        WHEN tp.batch_id ISNULL THEN 'batch no. is required'
-        WHEN tp.ref_no ISNULL OR tp.ref_no = '' THEN 'ref no. is required'
-        WHEN tp.eta_date ISNULL OR tp.eta_date = '' THEN 'eta date is required'
-        WHEN tp.eta_date::date < now()::date THEN 'backdate is not allowed'
-        WHEN tp.container_no NOTNULL AND tp.container_size ISNULL OR tp.container_no ISNULL AND tp.container_size NOTNULL THEN 'incomplete container information'
-        WHEN tp.unit_price < 0 THEN 'invalid unit price'
-        WHEN tp.pallet_qty < 0 THEN 'invalid pallet qty'
-        ELSE '' END AS error_msg 
+        sum(raw.pack_qty) AS pack_qty, 
+        sum(pd.uom_value) AS uom_value, 
+        CONCAT(SUM(COALESCE(ROUND(pd.uom_value:: numeric, 2), 0)) * SUM(COALESCE(raw.pack_qty, 0)), ' ', pd.uom) AS total_uom_value,
+        pd.uom,  
+        sum(raw.pallet_qty) AS pallet_qty, 
+        raw.unit_price, 
+        raw.manufacture_year, 
+        CASE WHEN an.ref_no NOTNULL THEN concat('order duplicated with ', an.name)
+          WHEN pr.id ISNULL OR pd.id ISNULL OR raw.sku ISNULL THEN 'product not found'
+          WHEN raw.pack_qty ISNULL OR raw.pack_qty <= 0 THEN 'invalid pack qty'
+          WHEN raw.batch_id ISNULL THEN 'batch no. is required'
+          WHEN raw.ref_no ISNULL OR raw.ref_no = '' THEN 'ref no. is required'
+          WHEN raw.eta_date ISNULL OR raw.eta_date = '' THEN 'eta date is required'
+          WHEN raw.eta_date::date < now()::date THEN 'backdate is not allowed'
+          WHEN raw.container_no NOTNULL AND raw.container_size ISNULL OR raw.container_no ISNULL AND raw.container_size NOTNULL THEN 'incomplete container information'
+          WHEN raw.unit_price < 0 THEN 'invalid unit price'
+          WHEN raw.pallet_qty < 0 THEN 'invalid pallet qty'
+        ELSE '' END AS error_msg
       FROM 
-        temp_order_products tp 
-        LEFT JOIN arrival_notices an ON tp.ref_no = an.ref_no 
-        AND CASE WHEN tp.ref_no_2 NOTNULL THEN tp.ref_no_2 = an.ref_no_2 ELSE 1 = 1 END 
-        AND CASE WHEN tp.ref_no_3 NOTNULL THEN tp.ref_no_3 = an.ref_no_3 ELSE 1 = 1 END 
-        AND CASE WHEN tp.truck_no NOTNULL THEN tp.truck_no = an.truck_no ELSE 1 = 1 END 
-        AND CASE WHEN tp.own_transport NOTNULL THEN tp.own_transport = an.own_transport ELSE 1 = 1 END 
-        AND CASE WHEN tp.container NOTNULL THEN tp.container = an.container ELSE 1 = 1 END 
-        AND CASE WHEN tp.container_no NOTNULL THEN tp.container_no = an.container_no ELSE 1 = 1 END 
-        AND CASE WHEN tp.container_size NOTNULL THEN tp.container_size = an.container_size ELSE 1 = 1 END 
-        AND CASE WHEN tp.loose_item NOTNULL THEN tp.loose_item = an.loose_item ELSE 1 = 1 END 
-        AND CASE WHEN tp.import_cargo NOTNULL THEN tp.import_cargo = an.import_cargo ELSE 1 = 1 END 
-        LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(tp.sku)
+        raw_arrival_notices raw 
+        LEFT JOIN temp_gan an ON raw.ref_no = an.ref_no 
+        AND raw.ref_no_2 = an.ref_no_2
+        AND raw.ref_no_3 = an.ref_no_3
+        AND raw.eta_date::date = an.eta_date::date
+        AND raw.truck_no = an.truck_no
+        AND raw.own_transport = an.own_transport
+        AND raw.container = an.container
+        AND raw.container_no = an.container_no
+        AND raw.container_size = an.container_size
+        AND raw.loose_item = an.loose_item
+        AND raw.import_cargo = an.import_cargo 
+        LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(raw.sku)
         LEFT JOIN product_details pd ON pr.id = pd.product_id
-        AND CASE WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom NOTNULL
-          THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.uom = tp.uom 
-          WHEN tp.packing_type NOTNULL AND tp.packing_size NOTNULL AND tp.uom ISNULL
-            THEN pd.packing_type = tp.packing_type AND pd.packing_size = tp.packing_size AND pd.is_default IS TRUE
-            WHEN tp.packing_type ISNULL AND tp.packing_size ISNULL AND tp.uom NOTNULL
-              THEN pd.uom = tp.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
+        AND pr.bizplace_id = $1
+        AND CASE WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom NOTNULL
+          THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.uom = raw.uom 
+          WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom ISNULL
+            THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.is_default IS TRUE
+            WHEN raw.packing_type ISNULL AND raw.packing_size ISNULL AND raw.uom NOTNULL
+              THEN pd.uom = raw.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
         END
-      WHERE 
-        pr.bizplace_id = $1
-
+      GROUP BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.eta_date, raw.truck_no, raw.own_transport, raw.container, raw.container_no, raw.container_size, raw.import_cargo, raw.loose_item,
+        pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_year, an.ref_no, an.name, raw.pack_qty,
+        raw.pallet_qty
+      ORDER BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.sku
     `,
     [companyBizplace.id]
   )
 
-  await trxMgr.query('DROP TABLE temp_order_products')
+  await trxMgr.query('DROP TABLE raw_arrival_notices, temp_gan')
 
   return validatedItems.map(item => {
     let manufactureYear = item.manufacture_year
@@ -510,6 +525,7 @@ export async function validateBulkArrivalNoticesFunction(
       sku: item.sku,
       productInfo: item.product_info,
       batchId: item.batch_id,
+      batchIdRef: item.batch_id_ref,
       packingType: item.packing_type,
       packingSize: item.packing_size,
       uom: item.uom,

package/server/service/arrival-notice/arrival-notice-types.ts

@@ -98,6 +98,9 @@ export class NewArrivalNotice {
   @Field({ nullable: true })
   batchId?: string
 
+  @Field({ nullable: true })
+  batchIdRef?: string
+
   @Field({ nullable: true })
   packingType?: string
 
@@ -263,6 +266,9 @@ export class RawArrivalNotice {
   @Field({ nullable: true })
   batchId?: string
 
+  @Field({ nullable: true })
+  batchIdRef?: string
+
   @Field({ nullable: true })
   packingType?: string
 

package/server/service/arrival-notice/arrival-notice.ts

@@ -18,7 +18,12 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 
-import { CollectionOrder, OrderInventory, OrderProduct, OrderVas, PurchaseOrder, ReleaseGood } from '../'
+import { CollectionOrder } from '../collection-order/collection-order'
+import { OrderInventory } from '../order-inventory/order-inventory'
+import { OrderProduct } from '../order-product/order-product'
+import { OrderVas } from '../order-vas/order-vas'
+import { PurchaseOrder } from '../purchase-order/purchase-order'
+import { ReleaseGood } from '../release-good/release-good'
 
 @Entity()
 @Index('ix_arrival-notice_0', (arrivalNotice: ArrivalNotice) => [arrivalNotice.domain, arrivalNotice.name], {

package/server/service/delivery-order/delivery-order-mutation.ts

@@ -12,14 +12,6 @@ import { Domain, ObjectRef } from '@things-factory/shell'
 import { TransportDriver, TransportVehicle, TRUCK_STATUS } from '@things-factory/transport-base'
 import { Inventory } from '@things-factory/warehouse-base'
 
-import {
-  DeliveryOrderPatch,
-  NewDeliveryOrder,
-  NewOrderInventory,
-  OrderInventory,
-  OrderInventoryPatch,
-  ReleaseGood
-} from '../'
 import {
   ORDER_INVENTORY_STATUS,
   ORDER_NUMBER_RULE_TYPE,
@@ -28,7 +20,11 @@ import {
   ORDER_TYPES
 } from '../../constants'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
+import { OrderInventory } from '../order-inventory/order-inventory'
+import { NewOrderInventory, OrderInventoryPatch } from '../order-inventory/order-inventory-types'
+import { ReleaseGood } from '../release-good/release-good'
 import { DeliveryOrder } from './delivery-order'
+import { DeliveryOrderPatch, NewDeliveryOrder } from './delivery-order-types'
 
 @Resolver(DeliveryOrder)
 export class DeliveryOrderMutation {

package/server/service/delivery-order/delivery-order-query.ts

@@ -8,9 +8,12 @@ import { Product } from '@things-factory/product-base'
 import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
-import { DeliveryOrderList, OrderInventory, OrderInventoryList, ReleaseGood } from '../'
 import { ORDER_STATUS } from '../../constants'
+import { OrderInventory } from '../order-inventory/order-inventory'
+import { OrderInventoryList } from '../order-inventory/order-inventory-types'
+import { ReleaseGood } from '../release-good/release-good'
 import { DeliveryOrder } from './delivery-order'
+import { DeliveryOrderList } from './delivery-order-types'
 
 const debug = require('debug')('things-factory:sales-base:delivery-orders')
 
@@ -100,9 +103,6 @@ export class DeliveryOrderQuery {
       qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
       qb.leftJoinAndSelect('do.transportDriver', 'td')
       qb.leftJoinAndSelect('do.transportVehicle', 'th')
-      qb.leftJoinAndSelect('do.orderInventories', 'oi')
-      qb.leftJoinAndSelect('oi.inventory', 'inv')
-      qb.leftJoinAndSelect('inv.product', 'prd')
       qb.leftJoinAndSelect('do.creator', 'creator')
       qb.leftJoinAndSelect('do.updater', 'updater')
       qb.leftJoin(

package/server/service/delivery-order/delivery-order-summary-report.ts

@@ -0,0 +1,152 @@
+import { Args, Ctx, Query, Resolver } from 'type-graphql'
+import { getRepository } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
+
+import { ReleaseGood } from '../release-good/release-good'
+import { DeliveryOrder } from './delivery-order'
+import { DeliveryOrderList } from './delivery-order-types'
+
+const debug = require('debug')('things-factory:sales-base:delivery-orders')
+
+@Resolver(DeliveryOrder)
+export class DeliveryOrderSummaryReport {
+  @Query(returns => DeliveryOrderList)
+  async deliveryOrderSummaryReport(@Ctx() context: any, @Args() params: ListParam): Promise<DeliveryOrderList> {
+    try {
+      const { domain, user }: { domain: Domain; user: User } = context.state
+
+      const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
+      if (!bizplaceFilter) {
+        params.filters.push({
+          name: 'bizplaceId',
+          operator: 'in',
+          value: await getPermittedBizplaceIds(domain, user),
+          relation: false
+        })
+      }
+
+      const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo')
+      if (releaseGoodParam) {
+        let arrFilters = []
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'releaseGoodNo'),
+          1
+        )
+        arrFilters.push({ ...releaseGoodParam, name: 'name' })
+
+        const foundReleaseGoods: ReleaseGood[] = await getRepository(ReleaseGood).find({
+          ...convertListParams({ filters: arrFilters })
+        })
+
+        if (foundReleaseGoods && foundReleaseGoods.length) {
+          params.filters.push({
+            name: 'releaseGoodId',
+            operator: 'in',
+            value: foundReleaseGoods.map((releaseGood: ReleaseGood) => releaseGood.id),
+            relation: false
+          })
+        }
+      }
+
+      const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset')
+      let tzOffset = 0
+      if (tzOffsetIdx >= 0) {
+        tzOffset = params.filters[tzOffsetIdx].value
+        params.filters.splice(tzOffsetIdx, 1)
+      }
+
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
+
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'gte',
+          value: fromDateVal.toISOString(),
+          relation: false
+        })
+      }
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
+
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+          relation: false
+        })
+      }
+
+      let refNoFilter = params.filters.find(x => x.name == 'refNo')
+      let refNo2Filter = params.filters.find(x => x.name == 'refNo2')
+      let refNo3Filter = params.filters.find(x => x.name == 'refNo3')
+
+      params.filters = params.filters.filter(x => x.name != 'refNo' && x.name != 'refNo2' && x.name != 'refNo3')
+
+      const qb: any = getRepository(DeliveryOrder).createQueryBuilder('do')
+      buildQuery(qb, params, context)
+      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
+      qb.leftJoinAndSelect('do.domain', 'domain')
+      qb.leftJoinAndSelect('do.bizplace', 'bizplace')
+      qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
+      qb.leftJoinAndSelect('do.transportDriver', 'td')
+      qb.leftJoinAndSelect('do.transportVehicle', 'th')
+      qb.leftJoinAndSelect('do.orderInventories', 'oi')
+      qb.leftJoinAndSelect('oi.inventory', 'inv')
+      qb.leftJoinAndSelect('inv.product', 'prd')
+      qb.leftJoinAndSelect('do.creator', 'creator')
+      qb.leftJoinAndSelect('do.updater', 'updater')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'DELIVERY_STATUS'`)
+        },
+        'cc',
+        'cc.status = do.status'
+      )
+
+      if (refNoFilter?.value) {
+        qb.andWhere('releaseGood.ref_no ilike :refNo', { refNo: refNoFilter.value })
+      }
+      if (refNo2Filter?.value) {
+        qb.andWhere('releaseGood.ref_no_2 ilike :refNo2', { refNo2: refNo2Filter.value })
+      }
+      if (refNo3Filter?.value) {
+        qb.andWhere('releaseGood.ref_no_3 ilike :refNo3', { refNo3: refNo3Filter.value })
+      }
+
+      const arrChildSortData = ['refNo', 'refNo2', 'refNo3']
+      const arrNameSortData = ['bizplace', 'releaseGood', 'updater']
+      const sort = (params.sortings || []).reduce(
+        (acc, sort) => ({
+          ...acc,
+          [arrChildSortData.indexOf(sort.name) >= 0
+            ? 'releaseGood.' + sort.name
+            : arrNameSortData.indexOf(sort.name) >= 0
+            ? sort.name + '.name'
+            : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+        }),
+        params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
+      )
+
+      qb.orderBy(sort)
+
+      const [items, total] = await qb.getManyAndCount()
+      return { items, total }
+    } catch (error) {
+      debug('deliveryOrders', error.toString())
+      throw error
+    }
+  }
+}

package/server/service/delivery-order/delivery-order.ts

@@ -17,7 +17,10 @@ import { Bizplace } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 import { TransportDriver, TransportVehicle } from '@things-factory/transport-base'
 
-import { OrderInventory, ReleaseGood, RetailReplenishmentOrder, TransferOrder } from '../'
+import { OrderInventory } from '../order-inventory/order-inventory'
+import { ReleaseGood } from '../release-good/release-good'
+import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
+import { TransferOrder } from '../transfer-order/transfer-order'
 
 @Entity()
 @Index('ix_delivery-order_0', (deliveryOrder: DeliveryOrder) => [deliveryOrder.domain, deliveryOrder.name], {

package/server/service/delivery-order/index.ts

@@ -1,9 +1,11 @@
 import { DeliveryOrder } from './delivery-order'
 import { DeliveryOrderMutation } from './delivery-order-mutation'
 import { DeliveryOrderQuery } from './delivery-order-query'
+import { DeliveryOrderSummaryReport } from './delivery-order-summary-report'
 
 export const entities = [DeliveryOrder]
-export const resolvers = [DeliveryOrderQuery, DeliveryOrderMutation]
+export const resolvers = [DeliveryOrderQuery, DeliveryOrderMutation, DeliveryOrderSummaryReport]
 
 export * from './delivery-order-mutation'
 export * from './delivery-order-query'
+export * from './delivery-order-summary-report'

package/server/service/index.ts

@@ -1,13 +1,3 @@
-/* IMPORT ENTITIES AND RESOLVERS */
-import { entities as ManifestEntities, resolvers as ManifestResolvers } from './manifest'
-import {
-  entities as ReverseKittingOrderInventoryEntities,
-  resolvers as ReverseKittingOrderInventoryResolvers
-} from './reverse-kitting-order-inventory'
-import {
-  entities as ReverseKittingOrderEntities,
-  resolvers as ReverseKittingOrderResolvers
-} from './reverse-kitting-order'
 import { entities as ArrivalNoticeEntity, resolvers as ArrivalNoticeResolvers } from './arrival-notice'
 import { entities as ClaimEntity, resolvers as ClaimResolvers } from './claim'
 import { entities as ClaimDetailEntity, resolvers as ClaimDetailResolvers } from './claim-detail'
@@ -17,7 +7,10 @@ import { entities as DeliveryOrderEntity, resolvers as DeliveryOrderResolvers }
 import { entities as GoodsReceivalNoteEntity, resolvers as GoodsReceivalNoteResolvers } from './goods-receival-note'
 import { entities as InventoryCheckEntity, resolvers as InventoryCheckResolvers } from './inventory-check'
 import { entities as InvoiceEntity, resolvers as InvoiceResolvers } from './invoice'
+import { entities as InvoiceProductEntity, resolvers as InvoiceProductResolvers } from './invoice-product'
 import { entities as JobSheetEntity, resolvers as JobSheetResolvers } from './job-sheet'
+/* IMPORT ENTITIES AND RESOLVERS */
+import { entities as ManifestEntities, resolvers as ManifestResolvers } from './manifest'
 import { entities as OrderInventoryEntity, resolvers as OrderInventoryResolvers } from './order-inventory'
 import { entities as OrderProductEntity, resolvers as OrderProductResolvers } from './order-product'
 import { entities as OrderVasEntity, resolvers as OrderVasResolvers } from './order-vas'
@@ -33,6 +26,14 @@ import {
   resolvers as RetailReplenishmentOrderResolvers
 } from './retail-replenishment-order'
 import { entities as ReturnOrderEntity, resolvers as ReturnOrderResolvers } from './return-order'
+import {
+  entities as ReverseKittingOrderEntities,
+  resolvers as ReverseKittingOrderResolvers
+} from './reverse-kitting-order'
+import {
+  entities as ReverseKittingOrderInventoryEntities,
+  resolvers as ReverseKittingOrderInventoryResolvers
+} from './reverse-kitting-order-inventory'
 import { entities as ShippingOrderEntity, resolvers as ShippingOrderResolvers } from './shipping-order'
 import { entities as TransferOrderEntity, resolvers as TransferOrderResolvers } from './transfer-order'
 import { entities as VasEntity, resolvers as VasResolvers } from './vas'
@@ -51,6 +52,7 @@ export * from './delivery-order/delivery-order'
 export * from './goods-receival-note/goods-receival-note'
 export * from './inventory-check/inventory-check'
 export * from './invoice/invoice'
+export * from './invoice-product/invoice-product'
 export * from './job-sheet/job-sheet'
 export * from './order-inventory/order-inventory'
 export * from './order-product/order-product'
@@ -75,6 +77,7 @@ export * from './delivery-order/delivery-order-types'
 export * from './goods-receival-note/goods-receival-note-types'
 export * from './inventory-check/inventory-check-types'
 export * from './invoice/invoice-types'
+export * from './invoice-product/invoice-product-types'
 export * from './job-sheet/job-sheet-types'
 export * from './order-inventory/order-inventory-types'
 export * from './order-product/order-product-types'
@@ -100,6 +103,7 @@ export * from './delivery-order/delivery-order-mutation'
 export * from './goods-receival-note/goods-receival-note-mutation'
 export * from './inventory-check/inventory-check-mutation'
 export * from './invoice/invoice-mutation'
+export * from './invoice-product/invoice-product-mutation'
 export * from './job-sheet/job-sheet-mutation'
 export * from './order-inventory/order-inventory-mutation'
 export * from './order-product/order-product-mutation'
@@ -121,9 +125,11 @@ export * from './claim-order/claim-order-query'
 export * from './claim/claim-query'
 export * from './collection-order/collection-order-query'
 export * from './delivery-order/delivery-order-query'
+export * from './delivery-order/delivery-order-summary-report'
 export * from './goods-receival-note/goods-receival-note-query'
 export * from './inventory-check/inventory-check-query'
 export * from './invoice/invoice-query'
+export * from './invoice-product/invoice-product-query'
 export * from './job-sheet/job-sheet-query'
 export * from './order-inventory/order-inventory-query'
 export * from './order-product/order-product-query'
@@ -141,7 +147,7 @@ export * from './vas/vas-query'
 
 export const entities = [
   /* ENTITIES */
-	...ManifestEntities,
+  ...ManifestEntities,
   ...ReverseKittingOrderInventoryEntities,
   ...ReverseKittingOrderEntities,
   ...ArrivalNoticeEntity,
@@ -153,6 +159,7 @@ export const entities = [
   ...GoodsReceivalNoteEntity,
   ...InventoryCheckEntity,
   ...InvoiceEntity,
+  ...InvoiceProductEntity,
   ...JobSheetEntity,
   ...OrderInventoryEntity,
   ...OrderProductEntity,
@@ -171,7 +178,7 @@ export const entities = [
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...ManifestResolvers,
+    ...ManifestResolvers,
     ...ReverseKittingOrderInventoryResolvers,
     ...ReverseKittingOrderResolvers,
     ...ArrivalNoticeResolvers,
@@ -183,6 +190,7 @@ export const schema = {
     ...GoodsReceivalNoteResolvers,
     ...InventoryCheckResolvers,
     ...InvoiceResolvers,
+    ...InvoiceProductResolvers,
     ...JobSheetResolvers,
     ...OrderInventoryResolvers,
     ...OrderProductResolvers,