@things-factory/operato-wms 3.7.15 → 3.8.3

package/client/pages/outbound/single-outbound-worksheet.js

@@ -214,6 +214,12 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'releaseGood',
           header: i18next.t('field.release_good_no'),
+          imex: {
+            header: i18next.t('field.release_good_no'),
+            key: 'releaseGood.name',
+            width: 30,
+            type: 'string'
+          },
           sortable: true,
           width: 150
         },
@@ -221,6 +227,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'releaseRefNo',
           header: i18next.t('field.ref_no'),
+          imex: { header: i18next.t('field.ref_no'), key: 'releaseRefNo', width: 30, type: 'array' },
           sortable: true,
           width: 180
         },
@@ -228,24 +235,28 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'boolean',
           name: 'crossDocking',
           header: i18next.t('field.cross_docking'),
+          imex: { header: i18next.t('field.cross_docking'), key: 'crossDocking', width: 20, type: 'string' },
           width: 100
         },
         {
           type: 'boolean',
           name: 'courierOption',
           header: i18next.t('field.courier'),
+          imex: { header: i18next.t('field.courier'), key: 'courierOption', width: 20, type: 'string' },
           width: 60
         },
         {
           type: 'boolean',
           name: 'packingOption',
           header: i18next.t('field.packing'),
+          imex: { header: i18next.t('field.packing'), key: 'packingOption', width: 20, type: 'string' },
           width: 60
         },
         {
           type: 'object',
           name: 'bizplace',
           header: i18next.t('field.company'),
+          imex: { header: i18next.t('field.company'), key: 'bizplace.name', width: 20, type: 'string' },
           sortable: true,
           width: 240
         },
@@ -253,6 +264,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'type',
           header: i18next.t('field.type'),
+          imex: { header: i18next.t('field.type'), key: 'type', width: 20, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -260,6 +272,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'string',
           name: 'status',
           header: i18next.t('field.status'),
+          imex: { header: i18next.t('field.status'), key: 'status', width: 20, type: 'string' },
           sortable: true,
           width: 100
         },
@@ -267,6 +280,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'createdAt',
           header: i18next.t('field.created_at'),
+          imex: { header: i18next.t('field.created_at'), key: 'createdAt', width: 20, type: 'string' },
           sortable: true,
           width: 200
         },
@@ -274,6 +288,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'startedAt',
           header: i18next.t('field.started_at'),
+          imex: { header: i18next.t('field.started_at'), key: 'startedAt', width: 30, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -281,6 +296,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'datetime',
           name: 'endedAt',
           header: i18next.t('field.ended_at'),
+          imex: { header: i18next.t('field.ended_at'), key: 'endedAt', width: 30, type: 'string' },
           sortable: true,
           width: 160
         },
@@ -288,6 +304,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
+          imex: { header: i18next.t('field.updater'), key: 'updater.name', width: 30, type: 'string' },
           sortable: true,
           width: 150
         }
@@ -446,7 +463,36 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
   }
 
   _exportableData() {
-    return this.dataGrist.exportRecords()
+    let records = []
+    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
+      records = this.dataGrist.selected
+    } else {
+      records = this.dataGrist.data.records
+    }
+
+    var headerSetting = this.dataGrist._config.columns
+      .filter(column => column.type !== 'gutter' /* && column.record !== undefined */ && column.imex !== undefined)
+      .map(column => {
+        return column.imex
+      })
+
+    var data = records.map(item => {
+      return {
+        id: item.id,
+        ...this._columns
+          .filter(column => column.type !== 'gutter' /* && column.record !== undefined */ && column.imex !== undefined)
+          .reduce((record, column) => {
+            record[column.imex.key] = column.imex.key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            if (record[column.imex.key] === 'Invalid Date') {
+              record[column.imex.key] = ''
+            }
+            return record
+          }, {})
+      }
+    })
+    return { header: headerSetting, data: data }
   }
 
   navigatePickingRelatedPages(record) {

package/client/pages/outbound/worksheet-loading.js

@@ -21,6 +21,7 @@ class WorksheetLoading extends localize(i18next)(PageView) {
     return {
       _worksheetNo: String,
       _worksheetStatus: String,
+      _statusList: Array,
       vasData: Object,
       vasGristConfig: Object,
       _roNo: String,
@@ -133,11 +134,12 @@ class WorksheetLoading extends localize(i18next)(PageView) {
             <label for="ownCollection">${i18next.t('label.own_collection')}</label>
 
             <label>${i18next.t('label.status')}</label>
-            <select name="status" disabled>
-              ${Object.keys(WORKSHEET_STATUS).map(
-                key => html` <option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option> `
-              )}
-            </select>
+            <input
+              name="status"
+              value="${this._statusList.find(x => x.value == this._worksheetStatus)?.display || ''}"
+              readonly
+              disabled
+            />
           </fieldset>
         </form>
 
@@ -169,6 +171,13 @@ class WorksheetLoading extends localize(i18next)(PageView) {
     `
   }
 
+  constructor() {
+    super()
+    this._statusList = Object.keys(WORKSHEET_STATUS).map(key => {
+      return { value: WORKSHEET_STATUS[key].value, display: WORKSHEET_STATUS[key].name }
+    })
+  }
+
   async pageUpdated(changes) {
     if (this.active && (changes.resourceId || this._worksheetNo)) {
       if (changes.resourceId) {

package/client/pages/outbound/worksheet-picking.js

@@ -32,6 +32,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
       _worksheetNo: String,
       _worksheetStatus: String,
       _roNo: String,
+      _statusList: Array,
       ganNo: String,
       assignee: Object,
       productGristConfig: Object,
@@ -119,6 +120,9 @@ class WorksheetPicking extends localize(i18next)(PageView) {
     super()
     this.isPalletPickingOrder = false
     this.worksheetDetailData = { records: [] }
+    this._statusList = Object.keys(WORKSHEET_STATUS).map(key => {
+      return { value: WORKSHEET_STATUS[key].value, display: WORKSHEET_STATUS[key].name }
+    })
   }
 
   get context() {
@@ -211,11 +215,12 @@ class WorksheetPicking extends localize(i18next)(PageView) {
               : ''}
 
             <label>${i18next.t('label.status')}</label>
-            <select name="status" disabled>
-              ${Object.keys(WORKSHEET_STATUS).map(
-                key => html`<option value="${WORKSHEET_STATUS[key].value}">${WORKSHEET_STATUS[key].name}</option>`
-              )}
-            </select>
+            <input
+              name="status"
+              value="${this._statusList.find(x => x.value == this._worksheetStatus)?.display || ''}"
+              readonly
+              disabled
+            />
 
             <label>${i18next.t('label.assignee')}</label>
             <input name="assignee" readonly />

package/client/pages/report/custom-elccl/elccl-inventory-report.js

@@ -183,10 +183,10 @@ class ElcclInventoryReport extends connect(store)(localize(i18next)(PageView)) {
         },
         {
           type: 'string',
-          name: 'orderName',
+          name: 'orderNo',
           header: i18next.t('field.order_no'),
           sortable: true,
-          imex: { header: i18next.t('field.order_no'), key: 'orderName', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.order_no'), key: 'orderNo', width: 25, type: 'string' },
           width: 300
         },
         {
@@ -235,7 +235,7 @@ class ElcclInventoryReport extends connect(store)(localize(i18next)(PageView)) {
     this._config = this.reportConfig
   }
 
-  async pageUpdated(changes, lifecycle) {
+  pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.report.fetch()
     }
@@ -247,30 +247,8 @@ class ElcclInventoryReport extends connect(store)(localize(i18next)(PageView)) {
 
       const response = await client.query({
         query: gql`
-          query {
-            elcclInventoryHistoryReport(${gqlBuilder.buildArgs({
-              filters: [
-                ...this.searchForm.queryFilters.map(filter => {
-                  switch (filter.name) {
-                    case 'fromDate':
-                      let fromDt = new Date(filter.value)
-                      fromDt.setHours(0)
-                      filter.value = fromDt.toISOString()
-                      break
-                    case 'toDate':
-                      let toDt = new Date(filter.value)
-                      toDt.setHours(23, 59, 59)
-                      filter.value = toDt.toISOString()
-                      break
-                    default:
-                      break
-                  }
-                  return filter
-                })
-              ],
-              pagination: { page, limit },
-              sortings: sorters
-            })}) {
+          query elcclInventoryHistoryReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+            elcclInventoryHistoryReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               batchId
               product {
                 sku
@@ -283,11 +261,34 @@ class ElcclInventoryReport extends connect(store)(localize(i18next)(PageView)) {
               openingUomValue
               qty
               uomValue
-              orderName
+              orderNo
               createdAt
             }
           }
-        `
+        `,
+        variables: {
+          filters: [
+            ...this.searchForm.queryFilters.map(filter => {
+              switch (filter.name) {
+                case 'fromDate':
+                  let fromDt = new Date(filter.value)
+                  fromDt.setHours(0)
+                  filter.value = fromDt.toISOString()
+                  break
+                case 'toDate':
+                  let toDt = new Date(filter.value)
+                  toDt.setHours(23, 59, 59)
+                  filter.value = toDt.toISOString()
+                  break
+                default:
+                  break
+              }
+              return filter
+            })
+          ],
+          pagination: { page, limit },
+          sortings: sorters
+        }
       })
       return {
         total: 0,
@@ -302,7 +303,7 @@ class ElcclInventoryReport extends connect(store)(localize(i18next)(PageView)) {
           }) || []
       }
     } catch (e) {
-      console.log(e)
+      this._showToast(e)
     }
   }
 

package/client/pages/report/custom-elccl/elccl-inventory-summary-report.js

@@ -7,7 +7,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, PageView, store } from '@things-factory/shell'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 class ElcclInventorySummaryReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -243,7 +243,7 @@ class ElcclInventorySummaryReport extends connect(store)(localize(i18next)(PageV
     this._config = this.reportConfig
   }
 
-  async pageUpdated(changes, lifecycle) {
+  pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.dataGrist.fetch()
     }
@@ -271,33 +271,30 @@ class ElcclInventorySummaryReport extends connect(store)(localize(i18next)(PageV
       })
       const response = await client.query({
         query: gql`
-            query {
-              elcclInventoryHistorySummaryReport(${gqlBuilder.buildArgs({
-                filters: filter,
-                pagination: { page, limit },
-                sortings: sorters
-              })}) {
-                items{
-                  batchId
-                  packingType
-                  product{
-                    id
-                    sku
-                    name
-                    description
-                  }
-                  adjustmentQty
-                  closingQty
-                  totalInQty
-                  totalOutQty
-                  totalReturnQty
-                  initialQty
-                  initialDate
+          query elcclInventoryHistorySummaryReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+            elcclInventoryHistorySummaryReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
+              items {
+                batchId
+                packingType
+                product {
+                  id
+                  sku
+                  name
+                  description
                 }
-                total
+                adjustmentQty
+                closingQty
+                totalInQty
+                totalOutQty
+                totalReturnQty
+                initialQty
+                initialDate
               }
+              total
             }
-          `
+          }
+        `,
+        variables: { filters: filter, pagination: { page, limit }, sortings: sorters }
       })
       return {
         total: response.data.elcclInventoryHistorySummaryReport.total,

package/client/pages/report/inventory-pallet-storage-report.js

@@ -8,7 +8,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, PageView, store } from '@things-factory/shell'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 class InventoryPalletStorageReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -254,7 +254,7 @@ class InventoryPalletStorageReport extends connect(store)(localize(i18next)(Page
     this._config = this.reportConfig
   }
 
-  async pageUpdated(changes, lifecycle) {
+  pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.dataGrist.fetch()
     }
@@ -285,13 +285,13 @@ class InventoryPalletStorageReport extends connect(store)(localize(i18next)(Page
 
       const response = await client.query({
         query: gql`
-          query {
-            inventoryHistoryPalletStorageReport(${gqlBuilder.buildArgs({
-              filters: filter,
-              pagination: { page, limit },
-              sortings: sorters
-            })}) {
-              items{
+          query inventoryHistoryPalletStorageReport(
+            $filters: [Filter!]
+            $pagination: Pagination
+            $sortings: [Sorting!]
+          ) {
+            inventoryHistoryPalletStorageReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
+              items {
                 bizplace {
                   name
                 }
@@ -309,7 +309,8 @@ class InventoryPalletStorageReport extends connect(store)(localize(i18next)(Page
               totalWithOpeningBalance
             }
           }
-        `
+        `,
+        variables: { filters: filter, pagination: { page, limit }, sortings: sorters }
       })
 
       let data = {

package/client/pages/report/inventory-report.js

@@ -7,7 +7,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, PageView, store } from '@things-factory/shell'
-import { flattenObject, gqlBuilder } from '@things-factory/utils'
+import { flattenObject } from '@things-factory/utils'
 
 class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -208,10 +208,10 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
         },
         {
           type: 'string',
-          name: 'orderName',
+          name: 'orderNo',
           header: i18next.t('field.order_no'),
           sortable: true,
-          imex: { header: i18next.t('field.order_no'), key: 'orderName', width: 25, type: 'string' },
+          imex: { header: i18next.t('field.order_no'), key: 'orderNo', width: 25, type: 'string' },
           width: 300
         },
         {
@@ -260,7 +260,7 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
     this._config = this.reportConfig
   }
 
-  async pageUpdated(changes, lifecycle) {
+  pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.report.fetch()
     }
@@ -273,32 +273,8 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
       var tzoffset = new Date().getTimezoneOffset() * 60
       const response = await client.query({
         query: gql`
-          query {
-            inventoryHistoryReport(${gqlBuilder.buildArgs({
-              filters: [
-                ...this.searchForm.queryFilters.map(filter => {
-                  switch (filter.name) {
-                    case 'fromDate':
-                      let fromDt = new Date(filter.value)
-                      fromDt.setHours(0)
-                      filter.value = fromDt.toISOString()
-                      break
-                    case 'toDate':
-                      let toDt = new Date(filter.value)
-                      toDt.setHours(23, 59, 59)
-                      filter.value = toDt.toISOString()
-                      break
-                    default:
-                      break
-                  }
-
-                  return filter
-                }),
-                { name: 'tzoffset', operator: 'custom', value: tzoffset }
-              ],
-              pagination: { page, limit },
-              sortings: sorters
-            })}) {
+          query inventoryHistoryReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+            inventoryHistoryReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               palletId
               batchId
               bizplace {
@@ -313,15 +289,38 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
               qty
               uom
               uomValue
-              status
               packingType
-              transactionType
-              orderName
+              orderNo
               orderRefNo
               createdAt
             }
           }
-        `
+        `,
+        variables: {
+          filters: [
+            ...this.searchForm.queryFilters.map(filter => {
+              switch (filter.name) {
+                case 'fromDate':
+                  let fromDt = new Date(filter.value)
+                  fromDt.setHours(0)
+                  filter.value = fromDt.toISOString()
+                  break
+                case 'toDate':
+                  let toDt = new Date(filter.value)
+                  toDt.setHours(23, 59, 59)
+                  filter.value = toDt.toISOString()
+                  break
+                default:
+                  break
+              }
+
+              return filter
+            }),
+            { name: 'tzoffset', operator: 'custom', value: tzoffset }
+          ],
+          pagination: { page, limit },
+          sortings: sorters
+        }
       })
       return {
         total: 0,
@@ -411,17 +410,16 @@ class InventoryReport extends connect(store)(localize(i18next)(PageView)) {
     } else {
       const response = await client.query({
         query: gql`
-            query {
-              productsByBizplace(${gqlBuilder.buildArgs({
-                filters: [...bizplace]
-              })}) {
-                items {
-                  id
-                  name
-                }
+          query productsByBizplace($filters: [Filter!]) {
+            productsByBizplace(filters: $filters) {
+              items {
+                id
+                name
               }
             }
-          `
+          }
+        `,
+        variables: { filters: [...bizplace] }
       })
 
       if (!response.errors) {

package/client/pages/report/inventory-summary-report.js

@@ -10,7 +10,7 @@ import { getPartnerCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, PageView, store } from '@things-factory/shell'
-import { flattenObject, gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
 class InventorySummaryReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -320,7 +320,7 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
     this._config = this.reportConfig
   }
 
-  async pageUpdated(changes, lifecycle) {
+  pageUpdated(changes, lifecycle) {
     if (this.active) {
       this.dataGrist.fetch()
     }
@@ -349,35 +349,32 @@ class InventorySummaryReport extends connect(store)(localize(i18next)(PageView))
       })
       const response = await client.query({
         query: gql`
-            query {
-              inventoryHistorySummaryReport(${gqlBuilder.buildArgs({
-                filters: filter,
-                pagination: { page, limit },
-                sortings: sorters
-              })}) {
-                items{
-                  batchId
-                  packingType
-                  packingSize
-                  product{
-                    id
-                    sku
-                    name
-                    description
-                    type
-                  }
-                  openingQty
-                  totalInQty
-                  totalOutQty
-                  adjustmentQty
-                  closingQty
+          query inventoryHistorySummaryReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+            inventoryHistorySummaryReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
+              items {
+                batchId
+                packingType
+                packingSize
+                product {
+                  id
+                  sku
+                  name
+                  description
+                  type
                 }
-                total
-                totalInboundQty
-                totalOpeningBal
+                openingQty
+                totalInQty
+                totalOutQty
+                adjustmentQty
+                closingQty
               }
+              total
+              totalInboundQty
+              totalOpeningBal
             }
-          `
+          }
+        `,
+        variables: { filters: filter, pagination: { page, limit }, sortings: sorters }
       })
 
       const data = {

package/client/pages/vas/print-product-label.js

@@ -475,6 +475,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                 id
                 batchId
                 packingType
+                releaseQty
                 product {
                   name
                   sku
@@ -549,7 +550,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     auxValue1: product.auxValue1 || '',
                     auxUnit2: product.auxUnit2 || '',
                     auxValue2: product.auxValue2 || '',
-                    bizplaceId: releaseGood.bizplace.id
+                    bizplaceId: releaseGood.bizplace.id,
+                    printQty: oi.releaseQty || 0
                   }
 
                   if (product.productDetails && product.productDetails.length) {

package/client/route.js

@@ -514,5 +514,10 @@ export default function route(page) {
     case 'execute_reverse_kitting':
       import('./pages/vas/reverse-kitting/execute-reverse-kitting')
       return page
+
+    /* Bulk Operations */
+    case 'bulk_operation':
+      import('./pages/bulk-operation/bulk-operation')
+      return page
   }
 }