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

package/client/pages/outbound/route-label-popup.js

@@ -1,19 +1,20 @@
 import '@things-factory/barcode-ui'
 import '@things-factory/grist-ui'
+import '@material/mwc-icon'
 
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
 
+import { DirectPrinter } from '@things-factory/barcode-base'
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
-import { connect } from 'pwa-helpers/connect-mixin'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, store } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
-import { LOCATION_TYPE } from '../constants'
+import { fetchSettingRule } from '../../fetch-setting-value'
+import { LOCATION_TYPE, ROUTE_LABEL_SETTING_KEY } from '../constants'
 
-import { DirectPrinter } from '@things-factory/barcode-base'
-import { ROUTE_LABEL_SETTING_KEY } from '../constants'
 class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
   static get styles() {
     return [
@@ -50,6 +51,16 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
           .mobile-full-width {
             grid-column: span 12 / auto;
           }
+          .multi-column-form {
+            max-width: 100%;
+          }
+        }
+
+        #search {
+          float: right;
+          padding-right: 5px;
+          padding-bottom: 1px;
+          color: var(--search-form-icon-color);
         }
       `
     ]
@@ -62,10 +73,13 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
       partnerId: String,
       worksheetType: String,
       _binNumberList: Array,
-      _selectedBinNumber: String,
-      _selectedPriority: String,
       _searchFields: Array,
+      _priorityList: Array,
       _routeLabel: Object,
+      _selectedPriority: String,
+      _selectedBinNumber: String,
+      _enableToteScanning: Boolean,
+      _enableBinScanning: Boolean,
       orderInventories: Object
     }
   }
@@ -75,7 +89,15 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
   }
 
   get searchForm() {
-    return this.shadowRoot.querySelector('search-form')
+    return this.shadowRoot.querySelector('form')
+  }
+
+  get _withSkuCheckbox() {
+    return this.shadowRoot.querySelector('input[name=withSku]')
+  }
+
+  get _withToteCheckbox() {
+    return this.shadowRoot.querySelector('input[name=withTote]')
   }
 
   _focusOnSerialInput() {
@@ -90,47 +112,72 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
 
   render() {
     return html`
-      <form id="search-form" class="multi-column-form">
-        <fieldset>
-          <select
-            name="binNumber"
-            @change="${e => {
-              this._selectedBinNumber = this._binNumberList.filter(itm => itm.name == e.currentTarget.value)
-              if (this._selectedBinNumber) this.dataGrist.fetch()
-            }}"
-          >
-            <option value="">-- ${i18next.t('text.bin_number')} --</option>
-            ${(this._binNumberList || []).map(list => html` <option value=${list.name}>${list.name}</option> `)}
-          </select>
+      <div>
+        <form class="multi-column-form" @keypress=${async e => this.dataGrist.fetch()}>
           ${this.worksheetType == 'merged'
             ? html`
+                <label>${i18next.t('field.priority')}</label>
+                <select
+                  name="priority"
+                  @change="${e => {
+                    this._selectedPriority = this._priorityList.filter(itm => itm.value == e.currentTarget.value)
+                  }}"
+                >
+                  ${(this._priorityList || []).map(list => html` <option value=${list?.value}>${list?.name}</option> `)}
+                </select>
+              `
+            : ''}
+          ${this._enableBinScanning
+            ? html`
+                <label>${i18next.t('field.bin_number')}</label>
                 <select
-                  name="sortingRule"
+                  name="binNumber"
                   @change="${e => {
-                    this._selectedPriority = e.currentTarget.value
-                    if (this._selectedPriority) this.dataGrist.fetch()
+                    this._selectedBinNumber = this._binNumberList.filter(itm => itm.id == e.currentTarget.value)
+                    if (this._selectedBinNumber.length == 0) this._selectedBinNumber = e.currentTarget.value
+                    this._changeCheckbox()
                   }}"
                 >
-                  <option value="">-- ${i18next.t('text.priority')} --</option>
-                  <option value="roSku">${'RO, Sku'}</option>
-                  <option value="roBin">${'RO, Bin'}</option>
-                  <option value="skuRo">${'Sku, Ro'}</option>
-                  <option value="skuBin">${'Sku, Bin'}</option>
-                  <option value="binRo">${'Bin, Ro'}</option>
-                  <option value="binSku">${'Bin, Sku'}</option>
+                  <option value="" selected></option>
+                  <option value="all">Show All</option>
+                  ${(this._binNumberList || []).map(list => html` <option value=${list.id}>${list.name}</option> `)}
                 </select>
               `
             : ''}
-        </fieldset>
-      </form>
+
+          <input
+            type="checkbox"
+            checked
+            id="withSku"
+            name="withSku"
+            @change="${e => {
+              this._changeCheckbox()
+            }}"
+          />
+          <label for="withSku">${i18next.t('field.sku')}</label>
+
+          ${this._enableToteScanning
+            ? html`
+                <input
+                  type="checkbox"
+                  id="withTote"
+                  name="withTote"
+                  @change="${e => {
+                    this._changeCheckbox()
+                  }}"
+                />
+                <label for="withTote">${i18next.t('field.tote')}</label>
+              `
+            : ''}
+        </form>
+        <mwc-icon id="search" @click=${e => this.dataGrist.fetch()} search>search</mwc-icon>
+      </div>
 
       <div class="grist">
         <data-grist
           .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
           .config=${this.config}
-          .fetchHandler=${this.worksheetType == 'single'
-            ? this.fetchOrderInventoriesOfMultipleReleaseOrders.bind(this)
-            : this.fetchOrderInventoriesOfMergedReleaseOrders.bind(this)}
+          .fetchHandler=${this.fetchHandler.bind(this)}
         ></data-grist>
       </div>
 
@@ -156,6 +203,69 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
 
   async firstUpdated() {
     await this.fetchLocations()
+    this._enableToteScanning = await fetchSettingRule('enable-tote-scanning')
+    this._enableBinScanning = await fetchSettingRule('enable-bin-picking')
+
+    this._priorityList = [
+      { value: '' },
+      {
+        name: 'RO, Sku',
+        value: 'roSku'
+      },
+      {
+        name: 'Sku, RO',
+        value: 'skuRo'
+      }
+    ]
+
+    let configColumns = [
+      { type: 'gutter', gutterName: 'sequence' },
+      { type: 'gutter', gutterName: 'row-selector', multiple: true }
+    ]
+
+    if (this._enableToteScanning) {
+      configColumns.push({
+        type: 'string',
+        name: 'toteNumber',
+        header: i18next.t('field.tote_no'),
+        sortable: true,
+        width: 150
+      })
+    }
+
+    configColumns.push(
+      {
+        type: 'string',
+        name: 'productSku',
+        header: i18next.t('field.sku'),
+        sortable: true,
+        width: 150
+      },
+      {
+        type: 'integer',
+        name: 'releaseQty',
+        header: i18next.t('field.release_qty'),
+        width: 150
+      },
+      {
+        type: 'string',
+        name: 'roName',
+        header: i18next.t('field.ro'),
+        sortable: true,
+        width: 150
+      }
+    )
+
+    if (this._enableBinScanning) {
+      configColumns.push({
+        type: 'string',
+        name: 'binNumber',
+        header: i18next.t('field.bin_no'),
+        sortable: true,
+        width: 150
+      })
+    }
+
     this.config = {
       rows: {
         appendable: false,
@@ -169,49 +279,25 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
       list: {
         fields: ['productSku', 'releaseQty', 'roName', 'binNumber']
       },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        { type: 'gutter', gutterName: 'row-selector', multiple: true },
-        {
-          type: 'string',
-          name: 'productSku',
-          header: i18next.t('field.sku'),
-          sortable: true,
-          width: 150
-        },
-        {
-          type: 'integer',
-          name: 'releaseQty',
-          header: i18next.t('field.release_qty'),
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'roName',
-          header: i18next.t('field.ro'),
-          sortable: true,
-          width: 150
-        },
-        {
-          type: 'string',
-          name: 'binNumber',
-          header: i18next.t('field.bin_number'),
-          sortable: true,
-          width: 150
-        }
-      ]
+      columns: configColumns
     }
   }
 
-  async fetchOrderInventoriesOfMultipleReleaseOrders({ sorters = [] }) {
+  async fetchHandler({ sorters = [] }) {
     const filters = []
-    if (this._selectedBinNumber && this._selectedBinNumber.length !== 0) {
-      filters.push({
-        name: 'binNumber',
-        operator: 'eq',
-        value: this._selectedBinNumber[0].name
-      })
+
+    if (this.worksheetType == 'merged') {
+      filters.push({ name: 'merged', operator: 'eq', value: 'merged' })
     }
+
+    if (this._withSkuCheckbox?.checked == true) {
+      filters.push({ name: 'withSku', operator: 'eq', value: true })
+    }
+
+    if (this._withToteCheckbox?.checked == true) {
+      filters.push({ name: 'withTote', operator: 'eq', value: true })
+    }
+
     try {
       const response = await client.query({
         query: gql`
@@ -219,39 +305,39 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
             $partnerId: String!
             $filters: [Filter!]
             $sortings: [Sorting!]
+            $priority: String
+            $binNumber: String
           ) {
-            orderInventoriesOfMultipleReleaseOrders(partnerId: $partnerId, filters: $filters, sortings: $sortings) {
+            orderInventoriesOfMultipleReleaseOrders(
+              partnerId: $partnerId
+              filters: $filters
+              sortings: $sortings
+              priority: $priority
+              binNumber: $binNumber
+            ) {
               items {
-                id
-                name
+                toteNumber
+                binNumber
+                productSKU
+                productName
                 releaseQty
-                releaseGood {
-                  id
-                  name
-                  routeId
-                  storeId
-                  storeName
-                  stopId
-                }
-                product {
-                  id
-                  sku
-                  name
-                }
-                inventory {
-                  id
-                  name
-                }
-                binLocation {
-                  id
-                  name
-                }
+                releaseGoodName
+                routeId
+                storeId
+                storeName
+                stopId
               }
               total
             }
           }
         `,
-        variables: { partnerId: this.partnerId, filters, sortings: sorters }
+        variables: {
+          partnerId: this.partnerId,
+          filters,
+          sortings: sorters,
+          priority: this._selectedPriority?.length == 1 ? this._selectedPriority[0].value : this._selectedPriority,
+          binNumber: this._selectedBinNumber?.length == 1 ? this._selectedBinNumber[0].name : this._selectedBinNumber
+        }
       })
 
       if (!response.errors) {
@@ -263,87 +349,8 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
             records.items.map(itm => {
               return {
                 ...itm,
-                productSku: itm.product?.sku,
-                productName: itm.product?.name,
-                roName: itm.releaseGood?.name,
-                binNumber: itm.binLocation?.name
-              }
-            }) || {}
-        })
-      }
-    } catch (e) {
-      this._showToast(e)
-    }
-  }
-
-  async fetchOrderInventoriesOfMergedReleaseOrders({ sorters = [] }) {
-    const filters = []
-    if (this._selectedBinNumber && this._selectedBinNumber.length !== 0) {
-      filters.push({
-        name: 'binNumber',
-        operator: 'eq',
-        value: this._selectedBinNumber[0].name
-      })
-    }
-
-    if (this._selectedPriority && this._selectedPriority.length !== 0) {
-      filters.push({
-        name: 'priority',
-        operator: 'eq',
-        value: this._selectedPriority
-      })
-    }
-    try {
-      const response = await client.query({
-        query: gql`
-          query orderInventoriesOfMergedReleaseOrders($partnerId: String!, $filters: [Filter!], $sortings: [Sorting!]) {
-            orderInventoriesOfMergedReleaseOrders(partnerId: $partnerId, filters: $filters, sortings: $sortings) {
-              items {
-                id
-                name
-                releaseQty
-                releaseGood {
-                  id
-                  name
-                  routeId
-                  storeId
-                  storeName
-                  stopId
-                }
-                product {
-                  id
-                  sku
-                  name
-                }
-                inventory {
-                  id
-                  name
-                }
-                binLocation {
-                  id
-                  name
-                }
-              }
-              total
-            }
-          }
-        `,
-        variables: { partnerId: this.partnerId, filters, sortings: sorters }
-      })
-
-      if (!response.errors) {
-        let records = response.data.orderInventoriesOfMergedReleaseOrders
-
-        return (this.orderInventories = {
-          total: records.total || 0,
-          records:
-            records.items.map(itm => {
-              return {
-                ...itm,
-                productSku: itm.product?.sku,
-                productName: itm.product?.name,
-                roName: itm.releaseGood?.name,
-                binNumber: itm.binLocation?.name
+                roName: itm.releaseGoodName,
+                productSku: itm.productSKU
               }
             }) || {}
         })
@@ -367,26 +374,33 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
       })
     } else {
       for (var record of records) {
-        for (let qty = 1; qty <= record.releaseQty; qty++) {
+        let max = record.releaseQty ? record.releaseQty : 1
+        for (let qty = 1; qty <= max; qty++) {
           var searchParams = new URLSearchParams()
 
           /* for pallet record mapping */
           searchParams.append('roName', record.roName)
-          searchParams.append('productSku', record.productSku)
-          searchParams.append('productName', record.productName)
-          searchParams.append('binNumber', record.binNumber)
-          searchParams.append('qty', qty)
-          searchParams.append('releaseQty', record.releaseQty)
-          searchParams.append('stopId', record.releaseGood.stopId)
-          searchParams.append('routeId', record.releaseGood.routeId)
-          searchParams.append('storeId', record.releaseGood.storeId)
-          searchParams.append('storeName', record.releaseGood.storeName)
-          searchParams.append('str', `STR: ${record.releaseGood.storeId}`)
+          if (record?.binNumber) {
+            searchParams.append('binNumber', record.binNumber)
+          }
+          if (!record?.toteNumber) {
+            searchParams.append('qty', record.qty)
+            searchParams.append('releaseQty', record.releaseQty)
+            searchParams.append('counter', `${qty} of ${record.releaseQty}`)
+            searchParams.append('productSku', record.productSku)
+            searchParams.append('productName', record.productName)
+          } else {
+            searchParams.append('productName', record.toteNumber)
+          }
+          searchParams.append('stopId', record.stopId)
+          searchParams.append('routeId', record.routeId)
+          searchParams.append('storeId', record.storeId)
+          searchParams.append('storeName', record.storeName)
+          searchParams.append('str', `STR: ${record.storeId}`)
           searchParams.append(
             'storeInformation',
-            `(Store ID) ${record.releaseGood.storeId}, (Store Name) ${record.releaseGood.storeName}, (Route ID) ${record.releaseGood.routeId}, (Stop ID) ${record.releaseGood.stopId}`
+            `(Store ID) ${record.storeId}, (Store Name) ${record.storeName}, (Route ID) ${record.routeId}, (Stop ID) ${record.stopId}`
           )
-          searchParams.append('counter', `${qty} of ${record.releaseQty}`)
 
           try {
             const response = await fetch(`label-command/${labelId}?${searchParams.toString()}`, {
@@ -449,6 +463,84 @@ class RouteLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
     }
   }
 
+  _compareValues(key, order = 'asc') {
+    return function innerSort(a, b) {
+      if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {
+        return 0
+      }
+
+      const varA = typeof a[key] === 'string' ? a[key].toUpperCase() : a[key]
+      const varB = typeof b[key] === 'string' ? b[key].toUpperCase() : b[key]
+
+      let comparison = 0
+      if (varA > varB) {
+        comparison = 1
+      } else if (varA < varB) {
+        comparison = -1
+      }
+      return order === 'desc' ? comparison * -1 : comparison
+    }
+  }
+
+  _changeCheckbox(e) {
+    let priorList = [{ value: '' }]
+
+    let skuPriorList = [
+      {
+        name: 'RO, Sku',
+        value: 'roSku'
+      },
+      {
+        name: 'Sku, RO',
+        value: 'skuRo'
+      }
+    ]
+
+    let binPriorList = [
+      {
+        name: 'Sku, Bin',
+        value: 'skuBin'
+      },
+      {
+        name: 'RO, Bin',
+        value: 'roBin'
+      },
+      {
+        name: 'Bin, RO',
+        value: 'binRo'
+      },
+      {
+        name: 'Bin, Sku',
+        value: 'binSku'
+      }
+    ]
+
+    let totePriorList = [
+      {
+        name: 'RO, Tote',
+        value: 'roTote'
+      },
+      {
+        name: 'Tote, RO',
+        value: 'toteRo'
+      }
+    ]
+
+    if (this._withSkuCheckbox.checked == true) {
+      priorList.push(...skuPriorList)
+    }
+
+    if (this._selectedBinNumber?.length > 0 && this._selectedBinNumber[0].value !== '') {
+      priorList.push(...binPriorList)
+    }
+
+    if (this._withToteCheckbox.checked == true) {
+      priorList.push(...totePriorList)
+    }
+
+    this._priorityList = priorList
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

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

@@ -346,6 +346,7 @@ class SerialNumberPopup extends localize(i18next)(LitElement) {
       }
 
       if (!response.errors) {
+        this._selectedSerialNumber = {}
         this.dataGrist.fetch()
       }
     } catch (e) {

package/client/pages/outbound/sorting-product.js

@@ -3,12 +3,12 @@ import '@things-factory/grist-ui'
 import './show-ro-list-popup'
 import '../components/worksheet-information-popup'
 import './tote-popup'
-import { sleep } from '@operato/utils'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
+import { sleep } from '@operato/utils'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
@@ -360,8 +360,8 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
     try {
       const response = await client.query({
         query: gql`
-          query findReleaseOrdersByTaskNo($taskNo: String!) {
-            findReleaseOrdersByTaskNo(taskNo: $taskNo) {
+          query findSortingReleaseOrdersByTaskNo($taskNo: String!) {
+            findSortingReleaseOrdersByTaskNo(taskNo: $taskNo) {
               releaseGoods {
                 id
                 name
@@ -375,8 +375,8 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
 
       if (!response.errors) {
-        this.releaseOrders = response.data.findReleaseOrdersByTaskNo.releaseGoods
-        this.taskNo = response.data.findReleaseOrdersByTaskNo.taskNo
+        this.releaseOrders = response.data.findSortingReleaseOrdersByTaskNo.releaseGoods
+        this.taskNo = response.data.findSortingReleaseOrdersByTaskNo.taskNo
         if (this.releaseOrders?.length) {
           await this._openSelectReleaseOrderPopup()
         } else {
@@ -504,12 +504,12 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
       this._completeHandler()
 
       if (this._isRequireSerialNumberScanningOutbound) {
-        if (this._enableProductScanning) {
-          this._focusOnProductBarcodeInput
-        } else {
-          this._focusOnSerialInput()
-        }
-      } else this._focusOnSortingQtyInput()
+        this._focusOnSerialInput()
+      } else if (this._enableProductScanning && !this._isRequireSerialNumberScanningOutbound) {
+        this._focusOnProductBarcodeInput()
+      } else {
+        this._focusOnSortingQtyInput()
+      }
     }
   }
 
@@ -530,7 +530,7 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
         this.serialInput.value = ''
       }
 
-      if (this._enableProductScanning) {
+      if (this._enableProductScanning && !this._isRequireSerialNumberScanningOutbound) {
         this.productBarcodeInput.value = ''
       } else if (!this._enableProductScanning && !this._isRequireSerialNumberScanningOutbound) {
         this.sortingQtyInput.value = ''