@things-factory/operato-wms 5.0.0-alpha.38 → 5.0.0-alpha.40

package/client/pages/inbound/unload-product.js

@@ -372,7 +372,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   this.productBarcodeInput.readOnly = false
                   this.productBarcodeInput.value = ''
                 }
-                if (this.serialNumberInput) {
+                if (record.product?.isRequireSerialNumberScanningInbound) {
                   this.serialNumberInput.value = ''
                 }
                 this.cartonInput.value = ''
@@ -859,6 +859,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       this._showToast(e)
     }
   }
+
   async _scanProductUnload() {
     if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
     this._scanning = true
@@ -1010,9 +1011,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
     } catch (e) {
       this._showToast(e)
-    } finally {
-      this._scanning = false
     }
+    this._scanning = false
   }
 
   async fetchProductDetail(gtin, productId) {
@@ -1090,10 +1090,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
           this._selectedOrderProduct = null
 
-        if (foundOrderProducts?.length > 1 && !this._selectedOrderProduct) {
-          this.selectOrderProduct(foundOrderProducts)
-        } else {
-          this._selectedOrderProduct = foundParentProducts[0]
+        if (!this._selectedOrderProduct) {
+          if (foundOrderProducts?.length > 1) {
+            this.selectOrderProduct(foundOrderProducts)
+          } else if (foundOrderProducts?.length == 1) {
+            this._selectedOrderProduct = foundOrderProducts[0]
+          } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length > 0) {
+            this._selectedOrderProduct = foundParentProducts[0]
+          }
         }
       }
     } catch (e) {

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

@@ -103,7 +103,6 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       <data-grist
         .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
         .config=${this.config}
-        .data=${this._data}
         .fetchHandler="${this.fetchHandler.bind(this)}"
         @record-change="${this.customerChange.bind(this)}"
         @field-change="${this.fieldChange.bind(this)}"
@@ -379,7 +378,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           sortable: false,
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
-              if (record.qty > 0) this._openSerialNumberPopup(record, rowIndex)
+              if (record.qty > 0) this._openSerialNumberPopup(record, rowIndex, data.records)
             }
           },
           width: 80
@@ -600,7 +599,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       }
     })
 
-    this._data = {
+    return {
       total: response.data.inventories.total || 0,
       records: response.data.inventories.items || []
     }
@@ -1129,7 +1128,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     )
   }
 
-  _openSerialNumberPopup(inventory, rowIndex) {
+  _openSerialNumberPopup(inventory, rowIndex, records) {
     const removable =
       inventory?.product?.isRequireSerialNumberScanningOutbound &&
       inventory?.product?.isRequireSerialNumberScanningInbound
@@ -1141,6 +1140,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       inventory?.product?.isRequireSerialNumberScanningInbound
         ? true
         : false
+
     openPopup(
       html`
         <serial-number-list-popup
@@ -1162,7 +1162,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             }
 
             let inventoryItemChangesJson = JSON.stringify(newRecords)
-            let currentInventoryItemCount = this._data.records[rowIndex]?.inventoryItemCount || 0
+            let currentInventoryItemCount = records[rowIndex]?.inventoryItemCount || 0
 
             this.dataGrist.dirtyData.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
             this.dataGrist.dirtyData.records[rowIndex].inventoryItemCount =
@@ -1182,9 +1182,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             }
             this.dataGrist.dirtyData.records[rowIndex].__dirty__ = 'M'
 
-            if (this._data.records[rowIndex]) {
-              this._data.records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
-              this._data.records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
+            if (records[rowIndex]) {
+              records[rowIndex].inventoryItemChanges = inventoryItemChangesJson
+              records[rowIndex].inventoryItemCount = currentInventoryItemCount + totalSerialNumber
             }
           }}"
         ></serial-number-list-popup>

package/client/pages/inventory-check/inspecting-product.js

@@ -654,7 +654,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
     this.locationData = { records: [] }
     this.inventoryData = { records: [] }
 
-    const selectedWarehouseName = this.warehouseSelector.value
+    const selectedWarehouseName = this.warehouseSelector?.value.trim()
     const selectedZone = this.zoneSelector.value
     this.selectedRow = this.rowSelector.value
     this.selectedColumn = this.columnSelector.value
@@ -665,7 +665,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
       this.zones = Array.from(
         new Set(
           this.formattedLocations
-            .filter(loc => loc.warehouse.name === selectedWarehouseName)
+            .filter(loc => loc.warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName)
             .map(loc => loc.zone)
             .sort()
         )
@@ -681,7 +681,10 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
       rows = Array.from(
         new Set(
           this.formattedLocations
-            .filter(loc => loc.warehouse.name === selectedWarehouseName && loc.zone === selectedZone)
+            .filter(
+              loc =>
+                loc.warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName && loc.zone === selectedZone
+            )
             .map(loc => loc.row)
             .sort()
         )
@@ -690,7 +693,10 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
       columns = Array.from(
         new Set(
           this.formattedLocations
-            .filter(loc => loc.warehouse.name === selectedWarehouseName && loc.zone === selectedZone)
+            .filter(
+              loc =>
+                loc.warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName && loc.zone === selectedZone
+            )
             .map(loc => loc.column)
             .sort()
         )
@@ -703,7 +709,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
           this.formattedLocations
             .filter(
               loc =>
-                loc.warehouse.name === selectedWarehouseName &&
+                loc.warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName &&
                 loc.zone === selectedZone &&
                 loc.row === this.selectedRow
             )
@@ -719,7 +725,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
           this.formattedLocations
             .filter(
               loc =>
-                loc.warehouse.name === selectedWarehouseName &&
+                loc.warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName &&
                 loc.zone === selectedZone &&
                 loc.column === this.selectedColumn
             )
@@ -733,7 +739,7 @@ class InspectingProduct extends connect(store)(localize(i18next)(PageView)) {
     if (selectedWarehouseName && selectedZone && (this.selectedRow || this.selectedColumn)) {
       records = this.formattedLocations
         .filter(({ warehouse, zone, row, column }) => {
-          if (warehouse.name === selectedWarehouseName && zone === selectedZone) {
+          if (warehouse.name.replace(/\s{2,}/g, ' ').trim() === selectedWarehouseName && zone === selectedZone) {
             if (this.selectedRow && this.selectedColumn)
               return row === this.selectedRow && column === this.selectedColumn
             if (this.selectedRow) return row === this.selectedRow

package/client/pages/order/goods-received-note/customer-received-note.js

@@ -90,6 +90,9 @@ class CustomerReceivedNote extends localize(i18next)(PageView) {
       case 'seebuu-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_seebuu_grn/${this._grnNo}`
         break
+      case 'freight-mark-warehouse':
+        this.shadowRoot.querySelector('#container').src = `/view_fm_grn/${this._grnNo}/${timezoneOffSet}`
+        break
       case 'kimeda-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_kimeda_grn/${this._grnNo}/${timezoneOffSet}`
         break

package/client/pages/order/goods-received-note/received-note-detail.js

@@ -92,6 +92,9 @@ class ReceivedNoteDetail extends localize(i18next)(PageView) {
       case 'seebuu-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_seebuu_grn/${this._grnNo}`
         break
+      case 'freight-mark-warehouse':
+        this.shadowRoot.querySelector('#container').src = `/view_fm_grn/${this._grnNo}/${timezoneOffSet}`
+        break
       case 'kimeda-warehouse':
         this.shadowRoot.querySelector('#container').src = `/view_kimeda_grn/${this._grnNo}/${timezoneOffSet}`
         break

package/client/pages/order/release-order/release-extra-product-popup.js

@@ -609,7 +609,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
 
     if (afterValue >= 0) {
       if (columnName == 'releaseUomValue' || columnName == 'releaseQty') {
-        if (originQty) {
+        if (originQty >= 0) {
           if (originQty == 0 || originUom == 0) {
             packageUom = originAddableUom / originAddableQty
           } else {
@@ -643,6 +643,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
 
     return { releaseQty, roundedUom }
   }
+
   _onInventoryFieldChanged(e) {
     let columnName = e.detail.column.name
     let roundedUomValue = e.detail.record.roundedUomValue || 0
@@ -650,7 +651,7 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
     let packageUomValue = 0
 
     try {
-      if (e.detail.after == NaN) {
+      if (Number.isNaN(e.detail.after)) {
         throw new Error(i18next.t('text.invalid_form_value'))
       }
     } catch (e) {
@@ -707,15 +708,19 @@ export class ReleaseExtraProductPopup extends localize(i18next)(LitElement) {
     var totalAvailableQty = 0
     var totalAvailableUomValue = 0
 
-    if (gristType == 'existing') {
-      totalAvailableQty = beforeRecord.addableQty + beforeRecord.releaseQty
-      totalAvailableUomValue = beforeRecord.addableUomValue + beforeRecord.releaseUomValue
-    } else {
-      totalAvailableQty = changeRecord.remainQty
-      totalAvailableUomValue = changeRecord.remainUomValue
-    }
-
     try {
+      if (Number.isNaN(changeRecord.releaseQty) || Number.isNaN(changeRecord.releaseUomValue)) {
+        throw new Error(i18next.t('text.invalid_form_value'))
+      }
+
+      if (gristType == 'existing') {
+        totalAvailableQty = beforeRecord.addableQty + beforeRecord.releaseQty
+        totalAvailableUomValue = beforeRecord.addableUomValue + beforeRecord.releaseUomValue
+      } else {
+        totalAvailableQty = changeRecord.remainQty
+        totalAvailableUomValue = changeRecord.remainUomValue
+      }
+
       if (changedColumn === 'releaseQty') {
         this._validateReleaseQty(changeRecord.releaseQty, changeRecord.remainQty, totalAvailableQty)
       } else if (changedColumn === 'releaseUomValue') {

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

@@ -110,7 +110,7 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
   async pageInitialized() {
     const _worksheetStatus = await getCodeByName('WORKSHEET_STATUS')
     const partners = [...(await this._fetchPartners())]
-
+  
     this._searchFields = [
       {
         name: 'name',
@@ -153,6 +153,12 @@ class MergedOutboundWorksheet extends localize(i18next)(PageView) {
         ],
         props: { searchOper: 'eq' }
       },
+      {
+        name: 'assignee',
+        label: i18next.t('field.picker'),
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
       {
         label: i18next.t('field.from_date'),
         name: 'fromDate',

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

@@ -97,7 +97,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
   get context() {
     var actions = []
-    if (this._hasBinPicking && this.refPickingType === PICKING_TYPES.PICKING.value) {
+    if (this._hasBinPicking && this.refPickingType === PICKING_TYPES.PICKING.value || PICKING_TYPES.BATCH_PICKING.value) {
       actions.push({
         title: i18next.t('button.get_task'),
         action: this.getTask.bind(this),

package/client/pages/outbound/select-operator-popup.js

@@ -1,5 +1,5 @@
 import { i18next, localize } from '@things-factory/i18n-base'
-import { client } from '@things-factory/shell'
+import { client,gqlContext } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
@@ -61,7 +61,10 @@ class SelectOperatorPopup extends localize(i18next)(LitElement) {
     return this.renderRoot.querySelector('data-grist')
   }
 
-  firstUpdated() {
+  async firstUpdated() {
+
+    const roles = [...(await this.fetchRoles())]
+
     this.searchFields = [
       {
         name: 'name',
@@ -74,6 +77,23 @@ class SelectOperatorPopup extends localize(i18next)(LitElement) {
         label: i18next.t('field.email'),
         type: 'text',
         props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('field.role'),
+        name: 'roles',
+        type: 'select',
+        options: [
+          { value: '' },
+          ...roles
+            .map(roles => {
+              return {
+                name: `${roles.name}`,
+                value: roles.name
+              }
+            })
+            .sort(this._compareValues('name', 'asc'))
+        ],
+        props: { searchOper: 'eq' }
       }
     ]
 
@@ -91,24 +111,34 @@ class SelectOperatorPopup extends localize(i18next)(LitElement) {
           type: 'string',
           name: 'name',
           header: i18next.t('field.name'),
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'roles',
+          header: i18next.t('field.role'),
           width: 150
         },
         {
           type: 'string',
           name: 'email',
           header: i18next.t('field.email'),
+          sortable: true,
           width: 200
         },
         {
           type: 'string',
           name: 'pending',
           header: i18next.t('label.pending'),
+          sortable: true,
           width: 100
         },
         {
           type: 'string',
           name: 'picking',
           header: i18next.t('label.picking'),
+          sortable: true,
           width: 100
         }
       ]
@@ -116,27 +146,26 @@ class SelectOperatorPopup extends localize(i18next)(LitElement) {
   }
 
   async fetchHandler({ page, limit, sorters }) {
-    const { name, email } = this.searchForm?.serialize()
+    const filters = await this.searchForm.getQueryFilters()
+    const pagination = { }
+    const sortings = sorters || []
 
     const response = await client.query({
       query: gql`
-        query pickingAssignmentStatusByUsers($name: String, $email: String) {
-          pickingAssignmentStatusByUsers(name: $name, email: $email) {
+        query pickingAssignmentStatusByUsers($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          pickingAssignmentStatusByUsers(filters: $filters, pagination: $pagination, sortings: $sortings) {
             user {
               id
               name
               email
+              description
             }
-            pending {
-              id
-            }
-            picking {
-              id
-            }
+            pending
+            picking
           }
         }
       `,
-      variables: { name, email }
+      variables: { filters, pagination, sortings}
     })
 
     if (!response.errors) {
@@ -147,14 +176,57 @@ class SelectOperatorPopup extends localize(i18next)(LitElement) {
             ...item,
             name: item.user.name,
             email: item.user.email,
-            pending: item.pending?.length || 0,
-            picking: item.picking?.length || 0
+            roles: item.user.description
           }
         })
       }
     }
   }
 
+  async fetchRoles() {
+    const response = await client.query({
+      query: gql`
+        query roles($sortings: [Sorting!]) {
+          roles(sortings: $sortings) {
+            items {
+              id
+              name
+              description
+              privileges {
+                id
+                name
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: { sortings: [{ name: 'name' }] },
+      context: gqlContext()
+    })
+
+    return response.data.roles.items
+  }
+
+  _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
+    }
+  }
+
   selectOperator() {
     const selectedOperator = this.dataGrist.selected[0]
     if (selectedOperator?.name) {

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

@@ -66,7 +66,13 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
   }
 
   get context() {
-    var actions = []
+    var actions = [
+        {
+          title: i18next.t('button.assign_picker'),
+          action: this._assignPicker.bind(this),
+          ...CommonButtonStyles.activate
+        }
+      ]
 
     if (this._routeLabelSetting) {
       actions.push({
@@ -78,19 +84,12 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
 
     return {
       title: i18next.t('title.outbound_worksheet'),
-      actions: [
-        {
-          title: i18next.t('button.assign_picker'),
-          action: this._assignPicker.bind(this),
-          ...CommonButtonStyles.activate
-        }
-      ],
+      actions,
       exportable: {
         name: i18next.t('title.outbound_worksheet'),
         data: this._exportableData.bind(this)
       },
-      help: 'operato-wms/outbound/single-outbound-worksheet',
-      actions
+      help: 'operato-wms/outbound/single-outbound-worksheet'
     }
   }
 
@@ -157,6 +156,12 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
         ],
         props: { searchOper: 'eq' }
       },
+      {
+        name: 'assignee',
+        label: i18next.t('field.picker'),
+        type: 'text',
+        props: { searchOper: 'i_like' }
+      },
       {
         label: i18next.t('field.from_date'),
         name: 'fromDate',
@@ -187,7 +192,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
       },
       {
         label: i18next.t('field.cross_docking'),
-        name: 'crossDocking',
+        name: 'crossDocking', 
         type: 'checkbox',
         props: { searchOper: 'eq' },
         attrs: ['indeterminate']
@@ -431,8 +436,11 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
     })
 
     if (!response.errors) {
-      let domain = response.data.worksheets.items[0].domain
-      this._routeLabelSetting = await fetchSettingRule('enable-print-route-label', domain.id)
+      let domain = response.data.worksheets.items[0]?.domain
+
+      if (domain)
+        this._routeLabelSetting = await fetchSettingRule('enable-print-route-label', domain.id)
+        
       this.updateContext()
       return {
         total: response.data.worksheets.total || 0,
@@ -487,7 +495,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
         return item.status == 'DEACTIVATED'
       })
 
-      if (selectedData.length <= 0) throw new Error('No available worksheet selected')
+      if (selectedData.length <= 0) throw new Error(i18next.t('text.no_available_worksheet_selected'))
 
       openPopup(
         html`

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

@@ -174,7 +174,7 @@ class WorksheetBatchPicking extends localize(i18next)(PageView) {
             <label>${i18next.t('label.company')}</label>
             <input name="bizplace" readonly />
 
-            <label>${i18next.t('label.assignee')}</label>
+            <label>${i18next.t('label.picker')}</label>
             <input name="assignee" readonly />
 
             <label>${i18next.t('label.status')}</label>

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

@@ -241,7 +241,7 @@ class WorksheetPicking extends localize(i18next)(PageView) {
               disabled
             />
 
-            <label>${i18next.t('label.assignee')}</label>
+            <label>${i18next.t('label.picker')}</label>
             <input name="assignee" readonly />
           </fieldset>
         </form>