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

package/client/pages/report/outbound-order-details-report.js

@@ -3,13 +3,27 @@ import '@things-factory/grist-ui'
 import '../inventory/inventory-by-product-detail'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+import {
+  css,
+  html
+} from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
-import { i18next, localize } from '@things-factory/i18n-base'
-import { client, gqlContext, PageView, store } from '@things-factory/shell'
-import { flattenObject, isMobileDevice } from '@things-factory/utils'
+import {
+  i18next,
+  localize
+} from '@things-factory/i18n-base'
+import {
+  client,
+  gqlContext,
+  PageView,
+  store
+} from '@things-factory/shell'
+import {
+  flattenObject,
+  isMobileDevice
+} from '@things-factory/utils'
 
 class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -211,10 +225,10 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         width: 200
       },
       {
-        type: 'datetime',
+        type: 'string',
         name: 'doDeliveryDate',
         header: i18next.t('field.do_delivery_date'),
-        width: 170
+        width: 200
       },
       {
         type: 'string',
@@ -222,6 +236,12 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.delivery_address'),
         width: 300
       },
+      {
+        type: 'string',
+        name: 'manifestNo',
+        header: i18next.t('field.manifest_no'),
+        width: 200
+      },
       {
         type: 'string',
         name: 'refNo1',
@@ -240,6 +260,54 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.ref_no_3'),
         width: 150
       },
+      {
+        type: 'boolean',
+        name: 'exportOption',
+        header: i18next.t('field.export'),
+        record: { align: 'center' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'containerNo',
+        header: i18next.t('field.container_no'),
+        record: { align: 'center' },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'containerSize',
+        header: i18next.t('field.container_size'),
+        record: { align: 'center' },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'transportOption',
+        header: i18next.t('field.transport_option'),
+        record: { align: 'center' },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'vehicleNo',
+        header: i18next.t('field.vehicle_no'),
+        record: { align: 'center' },
+        width: 120
+      },
+      {
+        type: 'string',
+        name: 'driverName',
+        header: i18next.t('field.driver_name'),
+        record: { align: 'center' },
+        width: 120
+      },
+      {
+        type: 'float',
+        name: 'palletQty',
+        header: i18next.t('field.pallet_qty'),
+        width: 120
+      },
       {
         type: 'string',
         name: 'status',
@@ -252,6 +320,18 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.order_created_at'),
         width: 170
       },
+      {
+        type: 'string',
+        name: 'acceptedBy',
+        header: i18next.t('field.accepted_by'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'acceptedAt',
+        header: i18next.t('field.accepted_at'),
+        width: 170
+      },
       {
         type: 'datetime',
         name: 'pickingStart',
@@ -261,19 +341,43 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
       {
         type: 'datetime',
         name: 'pickingComplete',
-        header: i18next.t('field.picking_complete'),
+        header: i18next.t('field.picking_end'),
         width: 170
       },
       {
-        type: 'string',
-        name: 'acceptedBy',
-        header: i18next.t('field.accepted_by'),
+        type: 'datetime',
+        name: 'packingStart',
+        header: i18next.t('field.packing_start'),
         width: 170
       },
       {
         type: 'datetime',
-        name: 'acceptedAt',
-        header: i18next.t('field.accepted_at'),
+        name: 'packingComplete',
+        header: i18next.t('field.packing_end'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'sortingStart',
+        header: i18next.t('field.sorting_start'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'sortingComplete',
+        header: i18next.t('field.sorting_end'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'loadingStart',
+        header: i18next.t('field.loading_start'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'loadingComplete',
+        header: i18next.t('field.loading_end'),
         width: 170
       },
       {
@@ -330,24 +434,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.uom'),
         width: 100
       },
-      {
-        type: 'string',
-        name: 'unitCost',
-        header: i18next.t('field.unit_cost'),
-        width: 100
-      },
-      {
-        type: 'float',
-        name: 'returnToLocationQty',
-        header: i18next.t('field.return_qty'),
-        width: 120
-      },
-      {
-        type: 'float',
-        name: 'returnToLocationUomValue',
-        header: i18next.t('field.return_uom_value'),
-        width: 120
-      },
       {
         type: 'float',
         name: 'unitVolume',
@@ -390,6 +476,18 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.weight_unit'),
         width: 100
       },
+      {
+        type: 'float',
+        name: 'returnToLocationQty',
+        header: i18next.t('field.return_qty'),
+        width: 120
+      },
+      {
+        type: 'float',
+        name: 'returnToLocationUomValue',
+        header: i18next.t('field.return_uom'),
+        width: 120
+      },
       {
         type: 'string',
         name: 'palletId',
@@ -474,10 +572,22 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         header: i18next.t('field.loaded_at'),
         width: 170
       },
+      {
+        type: 'string',
+        name: 'manifestedBy',
+        header: i18next.t('field.manifested_by'),
+        width: 170
+      },
       {
         type: 'datetime',
-        name: 'shippedAt',
-        header: i18next.t('field.shipped_at'),
+        name: 'manifestedAt',
+        header: i18next.t('field.manifested_at'),
+        width: 170
+      },
+      {
+        type: 'datetime',
+        name: 'dispatchedAt',
+        header: i18next.t('field.dispatched_at'),
         width: 170
       }
     ]
@@ -493,9 +603,17 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         'refNo2',
         'refNo3',
         'status',
+        'exportOption',
+        'containerNo',
+        'containerSize',
+        'palletQty',
         'orderCreatedAt',
         'pickingStart',
         'pickingComplete',
+        'packingStart',
+        'packingComplete',
+        'loadingStart',
+        'loadingComplete',
         'acceptedBy',
         'acceptedAt',
         'product|sku',
@@ -507,7 +625,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         'qty',
         'uomValue',
         'uom',
-        'unitCost',
         'returnToLocationQty',
         'returnToLocationUomValue',
         'unitVolume',
@@ -531,7 +648,9 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         'checkedRemarkAt',
         'loadedAt',
         'loadedBy',
-        'shippedAt'
+        'manifestedAt',
+        'manifestedBy',
+        'dispatchedAt'
       ]
     }
 
@@ -605,17 +724,28 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
                 doNo
                 doDeliveryDate
                 deliveryAddress
+                manifestNo
                 roNo
                 roType
                 status
                 refNo1
                 refNo2
                 refNo3
+                containerSize
+                transportOption
+                vehicleNo
+                driverName
                 acceptedBy
                 acceptedAt
                 orderCreatedAt
                 pickingStart
                 pickingComplete
+                packingStart
+                packingComplete
+                sortingStart
+                sortingComplete
+                loadingStart
+                loadingComplete
                 orderLineItem
                 product {
                   sku
@@ -630,7 +760,6 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
                 returnToLocationQty
                 returnToLocationUomValue
                 uom
-                unitCost
                 unitVolume
                 totalVolume
                 unitNettWeight
@@ -652,7 +781,13 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
                 checkedRemarkBy
                 loadedAt
                 loadedBy
-                shippedAt
+                dispatchedAt
+                exportOption
+                containerNo
+                palletQty
+                manifestedAt
+                manifestedBy
+                dispatchedAt
               }
               total
             }
@@ -667,8 +802,8 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         records:
           response.data.outboundOrderDetailsReport.items.map(itm => {
             itm = {
-              ...itm,
-              unitCost: parseFloat(itm.unitCost ? itm.unitCost : 0).toFixed(2)
+              ...itm
+              // unitCost: parseFloat(itm.unitCost ? itm.unitCost : 0).toFixed(2)
             }
             return flattenObject({ ...itm, bizplace: { name: `${itm.bizplace.name} ${itm.bizplace.description}` } })
           }) || []
@@ -765,15 +900,29 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         { header: i18next.t('field.do_no'), key: 'doNo', width: 30, type: 'string' },
         { header: i18next.t('field.do_delivery_date'), key: 'doDeliveryDate', width: 30, type: 'string' },
         { header: i18next.t('field.delivery_address'), key: 'deliveryAddress', width: 40, type: 'string' },
+        { header: i18next.t('field.manifest_no'), key: 'manifestNo', width: 30, type: 'string' },
         { header: i18next.t('field.ref_no'), key: 'refNo1', width: 60, type: 'string' },
         { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 60, type: 'string' },
         { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 60, type: 'string' },
+        { header: i18next.t('field.export'), key: 'exportOption', width: 20, type: 'string' },
+        { header: i18next.t('field.container_no'), key: 'containerNo', width: 30, type: 'string' },
+        { header: i18next.t('field.container_size'), key: 'containerSize', width: 30, type: 'string' },
+        { header: i18next.t('field.transport_option'), key: 'transportOption', width: 30, type: 'string' },
+        { header: i18next.t('field.vehicle_no'), key: 'vehicleNo', width: 30, type: 'string' },
+        { header: i18next.t('field.driver_name'), key: 'driverName', width: 30, type: 'string' },
+        { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 30, type: 'string' },
         { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' },
         { header: i18next.t('field.order_created_at'), key: 'orderCreatedAt', width: 30, type: 'string' },
-        { header: i18next.t('field.picking_start'), key: 'pickingStart', width: 30, type: 'string' },
-        { header: i18next.t('field.picking_complete'), key: 'pickingComplete', width: 30, type: 'string' },
         { header: i18next.t('field.accepted_by'), key: 'acceptedBy', width: 30, type: 'string' },
         { header: i18next.t('field.accepted_at'), key: 'acceptedAt', width: 30, type: 'string' },
+        { header: i18next.t('field.picking_start'), key: 'pickingStart', width: 30, type: 'string' },
+        { header: i18next.t('field.picking_end'), key: 'pickingComplete', width: 30, type: 'string' },
+        { header: i18next.t('field.packing_start'), key: 'packingStart', width: 30, type: 'string' },
+        { header: i18next.t('field.packing_end'), key: 'packingComplete', width: 30, type: 'string' },
+        { header: i18next.t('field.sorting_start'), key: 'sortingStart', width: 30, type: 'string' },
+        { header: i18next.t('field.sorting_end'), key: 'sortingComplete', width: 30, type: 'string' },
+        { header: i18next.t('field.loading_start'), key: 'loadingStart', width: 30, type: 'string' },
+        { header: i18next.t('field.loading_end'), key: 'loadingComplete', width: 30, type: 'string' },
         { header: i18next.t('field.sku'), key: 'product|sku', width: 25, type: 'string' },
         { header: i18next.t('field.product_name'), key: 'product|name', width: 50, type: 'string' },
         { header: i18next.t('field.product_description'), key: 'product|description', width: 50, type: 'string' },
@@ -790,6 +939,8 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         { header: i18next.t('field.unit_gross_weight'), key: 'unitGrossWeight', width: 15, type: 'string' },
         { header: i18next.t('field.total_unit_gross_weight'), key: 'totalUnitGrossWeight', width: 15, type: 'string' },
         { header: i18next.t('field.weight_unit'), key: 'weightUnit', width: 15, type: 'string' },
+        { header: i18next.t('field.return_qty'), key: 'returnToLocationQty', width: 15, type: 'string' },
+        { header: i18next.t('field.return_uom'), key: 'returnToLocationUomValue', width: 15, type: 'string' },
         { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
         { header: i18next.t('field.carton_id'), key: 'cartonId', width: 25, type: 'string' },
         { header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },
@@ -804,7 +955,9 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
         { header: i18next.t('field.remark_checked_at'), key: 'checkedRemarkAt', width: 15, type: 'string' },
         { header: i18next.t('field.loaded_by'), key: 'loadedBy', width: 15, type: 'string' },
         { header: i18next.t('field.loaded_at'), key: 'loadedAt', width: 15, type: 'string' },
-        { header: i18next.t('field.shipped_at'), key: 'shippedAt', width: 15, type: 'string' }
+        { header: i18next.t('field.manifested_by'), key: 'manifestedBy', width: 15, type: 'string' },
+        { header: i18next.t('field.manifested_at'), key: 'manifestedAt', width: 15, type: 'string' },
+        { header: i18next.t('field.dispatched_at'), key: 'dispatchedAt', width: 15, type: 'string' }
       ]
 
       var exportData = {
@@ -815,13 +968,21 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
             orderCreatedAt: itm.orderCreatedAt ? new Date(parseInt(itm.orderCreatedAt)).toLocaleString() : '',
             pickingStart: itm.pickingStart ? new Date(parseInt(itm.pickingStart)).toLocaleString() : '',
             pickingComplete: itm.pickingComplete ? new Date(parseInt(itm.pickingComplete)).toLocaleString() : '',
+            packingStart: itm.packingStart ? new Date(parseInt(itm.packingStart)).toLocaleString() : '',
+            packingComplete: itm.packingComplete ? new Date(parseInt(itm.packingComplete)).toLocaleString() : '',
+            sortingStart: itm.sortingStart ? new Date(parseInt(itm.sortingStart)).toLocaleString() : '',
+            sortingComplete: itm.sortingComplete ? new Date(parseInt(itm.sortingComplete)).toLocaleString() : '',
+            loadingStart: itm.loadingStart ? new Date(parseInt(itm.loadingStart)).toLocaleString() : '',
+            loadingComplete: itm.loadingComplete ? new Date(parseInt(itm.loadingComplete)).toLocaleString() : '',
             acceptedAt: itm.acceptedAt ? new Date(parseInt(itm.acceptedAt)).toLocaleString() : '',
             pickedAt: itm.pickedAt ? new Date(parseInt(itm.pickedAt)).toLocaleString() : '',
             packedAt: itm.packedAt ? new Date(parseInt(itm.packedAt)).toLocaleString() : '',
             loadedAt: itm.loadedAt ? new Date(parseInt(itm.loadedAt)).toLocaleString() : '',
-            shippedAt: itm.shippedAt ? new Date(parseInt(itm.shippedAt)).toLocaleString() : '',
+            manifestedAt: itm.manifestedAt ? new Date(parseInt(itm.manifestedAt)).toLocaleString() : '',
+            dispatchedAt: itm.dispatchedAt ? new Date(parseInt(itm.dispatchedAt)).toLocaleString() : '',
             expirationDate: itm.expirationDate ? new Date(parseInt(itm.expirationDate)).toLocaleString() : '',
-            manufactureDate: itm.manufactureDate ? new Date(parseInt(itm.manufactureDate)).toLocaleString() : ''
+            manufactureDate: itm.manufactureDate ? new Date(parseInt(itm.manufactureDate)).toLocaleString() : '',
+            checkedRemarkAt: itm.checkedRemarkAt ? new Date(parseInt(itm.checkedRemarkAt)).toLocaleString() : ''
           }
         })
       }

package/client/pages/report/outbound-serial-number-report.js

@@ -57,6 +57,10 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
         accept: ['preview'],
         content: this
       },
+      exportable: {
+        name: i18next.t('title.outbound_serial_number_report'),
+        data: this._exportableData.bind(this)
+      },
       help: 'operato-wms/report/outbound-serial-number-report'
     }
   }
@@ -137,22 +141,54 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
             let date = new Date()
             date.setMonth(date.getMonth() - 1)
             return date.toISOString().split('T')[0]
-          })()
+          })(),
+          max: new Date().toISOString().split('T')[0]
         },
         value: new Date().toISOString().split('T')[0],
         handlers: { change: this._submit.bind(this) }
+      },
+      {
+        label: i18next.t('field.order_no'),
+        name: 'orderNo',
+        type: 'text',
+        props: { searchOper: 'custom' }
+      },
+      {
+        label: i18next.t('field.ref_no'),
+        name: 'ref',
+        type: 'string',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.lot_id'),
+        name: 'palletId',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.carton_id'),
+        name: 'cartonId',
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.product_info'),
+        name: 'product',
+        type: 'string',
+        props: { searchOper: 'in' }
+      },
+      {
+        label: i18next.t('field.serial_number'),
+        name: 'serialNumber',
+        type: 'text',
+        props: { searchOper: 'eq' }
       }
     ]
   }
 
   get reportConfig() {
     let columns = [
-      {
-        type: 'number',
-        name: 'no',
-        header: i18next.t('field.no'),
-        width: 50
-      },
+      { type: 'gutter', gutterName: 'sequence' },
       {
         type: 'string',
         name: 'bizplace|name',
@@ -258,7 +294,6 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
     ]
     let list = {
       fields: [
-        'no',
         'bizplace|name',
         'orderNo',
         'refNo1',
@@ -333,7 +368,6 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
           query outboundSerialNumberReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             outboundSerialNumberReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
-                no
                 bizplace {
                   name
                   description
@@ -384,6 +418,44 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
     }
   }
 
+async _exportableData() {
+    try {
+      var headerSetting = [
+        { header: i18next.t('field.company'), key: 'bizplace|name', width: 25, type: 'string' },
+        { header: i18next.t('field.order_no'), key: 'orderNo', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no'), key: 'refNo1', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 25, type: 'string' },
+        { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 25, type: 'string' },
+        { header: i18next.t('field.attention_to'), key: 'attentionTo', width: 25, type: 'string' },
+        { header: i18next.t('field.full_delivery_address'), key: 'fullDeliveryAddress', width: 80, type: 'string' },
+        { header: i18next.t('field.lot_id'), key: 'palletId', width: 25, type: 'string' },
+        { header: i18next.t('field.carton_id'), key: 'cartonId', width: 25, type: 'string' },
+        { header: i18next.t('field.sku'), key: 'product|sku', width: 25, type: 'string' },
+        { header: i18next.t('field.brand_sku'), key: 'product|brandSku', width: 25, type: 'string' },
+        { header: i18next.t('field.product_name'), key: 'product|name', width: 80, type: 'string' },
+        { header: i18next.t('field.product_description'), key: 'product|description', width: 25, type: 'string' },
+        { header: i18next.t('field.product_type'), key: 'product|type', width: 25, type: 'string' },
+        { header: i18next.t('field.volume'), key: 'product|volume', width: 25, type: 'string' },
+        { header: i18next.t('field.serial_number'), key: 'serialNumber', width: 25, type: 'string' },
+        { header: i18next.t('field.etd'), key: 'etd', width: 25, type: 'datetime' }
+      ]
+
+      var exportData = {
+        header: [...headerSetting],
+        data: (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(itm => {
+          return {
+            ...itm,
+            etd: itm.etd ? new Date(parseInt(itm.etd)).toLocaleString() : ''
+          }
+        })
+      }
+
+      return exportData
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   async _fetchPartners() {
     const filters = []
     const response = await client.query({
@@ -438,11 +510,17 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
     let min = new Date(fromDate)
+    let max = new Date(fromDate)
     let today = new Date()
     today.setHours(0, 0, 0, 0)
+    max.setMonth(max.getMonth() + 1)
+    max.setDate(max.getDate() - 1)
 
     min = min.toISOString().split('T')[0]
+    max = max.toISOString().split('T')[0]
 
+    this._toDateInput.value = max
+    this._toDateInput.max = max
     this._toDateInput.min = min
     this._submit()
   }