@things-factory/operato-wms 5.0.13 → 6.0.0-alpha.1

package/server/graphql/resolvers/reports/outbound-order-details-report.ts

@@ -1,16 +1,14 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { Filter, ListParam } from '@things-factory/shell'
 
 import { rawProductsQuery } from '../../../utils'
 
 export const outboundOrderDetailsReport = {
-  async outboundOrderDetailsReport(_: any, params: ListParam, context: any) {
+  async outboundOrderDetailsReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      const { tx } = context.state
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
@@ -19,10 +17,10 @@ export const outboundOrderDetailsReport = {
       let status = params.filters.find(data => data.name === 'status')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -35,7 +33,7 @@ export const outboundOrderDetailsReport = {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
@@ -54,30 +52,37 @@ export const outboundOrderDetailsReport = {
         `
         create temp table temp_outbound_order_report on commit drop as (
           select * from (
-            select oi.id, '${bizplace.id}' AS "bizplace_id", '${bizplace.name}' AS "bizplace_name", '${
-          bizplace.description
-        }' AS "bizplace_description", 
-            do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date",
-            do2."to", do2.contact_point_ref_id,
-            rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", rg.status as "ro_status", 
-            rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by, rg.checked_remark_by, rg.checked_remark_at,
+            select oi.id,
+            oi.release_qty AS "release_qty", oi.picked_at, oi.picked_by, oi.packed_at, oi.packed_by, oi.loaded_at, oi.loaded_by,
+            oi.release_qty as "qty", oi.release_uom_value as "uom_value", oi.return_to_location_qty, oi.return_to_location_uom_value,
+            coalesce(do2.other_driver, td.name) as driver_name, 
+            coalesce(do2.truck_no, tv.name, rg.truck_no) as vehicle_no,
+            do2.name AS "delivery_order_no", do2.delivery_date AS "delivery_order_delivery_date", do2."to", do2.contact_point_ref_id, do2.pallet_qty,
+            coalesce(do2.delivery_date_time, do2.delivery_date::timestamp, ms.dispatched_at, null) as "dispatched_at",
+            rg.bizplace_id, $5 AS "bizplace_name", $6 AS "bizplace_description", 
+            coalesce( concat(do2.delivery_address_1, do2.delivery_address_2, do2.delivery_address_3, do2.delivery_address_4, do2.delivery_address_5, do2.postal_code, do2.country), concat(rg.delivery_address_1, rg.delivery_address_2, rg.delivery_address_3, rg.delivery_address_4, rg.delivery_address_5, rg.postal_code, rg.country)) as delivery_address,
+            so.container_no, so.container_size,
+            rg.export_option, rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", rg.status as "ro_status", 
+            rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by, rg.checked_remark_by, rg.checked_remark_at, coalesce(do2.own_collection, rg.own_transport) AS own_transport,
             p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
-            i.packing_type as "pack_type", i.packing_size as "pack_size", oi.release_qty AS "release_qty",
-            oi.picked_at, oi.picked_by, oi.packed_at, oi.packed_by, oi.loaded_at, oi.loaded_by, oi.shipped_at,
-            oi.release_qty as "qty", oi.release_uom_value as "uom_value", i.uom, i.unit_cost,
-            oi.return_to_location_qty, oi.return_to_location_uom_value, 
-            i.id as inventory_id, i.pallet_id, i.carton_id, i.batch_id, i.batch_id_ref, i.expiration_date, i.manufacture_date
-            from order_inventories oi
-            inner join release_goods rg on rg.id = oi.release_good_id 
+            i.packing_type as "pack_type", i.packing_size as "pack_size", 
+            i.uom, i.unit_cost,
+            i.id as inventory_id, i.pallet_id, i.carton_id, i.batch_id, i.batch_id_ref, i.expiration_date, i.manufacture_date,
+            coalesce(ms.name,'') as manifest_no, coalesce(rg.manifested_at, ms.created_at) as manifested_at, coalesce(u6.name, u5.name) as manifested_by
+            from release_goods rg
+            inner join order_inventories oi on rg.id = oi.release_good_id
+            left join shipping_orders so on so.id = rg.shipping_order_id  
             left join users u4 on u4.id = rg.accepted_by_id 
+            left join manifests ms on ms.id = rg.manifest_id
+            left join users u5 on u5.id = ms.creator_id
+            left join users u6 on u6.id = rg.manifested_by_id
             inner join inventories i on i.id = oi.inventory_id 
             inner join temp_products p on p.id = oi.product_id
             left join delivery_orders do2 on do2.id = oi.delivery_order_id 
-            where exists (
-              select rg2.id from release_goods rg2
-              where rg2.domain_id = $1 and rg2.bizplace_id = $2
-              and rg2.created_at >= $3 and rg2.created_at <= $4 and rg2.id = oi.release_good_id 
-            )
+            left join transport_drivers td ON td.id = do2.transport_driver_id 
+            left join transport_vehicles tv on tv.id = do2.transport_vehicle_id
+            where rg.bizplace_id = $2 and rg.domain_id = $1
+            and rg.created_at >= $3 and rg.created_at <= $4
             and oi.status <> 'REPLACED'
             ${status ? `and rg.status = '${status.value}' ` : ``}
           ) src
@@ -85,7 +90,7 @@ export const outboundOrderDetailsReport = {
           ${extraQueryFilters}
         )
       `,
-        [context.state.domain.id, bizplace.id, fromDate.value, toDate.value]
+        [context.state.domain.id, bizplace.id, fromDate.value, toDate.value, bizplace.name, bizplace.description]
       )
 
       console.timeEnd('temp')
@@ -93,6 +98,16 @@ export const outboundOrderDetailsReport = {
         select count(*) from temp_outbound_order_report
       `)
 
+      await tx.query(
+        `
+        create temp table temp_outbound_order_worksheet on commit drop as ( 
+          select oi.id, w.started_at, w.ended_at, w.type from temp_outbound_order_report oi 
+          inner join worksheet_details wd on wd.target_inventory_id = oi.id
+          inner join worksheets w on w.id = wd.worksheet_id
+        )
+        `
+      )
+
       console.time('result')
       const result: any = await tx.query(
         `
@@ -101,10 +116,12 @@ export const outboundOrderDetailsReport = {
         round((qty * unit_nett_weight)::numeric ,4) as total_unit_nett_weight, 
         round((qty * unit_gross_weight)::numeric ,4) as total_unit_gross_weight
         from (
-          select *,
-          w.started_at as picking_start,
-          w.ended_at as picking_complete,
-          coalesce(oi."to", concat(cp.address, cp.address_2)) as "delivery_address",
+          select oi.*,
+          wpick.started_at as picking_start, wpick.ended_at as picking_complete,
+          wpack.started_at as packing_start, wpack.ended_at as packing_complete,
+          wsort.started_at as sorting_start, wsort.ended_at as sorting_complete,
+          wload.started_at as loading_start, wload.ended_at as loading_complete,
+          coalesce(delivery_address, concat(cp.address, cp.address_2)) as "delivery_address",
           coalesce((select volume from product_details pd where pd.product_id = oi.product_id and pd.packing_type = oi.pack_type and pd.packing_size = oi.pack_size 
           order by created_at desc
           fetch first 1 rows only),0) as unit_volume,
@@ -124,10 +141,15 @@ export const outboundOrderDetailsReport = {
             order by created_at desc
             fetch first 1 rows only), oi.unit_cost, 0) as unit_cost
           from temp_outbound_order_report oi
-          left join worksheet_details wd on wd.target_inventory_id = oi.id
-          left join worksheets w on w.id = wd.worksheet_id
           left join contact_points cp on cp.id = oi.contact_point_ref_id
-          where (w.type= 'PICKING' OR w.type = 'BATCH_PICKING')  
+          left join temp_outbound_order_worksheet wpick on wpick.id = oi.id 
+            and (wpick.type= 'PICKING' OR wpick.type = 'BATCH_PICKING')  
+          left join temp_outbound_order_worksheet wpack on wpack.id = oi.id 
+            and wpack.type= 'PACKING'
+          left join temp_outbound_order_worksheet wsort on wsort.id = oi.id 
+            and wsort.type= 'SORTING'
+          left join temp_outbound_order_worksheet wload on wload.id = oi.id 
+            and wload.type= 'LOADING' 
           order by oi.ro_no, oi.product_sku
           offset $1 limit $2
         ) src  
@@ -145,8 +167,10 @@ export const outboundOrderDetailsReport = {
             description: itm.bizplace_description
           },
           doNo: itm.delivery_order_no,
-          doDeliveryDate: itm.delivery_order_date,
+          doDeliveryDate: itm.delivery_order_delivery_date,
+          dispatchedAt: itm.dispatched_at,
           deliveryAddress: itm.delivery_address,
+          manifestNo: itm.manifest_no,
           roNo: itm.ro_no,
           roType: itm.ro_type,
           status: itm.ro_status,
@@ -158,6 +182,12 @@ export const outboundOrderDetailsReport = {
           orderCreatedAt: itm.order_created_at,
           pickingStart: itm.picking_start,
           pickingComplete: itm.picking_complete,
+          packingStart: itm.packing_start,
+          packingComplete: itm.packing_complete,
+          sortingStart: itm.sorting_start,
+          sortingComplete: itm.sorting_complete,
+          loadingStart: itm.loading_start,
+          loadingComplete: itm.loading_complete,
           product: {
             id: itm.product_id,
             sku: itm.product_sku,
@@ -194,7 +224,15 @@ export const outboundOrderDetailsReport = {
           checkedRemarkAt: itm.checked_remark_at,
           loadedAt: itm.loaded_at,
           loadedBy: itm.loaded_by,
-          shippedAt: itm.shipped_at
+          manifestedAt: itm.manifested_at,
+          manifestedBy: itm.manifested_by,
+          exportOption: itm.export_option,
+          containerNo: itm.container_no,
+          containerSize: itm.container_size,
+          palletQty: itm.pallet_qty,
+          transportOption: itm.own_transport ? 'Own Transport' : 'Warehouse Transport',
+          vehicleNo: itm.vehicle_no,
+          driverName: itm.driver_name
         }
       })
 

package/server/graphql/resolvers/reports/outbound-serial-number-report.ts

@@ -1,26 +1,28 @@
-import { EntityManager } from 'typeorm'
-
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { ListParam } from '@things-factory/shell'
+import { Filter, ListParam } from '@things-factory/shell'
 
 import { rawProductsQuery } from '../../../utils'
 
 export const outboundSerialNumberReport = {
-  async outboundSerialNumberReport(_: any, params: ListParam, context: any) {
+  async outboundSerialNumberReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { tx }: { tx: EntityManager } = context.state
-      let bizplaceFilter = { name: '', operator: '', value: '' }
+      const { tx } = context.state
+      let bizplaceFilter: Filter = { name: '', operator: '', value: '' }
       let userFilter = params.filters.find(data => data.name === 'user')
       let fromDate = params.filters.find(data => data.name === 'fromDate')
       let toDate = params.filters.find(data => data.name === 'toDate')
-      let ganNo = params.filters.find(data => data.name === 'ganNo')
+      let orderNo = params.filters.find(data => data.name === 'orderNo')
+      let ref = params.filters.find(data => data.name === 'ref')
+      let palletId = params.filters.find(data => data.name === 'palletId')
+      let cartonId = params.filters.find(data => data.name === 'cartonId')
+      let serialNumber = params.filters.find(data => data.name === 'serialNumber')
 
       if (userFilter) {
-        const user: User = await tx.getRepository(User).findOne({
+        const user = (await tx.getRepository(User).findOne({
           where: { id: userFilter.value },
           relations: ['bizplaces']
-        })
+        })) as User & { bizplaces: Bizplace[] }
 
         const bizplace: Bizplace = user.bizplaces[0]
 
@@ -33,15 +35,40 @@ export const outboundSerialNumberReport = {
 
       if (!bizplaceFilter || !fromDate || !toDate) throw 'Invalid input'
 
-      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOneBy({
         id: bizplaceFilter.value
       })
 
       await rawProductsQuery(tx, params, bizplace)
 
       let extraQueryFilters = ''
-      if (ganNo) {
-        extraQueryFilters = `${extraQueryFilters} and order_no like '%${ganNo.value}%' `
+      if (orderNo) {
+        extraQueryFilters = `${extraQueryFilters} and order_no like '%${orderNo.value}%' `
+      }
+      if (palletId) {
+        extraQueryFilters = `${extraQueryFilters} and pallet_id like '%${palletId.value}%' `
+      }
+      if (cartonId) {
+        extraQueryFilters = `${extraQueryFilters} and carton_id like '%${cartonId.value}%' `
+      }
+      if (serialNumber) {
+        extraQueryFilters = `${extraQueryFilters} and serial_number like '%${serialNumber.value}%' `
+      }
+
+      let refNoQueryFilter = ''
+      if (ref) {
+        let refValue = ref.value
+          .toLowerCase()
+          .split(',')
+          .map(ref => {
+            return "'%" + ref.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+        refNoQueryFilter = `AND (
+          Lower(rg.ref_no) LIKE ANY(ARRAY[${refValue}])
+          OR Lower(rg.ref_no_2) LIKE ANY(ARRAY[${refValue}])
+          OR Lower(rg.ref_no_3) LIKE ANY(ARRAY[${refValue}])
+        )`
       }
 
       await tx.query(
@@ -60,17 +87,14 @@ export const outboundSerialNumberReport = {
             coalesce(w.started_at,ii.created_at) as "etd"
             from inventory_items ii 
             inner join inventories i on i.id = ii.inventory_id 
-            inner join products p on p.id = i.product_id
+            inner join temp_products p on p.id = i.product_id
             left join product_details pd on pd.product_id = p.id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
             inner join release_goods rg on rg.id = ii.outbound_order_id::uuid
-            left join contact_points cp on cp.id = rg.deliver_to_id 
-            left join order_inventories oi on oi.release_good_id = rg.id and oi.inventory_id = i.id
-            left join delivery_orders do2 on do2.id = oi.delivery_order_id
-            left join contact_points cp2 on cp2.id = do2.contact_point_ref_id 
             left join worksheets w on w.arrival_notice_id = rg.id and w.type = 'PICKING'
             where 
             i.domain_id = $1 and i.bizplace_id = $2
             and coalesce(w.started_at, ii.created_at) between $3 and $4
+            ${refNoQueryFilter}
             order by coalesce(w.started_at, ii.created_at), p.sku
           ) src
           where 1=1
@@ -101,7 +125,7 @@ export const outboundSerialNumberReport = {
             name: bizplace.name
           },
           fullDeliveryAddress: itm.full_delivery_address,
-          attentionTo:itm.attention_to,
+          attentionTo: itm.attention_to,
           palletId: itm.pallet_id,
           cartonId: itm.carton_id,
           orderNo: itm.order_no,

package/server/graphql/resolvers/reports/product-label-report.ts

@@ -1,13 +1,11 @@
-import { getRepository } from 'typeorm'
-
 import { Sequence, SEQUENCE_TYPE } from '@things-factory/id-rule-base'
-import { Domain, ListParam } from '@things-factory/shell'
+import { getRepository, ListParam } from '@things-factory/shell'
 
 export const productLabelReport = {
-  async productLabelReport(_: any, params: ListParam, context: any) {
+  async productLabelReport(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { domain }: { domain: Domain } = context.state
-      // const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
+      // const { domain } = context.state
       const bizplaceId = params.filters.find(data => data.name === 'bizplace').value
       const type = params.filters.find(data => data.name === 'type')?.value
       const fromDate = params.filters.find(data => data.name === 'fromDate').value

package/server/graphql/resolvers/reports/release-inventory-report.ts

@@ -0,0 +1,201 @@
+import { Bizplace } from '@things-factory/biz-base'
+import { ListParam } from '@things-factory/shell'
+
+import { rawProductsQuery } from '../../../utils'
+
+export const releaseInventoryReport = {
+  async releaseInventoryReport(_: any, params: ListParam, context: ResolverContext) {
+    try {
+      const { tx } = context.state
+      // let bizplaceFilter = { name: '', operator: '', value: '' }
+      // let userFilter = params.filters.find(data => data.name === 'user')
+      let order = params.filters.find(data => data.name === 'order')
+      let orderDate = params.filters.find(data => data.name === 'orderDate')
+      let product = params.filters.find(data => data.name === 'product')
+      let bizplace = params.filters.find(data => data.name === 'bizplace')
+      let palletId = params.filters.find(data => data.name === 'palletId')
+      let cartonId = params.filters.find(data => data.name === 'cartonId')
+
+      // if (userFilter) {
+      //   const user = await tx.getRepository(User).findOne({
+      //     where: { id: userFilter.value },
+      //     relations: ['bizplaces']
+      //   }) as User & { bizplaces: Bizplace[] }
+
+      //   const bizplace: Bizplace = user.bizplaces[0]
+
+      if (!bizplace) throw 'Invalid input'
+
+      //   bizplaceFilter = { name: 'bizplace', operator: 'eq', value: bizplace.id }
+      // } else {
+      //   bizplaceFilter = params.filters.find(data => data.name === 'bizplace')
+      // }
+
+      // if (!bizplaceFilter) throw 'Invalid input'
+      let roFilter = '',
+        ccFilter = '',
+        queryFilter = ''
+      if (order) {
+        let orderValue = order.value
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+        roFilter += `AND (
+          Lower(od.name) LIKE ANY(ARRAY[${orderValue}])
+          OR Lower(od.ref_no) LIKE ANY(ARRAY[${orderValue}])
+          OR Lower(od.ref_no_2) LIKE ANY(ARRAY[${orderValue}])
+          OR Lower(od.ref_no_3) LIKE ANY(ARRAY[${orderValue}])
+        )`
+        ccFilter += `AND (
+          Lower(od.name) LIKE ANY(ARRAY[${orderValue}])
+        )`
+      }
+      if (orderDate) {
+        queryFilter += ` AND od.created_at between '${orderDate.value}'::timestamp and '${orderDate.value}'::timestamp + INTERVAL '1 day'`
+      }
+
+      if (palletId) {
+        queryFilter += ` AND lower(i.pallet_id) like '%${palletId.value.toLowerCase()}%'`
+      }
+
+      if (cartonId) {
+        queryFilter += ` AND lower(i.carton_id) like '%${cartonId.value.toLowerCase()}%'`
+      }
+
+      if (bizplace) {
+        queryFilter += ` AND od.bizplace_id = '${bizplace.value}'`
+      }
+
+      const bizplaceObj: Bizplace = await tx.getRepository(Bizplace).findOneBy({
+        id: bizplace.value
+      })
+      await rawProductsQuery(tx, params, bizplaceObj)
+
+      // let productQuery = ''
+      // if (product) {
+      //   let productValue = product.value
+      //     .toLowerCase()
+      //     .split(',')
+      //     .map(prod => {
+      //       return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+      //     })
+      //     .join(',')
+      //   queryFilter = `AND (
+      //     Lower(p.name) LIKE ANY(ARRAY[${productValue}])
+      //     OR Lower(p.sku) LIKE ANY(ARRAY[${productValue}])
+      //     OR Lower(p.description) LIKE ANY(ARRAY[${productValue}])
+      //     OR Lower(p.brand_sku) LIKE ANY(ARRAY[${productValue}])
+      //     OR Lower(p.brand) LIKE ANY(ARRAY[${productValue}])
+      //   )`
+      // }
+
+      await tx.query(
+        `
+        create temp table data_src on commit drop as (
+          select * from (
+            select p.sku as product_sku, p.name as product_name, p.description as product_description, p.brand as product_brand, 
+            b.id as bizplace_id, b.name as bizplace_name, b.description as bizplace_description, i.packing_type,
+            oi.release_qty as assigned_qty, oi.release_uom_value as uom_value, i.uom,
+            od.name as order_no, od.type::varchar as "type", od.status, od.created_at as order_at, od.release_date,
+            i.pallet_id, i.carton_id, i.batch_id, i.batch_id_ref, i.expiration_date, i.manufacture_date, l.name as location_name
+            from (
+              select inventory_id, release_good_id, sum(release_qty) as release_qty, sum(release_uom_value) as release_uom_value from order_inventories oi
+              inner join release_goods od on od.id = oi.release_good_id  
+              where release_good_id is not null
+              and od.status in ('PENDING', 'PENDING_RECEIVE', 'PENDING_CANCEL', 'PENDING_WORKSHEET', 'READY_TO_PICK', 'PICKING')
+              and od.domain_id = $1
+              and oi.status != 'REPLACED'
+              group by inventory_id, release_good_id
+            ) oi 
+            inner join release_goods od on od.id = oi.release_good_id  
+            inner join bizplaces b on b.id = od.bizplace_id
+            inner join inventories i on i.id = oi.inventory_id 
+            inner join locations l on l.id = i.location_id  
+            inner join temp_products p on p.id = i.product_id
+            where 1 = 1
+            ${roFilter}
+            ${queryFilter}
+            union all
+            select p.sku as product_sku, p.name as product_name, p.description as product_description, p.brand as product_brand, 
+            b.id as bizplace_id, b.name as bizplace_name, b.description as bizplace_description, i.packing_type,
+            oi.release_qty as assigned_qty, oi.release_uom_value as uom_value, i.uom,
+            od.name as order_no, 'cc' as "type", od.status, od.created_at as order_at, od.execution_date,
+            i.pallet_id, i.carton_id, i.batch_id, i.batch_id_ref, i.expiration_date, i.manufacture_date, l.name as location_name
+            from order_inventories oi 
+            inner join bizplaces b on b.id = oi.bizplace_id
+            inner join inventory_checks od on od.id = oi.inventory_check_id
+            inner join inventories i on i.id = oi.inventory_id 
+            inner join locations l on l.id = i.location_id  
+            inner join temp_products p on p.id = i.product_id
+            where od.status <> 'DONE'
+            and od.domain_id = $1
+            ${ccFilter}
+            ${queryFilter}
+          ) src
+          order by product_sku, packing_type, order_no 
+        );
+        `,
+        [context.state.domain.id]
+      )
+
+      const total: any = await tx.query(`
+        select count(*) from data_src
+      `)
+
+      const result: any = await tx.query(
+        `
+        select * from data_src
+        offset $1 limit $2
+      `,
+        [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
+      )
+
+      let items = result.map(itm => {
+        let data = {
+          bizplace: {
+            id: itm.bizplace_id,
+            name: itm.bizplace_name,
+            description: itm.bizplace_description
+          },
+          product: {
+            id: itm.product_id,
+            sku: itm.product_sku,
+            name: itm.product_name,
+            description: itm.product_description,
+            brand: itm.product_brand
+          },
+          location: {
+            name: itm.location_name
+          },
+          packingType: itm.packing_type,
+          assignedQty: itm.assigned_qty,
+          assignedUomValue: itm.uom_value,
+          assignedUom: itm.uom,
+          orderNo: itm.order_no,
+          type: itm.type,
+          status: itm.status,
+          orderAt: itm.order_at,
+          releaseDate: itm.release_date,
+          palletId: itm.pallet_id,
+          cartonId: itm.carton_id,
+          batchId: itm.batch_id,
+          batchIdRef: itm.batch_id_ref,
+          expirationDate: itm.expiration_date,
+          manufactureDate: itm.manufacture_date
+        }
+
+        return data
+      })
+
+      return {
+        items,
+        total: total[0].count
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/resolvers/shipping-provider/shipping-providers.ts

@@ -1,12 +1,10 @@
-import { getRepository } from 'typeorm'
 import { ReleaseGood } from '@things-factory/sales-base'
-
-import { Domain, ListParam } from '@things-factory/shell'
+import { getRepository, ListParam } from '@things-factory/shell'
 
 export const shippingProviders = {
-  async shippingProviders(_: any, params: ListParam, context: any) {
+  async shippingProviders(_: any, params: ListParam, context: ResolverContext) {
     try {
-      const { domain }: { domain: Domain } = context.state
+      const { domain } = context.state
 
       const items: any[] = await getRepository(ReleaseGood).query(`
         SELECT DISTINCT transporter FROM release_goods WHERE domain_id = '${domain.id}' AND transporter IS NOT null AND transporter != '' AND type = 'b2c'

package/server/graphql/resolvers/warehouse-inventory-adjustment/warehouse-intentory-adjustment.ts

@@ -1,16 +1,16 @@
-import { EntityManager } from 'typeorm'
-import { InventoryChange, approveInventoryChanges } from '@things-factory/warehouse-base'
-import { In, Not, IsNull } from 'typeorm'
-import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
-import { WorksheetDetail, Worksheet } from '@things-factory/worksheet-base'
+import { EntityManager, In, Repository } from 'typeorm'
+
+import { OrderInventory } from '@things-factory/sales-base'
+import { approveInventoryChanges, InventoryChange } from '@things-factory/warehouse-base'
+import { Worksheet, WorksheetDetail } from '@things-factory/worksheet-base'
 
 export const warehouseInventoryAdjustment = {
-  async warehouseInventoryAdjustment(_: any, { patches }, context: any) {
+  async warehouseInventoryAdjustment(_: any, { patches }, context: ResolverContext) {
     try {
       const item = await approveInventoryChanges(patches, context)
 
       // Retrieve order inventory
-      const { tx }: { tx: EntityManager } = context.state
+      const { tx } = context.state
 
       const _inventoryChanges = await tx.getRepository(InventoryChange).find({
         where: { id: In(patches.map(item => item.id)) },
@@ -44,7 +44,7 @@ export const warehouseInventoryAdjustment = {
           where: { inventory: In(invId), status: 'PICKING' }
         })
 
-        await tx.getRepository(OrderInventory).update(
+        await (tx.getRepository(OrderInventory) as Repository<OrderInventory>).update(
           {
             inventory: In(invId),
             status: 'PICKING'
@@ -55,7 +55,7 @@ export const warehouseInventoryAdjustment = {
         const orderInvId: any[] = orderInventory.map((oi: any) => oi.id)
         const releaseGoodId: any[] = orderInventory.map((roId: any) => roId.releaseGoodId)
 
-        await tx.getRepository(WorksheetDetail).update(
+        await (tx.getRepository(WorksheetDetail) as Repository<WorksheetDetail>).update(
           {
             targetInventory: In(orderInvId),
             status: 'EXECUTING'
@@ -63,7 +63,7 @@ export const warehouseInventoryAdjustment = {
           { status: 'MISSING' }
         )
 
-        await tx.getRepository(Worksheet).update(
+        await (tx.getRepository(Worksheet) as Repository<Worksheet>).update(
           {
             releaseGood: In(releaseGoodId),
             status: 'EXECUTING'

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

@@ -9,5 +9,6 @@ export const Query = /* GraphQL */ `
   releaseGoodsByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
   outboundOrderByStatus(filters: [Filter]): [OrderStatusCounter] @transaction
   inventoryExpiryMonitor(filters: [Filter]): InventoryExpiryStatus @transaction
+  unitInboundedOutbounded(filters: [Filter]): [OrderStatusCounter] @transaction
 `
 export const Types = [InventoryExpiryCounter, InventoryExpiryStatus, OrderStatusCounter]

package/server/graphql/types/index.ts

@@ -2,12 +2,13 @@ import * as BoardSetting from './board-setting'
 import * as CustomElccl from './custom/elccl'
 import * as CustomKimeda from './custom/kimeda'
 import * as Dashboard from './dashboard'
-import * as Extra from './extra'
+import * as Other from './other'
 import * as OpaMenu from './opa-menu'
 import * as Reports from './reports'
 import * as InventoryComparison from './inventory-comparison'
 import * as ShippingProvider from './shipping-provider'
 import * as WarehouseInventory from './warehouse-inventory-adjustment'
+
 export const queries = [
   BoardSetting.Query,
   CustomElccl.Query,
@@ -17,9 +18,13 @@ export const queries = [
   Reports.Query,
   InventoryComparison.Query,
   ShippingProvider.Query,
+  Other.Query
 ]
 
-export const mutations = [Extra.Mutation,WarehouseInventory.Mutation]
+export const mutations = [
+  Other.Mutation,
+  WarehouseInventory.Mutation
+]
 
 export const types = [
   ...BoardSetting.Types,
@@ -29,4 +34,5 @@ export const types = [
   ...Reports.Types,
   ...InventoryComparison.Types,
   ...ShippingProvider.Types,
+  ...Other.Types
 ]