@things-factory/operato-wms 5.0.0-alpha.2 → 5.0.0-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.22",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,72 +41,73 @@
     "docker:run": "docker run --platform linux/amd64 -p 4000:3000 hatiolab/operato-wms:latest"
   },
   "dependencies": {
-    "@operato/ghost-print": "^0.4.3",
-    "@operato/scene-chartjs": "^0.1.5",
-    "@operato/scene-clock": "^0.1.5",
-    "@operato/scene-clone": "^0.1.5",
-    "@operato/scene-compass": "^0.1.5",
-    "@operato/scene-gauge": "^0.1.5",
-    "@operato/scene-half-roundrect": "^0.1.5",
-    "@operato/scene-indoor-map": "^0.1.5",
-    "@operato/scene-legend": "^0.1.5",
-    "@operato/scene-news-ticker": "^0.1.5",
-    "@operato/scene-progressbar": "^0.1.5",
-    "@operato/scene-random": "^0.1.5",
-    "@operato/scene-switch": "^0.1.5",
-    "@operato/scene-tab": "^0.1.5",
-    "@operato/scene-table": "^0.1.5",
-    "@operato/scene-wheel-sorter": "^0.1.5",
-    "@things-factory/apptool-ui": "^5.0.0-alpha.2",
-    "@things-factory/attachment-ui": "^5.0.0-alpha.2",
-    "@things-factory/auth-ui": "^5.0.0-alpha.2",
-    "@things-factory/barcode-ui": "^5.0.0-alpha.2",
-    "@things-factory/biz-ui": "^5.0.0-alpha.2",
-    "@things-factory/board-service": "^5.0.0-alpha.2",
-    "@things-factory/board-ui": "^5.0.0-alpha.2",
-    "@things-factory/code-ui": "^5.0.0-alpha.2",
-    "@things-factory/context-ui": "^5.0.0-alpha.2",
-    "@things-factory/export-ui": "^5.0.0-alpha.2",
-    "@things-factory/export-ui-csv": "^5.0.0-alpha.2",
-    "@things-factory/export-ui-excel": "^5.0.0-alpha.2",
-    "@things-factory/fav-base": "^5.0.0-alpha.2",
-    "@things-factory/form-ui": "^5.0.0-alpha.2",
-    "@things-factory/grist-ui": "^5.0.0-alpha.2",
-    "@things-factory/help": "^5.0.0-alpha.2",
-    "@things-factory/i18n-base": "^5.0.0-alpha.2",
-    "@things-factory/id-rule-base": "^5.0.0-alpha.2",
-    "@things-factory/import-ui": "^5.0.0-alpha.2",
-    "@things-factory/import-ui-excel": "^5.0.0-alpha.2",
-    "@things-factory/menu-ui": "^5.0.0-alpha.2",
-    "@things-factory/more-ui": "^5.0.0-alpha.2",
-    "@things-factory/notification": "^5.0.0-alpha.2",
-    "@things-factory/pdf": "^5.0.0-alpha.2",
-    "@things-factory/print-proxy-service": "^5.0.0-alpha.2",
-    "@things-factory/print-service": "^5.0.0-alpha.2",
-    "@things-factory/print-ui": "^5.0.0-alpha.2",
-    "@things-factory/product-base": "^5.0.0-alpha.2",
-    "@things-factory/resource-ui": "^5.0.0-alpha.2",
-    "@things-factory/sales-ui": "^5.0.0-alpha.2",
-    "@things-factory/scene-data-transform": "^5.0.0-alpha.2",
-    "@things-factory/scene-excel": "^5.0.0-alpha.2",
-    "@things-factory/scene-firebase": "^5.0.0-alpha.2",
-    "@things-factory/scene-form": "^5.0.0-alpha.2",
-    "@things-factory/scene-google-map": "^5.0.0-alpha.2",
-    "@things-factory/scene-graphql": "^5.0.0-alpha.2",
-    "@things-factory/scene-label": "^5.0.0-alpha.2",
-    "@things-factory/scene-marker": "^5.0.0-alpha.2",
-    "@things-factory/scene-mqtt": "^5.0.0-alpha.2",
-    "@things-factory/scene-restful": "^5.0.0-alpha.2",
-    "@things-factory/scene-visualizer": "^5.0.0-alpha.2",
-    "@things-factory/setting-ui": "^5.0.0-alpha.2",
-    "@things-factory/system-ui": "^5.0.0-alpha.2",
-    "@things-factory/transport-base": "^5.0.0-alpha.2",
-    "@things-factory/tutorial-ui": "^5.0.0-alpha.2",
-    "@things-factory/warehouse-base": "^5.0.0-alpha.2",
-    "@things-factory/worksheet-base": "^5.0.0-alpha.2"
+    "@operato/ghost-print": "1.0.0-alpha.45",
+    "@operato/scene-chartjs": "^1.0.0-alpha.4",
+    "@operato/scene-clock": "^1.0.0-alpha.4",
+    "@operato/scene-clone": "^1.0.0-alpha.4",
+    "@operato/scene-compass": "^1.0.0-alpha.4",
+    "@operato/scene-gauge": "^1.0.0-alpha.4",
+    "@operato/scene-half-roundrect": "^1.0.0-alpha.4",
+    "@operato/scene-indoor-map": "^1.0.0-alpha.4",
+    "@operato/scene-legend": "^1.0.0-alpha.4",
+    "@operato/scene-news-ticker": "^1.0.0-alpha.4",
+    "@operato/scene-progressbar": "^1.0.0-alpha.4",
+    "@operato/scene-random": "^1.0.0-alpha.4",
+    "@operato/scene-switch": "^1.0.0-alpha.4",
+    "@operato/scene-tab": "^1.0.0-alpha.4",
+    "@operato/scene-table": "^1.0.0-alpha.4",
+    "@operato/scene-wheel-sorter": "^1.0.0-alpha.4",
+    "@things-factory/apptool-ui": "^5.0.0-alpha.22",
+    "@things-factory/attachment-ui": "^5.0.0-alpha.22",
+    "@things-factory/auth-ui": "^5.0.0-alpha.22",
+    "@things-factory/barcode-ui": "^5.0.0-alpha.22",
+    "@things-factory/biz-ui": "^5.0.0-alpha.22",
+    "@things-factory/board-service": "^5.0.0-alpha.22",
+    "@things-factory/board-ui": "^5.0.0-alpha.22",
+    "@things-factory/code-ui": "^5.0.0-alpha.22",
+    "@things-factory/context-ui": "^5.0.0-alpha.22",
+    "@things-factory/env": "^5.0.0-alpha.22",
+    "@things-factory/export-ui": "^5.0.0-alpha.22",
+    "@things-factory/export-ui-csv": "^5.0.0-alpha.22",
+    "@things-factory/export-ui-excel": "^5.0.0-alpha.22",
+    "@things-factory/fav-base": "^5.0.0-alpha.22",
+    "@things-factory/form-ui": "^5.0.0-alpha.22",
+    "@things-factory/grist-ui": "^5.0.0-alpha.22",
+    "@things-factory/help": "^5.0.0-alpha.22",
+    "@things-factory/i18n-base": "^5.0.0-alpha.22",
+    "@things-factory/id-rule-base": "^5.0.0-alpha.22",
+    "@things-factory/import-ui": "^5.0.0-alpha.22",
+    "@things-factory/import-ui-excel": "^5.0.0-alpha.22",
+    "@things-factory/menu-ui": "^5.0.0-alpha.22",
+    "@things-factory/more-ui": "^5.0.0-alpha.22",
+    "@things-factory/notification": "^5.0.0-alpha.22",
+    "@things-factory/pdf": "^5.0.0-alpha.22",
+    "@things-factory/print-proxy-service": "^5.0.0-alpha.22",
+    "@things-factory/print-service": "^5.0.0-alpha.22",
+    "@things-factory/print-ui": "^5.0.0-alpha.22",
+    "@things-factory/product-base": "^5.0.0-alpha.22",
+    "@things-factory/resource-ui": "^5.0.0-alpha.22",
+    "@things-factory/sales-ui": "^5.0.0-alpha.22",
+    "@things-factory/scene-data-transform": "^5.0.0-alpha.22",
+    "@things-factory/scene-excel": "^5.0.0-alpha.22",
+    "@things-factory/scene-firebase": "^5.0.0-alpha.22",
+    "@things-factory/scene-form": "^5.0.0-alpha.22",
+    "@things-factory/scene-google-map": "^5.0.0-alpha.22",
+    "@things-factory/scene-graphql": "^5.0.0-alpha.22",
+    "@things-factory/scene-label": "^5.0.0-alpha.22",
+    "@things-factory/scene-marker": "^5.0.0-alpha.22",
+    "@things-factory/scene-mqtt": "^5.0.0-alpha.22",
+    "@things-factory/scene-restful": "^5.0.0-alpha.22",
+    "@things-factory/scene-visualizer": "^5.0.0-alpha.22",
+    "@things-factory/setting-ui": "^5.0.0-alpha.22",
+    "@things-factory/system-ui": "^5.0.0-alpha.22",
+    "@things-factory/transport-base": "^5.0.0-alpha.22",
+    "@things-factory/tutorial-ui": "^5.0.0-alpha.22",
+    "@things-factory/warehouse-base": "^5.0.0-alpha.22",
+    "@things-factory/worksheet-base": "^5.0.0-alpha.22"
   },
   "devDependencies": {
-    "@things-factory/builder": "^5.0.0-alpha.2"
+    "@things-factory/builder": "^5.0.0-alpha.22"
   },
-  "gitHead": "055536f981d229d51ae63f46585036b35fa86602"
+  "gitHead": "8e06de9c59237f1800b2ff4f1c53162a0228342a"
 }

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

@@ -0,0 +1,128 @@
+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 { rawProductsQuery } from '../../../utils'
+
+export const inboundSerialNumberReport = {
+  async inboundSerialNumberReport(_: any, params: ListParam, context: any) {
+    try {
+      const { tx }: { tx: EntityManager } = context.state
+      let bizplaceFilter = { 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')
+
+      if (userFilter) {
+        const user: User = await tx.getRepository(User).findOne({
+          where: { id: userFilter.value },
+          relations: ['bizplaces']
+        })
+
+        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 || !fromDate || !toDate) throw 'Invalid input'
+
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        id: bizplaceFilter.value
+      })
+
+      await rawProductsQuery(tx, params, bizplace)
+
+      let extraQueryFilters = ''
+      if (ganNo) {
+        extraQueryFilters = `${extraQueryFilters} and order_no like '%${ganNo.value}%' `
+      }
+
+      await tx.query(
+        `
+        create temp table temp_inbound_serial_number_report on commit drop as (
+          select * from (            
+            select 
+            row_number() over(partition by an."name" order by coalesce(w.started_at, ii.created_at), p.sku ) as "no",
+            case when "source" = 'ADJUSTMENT' then 'adjustment' else an."name" end as "order_no",
+            i.pallet_id, i.carton_id,an.ref_no, an.ref_no_2, an.ref_no_3,
+            p.id as "product_id", p.sku as "product_sku", p.brand_sku as "product_brand_sku",
+            p.name as "product_name", p.description as "product_description", p."type" as "product_type",
+            coalesce(pd.volume, '0') as "product_volume", 
+            ii.serial_number, 
+            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
+            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 
+            left join arrival_notices an on an.id = ii.inbound_order_id::uuid
+            left join worksheets w on w.arrival_notice_id = an.id and w.type = 'UNLOADING'
+            where 
+            i.domain_id = $1 and i.bizplace_id = $2
+            and coalesce(w.started_at, ii.created_at) between $3 and $4
+            order by coalesce(w.started_at, ii.created_at), p.sku
+          ) src
+          where 1=1
+          ${extraQueryFilters}
+        )
+      `,
+        [context.state.domain.id, bizplace.id, fromDate.value, toDate.value]
+      )
+
+      const total: any = await tx.query(`
+        select count(*) from temp_inbound_serial_number_report
+      `)
+
+      const result: any = await tx.query(
+        `
+        select *
+        from temp_inbound_serial_number_report
+        offset $1 limit $2
+      `,
+        [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
+      )
+
+      let items = result.map(itm => {
+        let data = {
+          no: itm.no,
+          bizplace: {
+            description: bizplace.description,
+            name: bizplace.name
+          },
+          palletId: itm.pallet_id,
+          cartonId: itm.carton_id,
+          orderNo: itm.order_no,
+          refNo1: itm.ref_no,
+          refNo2: itm.ref_no_2,
+          refNo3: itm.ref_no_3,
+          product: {
+            id: itm.product_id,
+            sku: itm.product_sku,
+            brandSku: itm.product_brand_sku,
+            name: itm.product_name,
+            description: itm.product_description,
+            type: itm.product_type,
+            volume: itm.product_volume
+          },
+          serialNumber: itm.serial_number,
+          etd: itm.etd
+        }
+
+        return data
+      })
+
+      return {
+        items,
+        total: total[0].count
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/resolvers/reports/index.ts

@@ -1,8 +1,13 @@
+import { inboundSerialNumberReport } from './inbound-serial-number-report'
+import { outboundSerialNumberReport } from './outbound-serial-number-report'
+
 import { inboundOrderDetailsReport } from './inbound-order-details-report'
 import { outboundOrderDetailsReport } from './outbound-order-details-report'
 import { productLabelReport } from './product-label-report'
 
 export const Query = {
+  ...inboundSerialNumberReport,
+  ...outboundSerialNumberReport,
   ...inboundOrderDetailsReport,
   ...outboundOrderDetailsReport,
   ...productLabelReport

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

@@ -16,6 +16,7 @@ export const outboundOrderDetailsReport = {
       let toDate = params.filters.find(data => data.name === 'toDate')
       let roNo = params.filters.find(data => data.name === 'roNo')
       let doNo = params.filters.find(data => data.name === 'doNo')
+      let status = params.filters.find(data => data.name === 'status')
 
       if (userFilter) {
         const user: User = await tx.getRepository(User).findOne({
@@ -48,60 +49,35 @@ export const outboundOrderDetailsReport = {
         extraQueryFilters = `${extraQueryFilters} and delivery_order_no like '%${doNo.value}%' `
       }
 
+      console.time('temp')
       await tx.query(
         `
         create temp table temp_outbound_order_report on commit drop as (
           select * from (
-            select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
-            do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
-            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", 
+            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,
             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",
-            oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
-            w.started_at as "picking_start", w.ended_at as "picking_complete",
-            ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref, 
-            i.expiration_date, i.manufacture_date,
-            ih.created_at as "picked_at", u.name as "picked_by",
-            ih2.created_at as "packed_at", u2.name as "packed_by",
-            ih3.created_at as "loaded_at", u3.name as "loaded_by",
-            ih4.created_at as "shipped_at",
-            coalesce((select volume from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
-            order by created_at desc
-            fetch first 1 rows only),0) as unit_volume,
-            coalesce((select nett_weight from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
-            order by created_at desc
-            fetch first 1 rows only),0) as unit_nett_weight,
-            coalesce((select gross_weight from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
-            order by created_at desc
-            fetch first 1 rows only),0) as unit_gross_weight,
-            coalesce((select weight_unit from product_details pd where pd.product_id = i.product_id and pd.packing_type = i.packing_type and pd.packing_size = i.packing_size 
-            order by created_at desc
-            fetch first 1 rows only),'') as weight_unit
-            from (
-              select * from release_goods 
-              where domain_id = $1 and bizplace_id = $2 and status ='DONE'
-              and created_at >= $3 and created_at <= $4
-            ) rg 
+            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, 
+            oi.return_to_location_qty, oi.return_to_location_uom_value, 
+            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 
             left join users u4 on u4.id = rg.accepted_by_id 
-            inner join bizplaces b2 ON b2.id = rg.bizplace_id 
-            inner join order_inventories oi on oi.release_good_id = rg.id
             inner join inventories i on i.id = oi.inventory_id 
             inner join temp_products p on p.id = oi.product_id
-            left join worksheets w on w.release_good_id = rg.id and w."type" ='PICKING'
-            left join reduced_inventory_histories ih on ih.inventory_id = oi.inventory_id and ih.transaction_type ='PICKING' and ih.ref_order_id = rg.id::varchar
-            left join users u on u.id = ih.creator_id 
-            left join reduced_inventory_histories ih2 on ih2.inventory_id = oi.inventory_id and ih2.transaction_type ='PACKING' and ih2.ref_order_id = rg.id::varchar
-            left join users u2 on u2.id = ih2.creator_id 
-            left join reduced_inventory_histories ih3 on ih3.inventory_id = oi.inventory_id and ih3.transaction_type ='LOADING' and ih3.ref_order_id = rg.id::varchar
-            left join users u3 on u3.id = ih3.creator_id 
-            left join reduced_inventory_histories ih4 on ih4.inventory_id = oi.inventory_id and ih4.transaction_type ='SHIPPING' and ih4.ref_order_id = rg.id::varchar
-            left join worksheets w2 on w2.release_good_id = rg.id and w2."type" ='PACKING'
-            left join worksheets w3 on w3.release_good_id = rg.id and w2."type" ='LOADING'
             left join delivery_orders do2 on do2.id = oi.delivery_order_id 
-            left join contact_points cp on cp.id = do2.contact_point_ref_id
-            left join marketplace_orders mo on mo.release_order_id::uuid = rg.id
-            where oi.status <> 'REPLACED'           
-            order by rg.name, p.sku
+            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 
+            )
+            and oi.status <> 'REPLACED'
+            ${status ? `and rg.status = '${status.value}' ` : ``}
           ) src
           where 1=1
           ${extraQueryFilters}
@@ -110,22 +86,49 @@ export const outboundOrderDetailsReport = {
         [context.state.domain.id, bizplace.id, fromDate.value, toDate.value]
       )
 
+      console.timeEnd('temp')
       const total: any = await tx.query(`
         select count(*) from temp_outbound_order_report
       `)
 
+      console.time('result')
       const result: any = await tx.query(
         `
         select *,  
         round((qty * unit_volume)::numeric ,4) as total_volume, 
         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 temp_outbound_order_report
-        offset $1 limit $2
+        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",
+          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,
+          coalesce((select nett_weight 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_nett_weight,
+          coalesce((select gross_weight 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_gross_weight,
+          coalesce((select weight_unit 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),'') as weight_unit
+          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')  
+          order by oi.ro_no, oi.product_sku
+          offset $1 limit $2
+        ) src  
       `,
         [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
       )
 
+      console.timeEnd('result')
+
       let items = result.map(itm => {
         return {
           bizplace: {
@@ -138,9 +141,10 @@ export const outboundOrderDetailsReport = {
           deliveryAddress: itm.delivery_address,
           roNo: itm.ro_no,
           roType: itm.ro_type,
+          status: itm.ro_status,
           refNo1: itm.ref_no_1,
-          refNo2: itm.ref_no_2,
           refNo3: itm.ref_no_3,
+          refNo2: itm.ref_no_2,
           acceptedBy: itm.accepted_by,
           acceptedAt: itm.accepted_at,
           orderCreatedAt: itm.order_created_at,
@@ -158,6 +162,8 @@ export const outboundOrderDetailsReport = {
           qty: Math.abs(itm.qty),
           uomValue: Math.abs(itm.uom_value),
           uom: itm.uom,
+          returnToLocationQty: itm.return_to_location_qty,
+          returnToLocationUomValue: itm.return_to_location_uom_value,
           unitVolume: itm.unit_volume,
           totalVolume: itm.total_volume,
           unitNettWeight: itm.unit_nett_weight,

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

@@ -0,0 +1,135 @@
+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 { rawProductsQuery } from '../../../utils'
+
+export const outboundSerialNumberReport = {
+  async outboundSerialNumberReport(_: any, params: ListParam, context: any) {
+    try {
+      const { tx }: { tx: EntityManager } = context.state
+      let bizplaceFilter = { 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')
+
+      if (userFilter) {
+        const user: User = await tx.getRepository(User).findOne({
+          where: { id: userFilter.value },
+          relations: ['bizplaces']
+        })
+
+        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 || !fromDate || !toDate) throw 'Invalid input'
+
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        id: bizplaceFilter.value
+      })
+
+      await rawProductsQuery(tx, params, bizplace)
+
+      let extraQueryFilters = ''
+      if (ganNo) {
+        extraQueryFilters = `${extraQueryFilters} and order_no like '%${ganNo.value}%' `
+      }
+
+      await tx.query(
+        `
+        create temp table temp_outbound_serial_number_report on commit drop as (
+          select * from (            
+            select             
+            row_number() over(partition by rg."name" order by coalesce(w.started_at, ii.created_at), p.sku ) as "no",
+            rg."name" as "order_no", concat_ws(', ',rg.delivery_address_1,rg.delivery_address_2,rg.delivery_address_3,rg.delivery_address_4,rg.delivery_address_5,rg.postal_code,rg.city,rg.state) as "full_delivery_address",
+            rg."attention_to" as "attention_to",
+            i.pallet_id, i.carton_id, rg.ref_no, rg.ref_no_2, rg.ref_no_3,
+            p.id as "product_id", p.sku as "product_sku", p.brand_sku as "product_brand_sku",
+            p.name as "product_name", p.description as "product_description", p."type" as "product_type",
+            coalesce(pd.volume, '0') as "product_volume", 
+            ii.serial_number, 
+            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
+            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
+            order by coalesce(w.started_at, ii.created_at), p.sku
+          ) src
+          where 1=1
+          ${extraQueryFilters}
+        )
+      `,
+        [context.state.domain.id, bizplace.id, fromDate.value, toDate.value]
+      )
+
+      const total: any = await tx.query(`
+        select count(*) from temp_outbound_serial_number_report
+      `)
+
+      const result: any = await tx.query(
+        `
+        select *
+        from temp_outbound_serial_number_report
+        offset $1 limit $2
+      `,
+        [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
+      )
+
+      let items = result.map(itm => {
+        let data = {
+          no: itm.no,
+          bizplace: {
+            description: bizplace.description,
+            name: bizplace.name
+          },
+          fullDeliveryAddress: itm.full_delivery_address,
+          attentionTo:itm.attention_to,
+          palletId: itm.pallet_id,
+          cartonId: itm.carton_id,
+          orderNo: itm.order_no,
+          refNo1: itm.ref_no,
+          refNo2: itm.ref_no_2,
+          refNo3: itm.ref_no_3,
+          product: {
+            id: itm.product_id,
+            sku: itm.product_sku,
+            brandSku: itm.product_brand_sku,
+            name: itm.product_name,
+            description: itm.product_description,
+            type: itm.product_type,
+            volume: itm.product_volume
+          },
+          serialNumber: itm.serial_number,
+          etd: itm.etd
+        }
+
+        return data
+      })
+
+      return {
+        items,
+        total: total[0].count
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/types/reports/inbound-serial-number-report-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const InboundSerialNumberReportList = gql`
+  type InboundSerialNumberReportList {
+    items: [InboundSerialNumberReport]
+    total: Int
+  }
+`

package/server/graphql/types/reports/inbound-serial-number-report.ts

@@ -0,0 +1,17 @@
+import gql from 'graphql-tag'
+
+export const InboundSerialNumberReport = gql`
+  type InboundSerialNumberReport {
+    no: Int
+    bizplace: Bizplace
+    palletId: String
+    cartonId: String
+    orderNo: String
+    refNo1: String
+    refNo2: String
+    refNo3: String
+    product: Product
+    serialNumber: String
+    etd: String
+  }
+`

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

@@ -1,3 +1,8 @@
+import { InboundSerialNumberReport } from './inbound-serial-number-report'
+import { InboundSerialNumberReportList } from './inbound-serial-number-report-list'
+import { OutboundSerialNumberReport } from './outbound-serial-number-report'
+import { OutboundSerialNumberReportList } from './outbound-serial-number-report-list'
+
 import { InboundOrderDetailsReport } from './inbound-order-details-report'
 import { InboundOrderDetailsReportList } from './inbound-order-details-report-list'
 import { OutboundOrderDetailsReport } from './outbound-order-details-report'
@@ -6,12 +11,18 @@ import { ProductLabelReport } from './product-label-report'
 import { ProductLabelReportList } from './product-label-report-list'
 
 export const Query = `
+  inboundSerialNumberReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundSerialNumberReportList @transaction
+  outboundSerialNumberReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundSerialNumberReportList @transaction
   inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
   outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
   productLabelReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ProductLabelReportList @transaction
 `
 
 export const Types = [
+  InboundSerialNumberReport,
+  InboundSerialNumberReportList,
+  OutboundSerialNumberReport,
+  OutboundSerialNumberReportList,
   InboundOrderDetailsReport,
   InboundOrderDetailsReportList,
   OutboundOrderDetailsReport,