@things-factory/operato-wms 3.8.10 → 3.8.15

package/client/pages/master/location-list.js

@@ -665,6 +665,7 @@ class LocationList extends connect(store)(localize(i18next)(PageView)) {
 
         /* for location record mapping */
         searchParams.append('location', record.name)
+        searchParams.append('originalName', record.originalName)
         searchParams.append('label', record.indicator)
 
         try {

package/client/pages/master/print-location-label.js

@@ -1,12 +1,14 @@
 import '@things-factory/form-ui'
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit-element'
+import { isMobileDevice } from '@things-factory/utils'
 
 export class PrintLocationLabel extends localize(i18next)(LitElement) {
   static get properties() {
@@ -91,27 +93,24 @@ export class PrintLocationLabel extends localize(i18next)(LitElement) {
           <fieldset>
             <label>${i18next.t('label.label_format')}</label>
             <select
-              name="labelFormat" 
+              name="labelFormat"
               @change="${e => {
-                this._fullLocationFormat =
-                  e.currentTarget.value === 'full_format'
-                    ? true 
-                    : false
-                if (this._labelIndicator.value != '') {
-                  this._getPrintPreview(this._labelIndicator.value)
-                }
-              }}">
+                this._fullLocationFormat = e.currentTarget.value === 'full_format' ? true : false
+                if (this._labelIndicator.value != '') this.dataGrist.fetch()
+              }}"
+            >
               <option value="full_format">A-01-01-01 (${i18next.t('text.full_format')})</option>
               <option value="partial_format">A-01-01 (${i18next.t('text.partial_format')})</option>
             </select>
 
             <label>${i18next.t('label.label_indicator')}</label>
-            <select name="labelIndicator" 
+            <select
+              name="labelIndicator"
               @change="${e => {
                 let indicator = e.currentTarget.value
-                if (indicator !== '')
-                  this._getPrintPreview(indicator)
-              }}">
+                if (indicator !== '') this.dataGrist.fetch()
+              }}"
+            >
               <option value="">-- ${i18next.t('text.please_select_label_indicator')} --</option>
               <option value="zone">${i18next.t('label.zone')}</option>
               <option value="row">${i18next.t('label.row')}</option>
@@ -151,6 +150,12 @@ export class PrintLocationLabel extends localize(i18next)(LitElement) {
           header: i18next.t('field.name'),
           width: 250
         },
+        {
+          type: 'string',
+          name: 'originalName',
+          header: i18next.t('field.original_name'),
+          width: 250
+        },
         {
           type: 'string',
           name: 'indicator',
@@ -159,11 +164,6 @@ export class PrintLocationLabel extends localize(i18next)(LitElement) {
         }
       ]
     }
-
-    if (this.selectedLocations && this.selectedLocations.length > 0) {
-      this._records = []
-      this._total = 0
-    }
   }
 
   get _labelIndicator() {
@@ -174,171 +174,157 @@ export class PrintLocationLabel extends localize(i18next)(LitElement) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
-  async fetchHandler() {
-    return {
-      records: this._records || [],
-      total: this._total || 0
-    }
-  }
+  async fetchHandler({ page, limit, sorters = [{ name: 'name' }] }) {
+    if (this._labelIndicator.value == '') return
+    const fetcherDetail = { page, limit, sorters }
+    const indicator = this._labelIndicator.value || ''
 
-  async _getPrintPreview(indicator) {
-    let locations = []
-    let filters = []
+    let filters = [
+      {
+        name: 'warehouse_id',
+        operator: 'eq',
+        value: this.warehouseId
+      }
+    ]
+
+    let locations = [],
+      totalLocations = 0
 
-    if (this.selectedLocations && this.selectedLocations.length > 0) {
-      locations = this.selectedLocations
+    if (this.selectedLocations && this.selectedLocations.length) {
+      filters.push({
+        name: 'name',
+        operator: 'in',
+        value: this.selectedLocations.map(location => location.name)
+      })
+      const { records, total } = await this._fetchLocations(filters, fetcherDetail)
+      locations = records
+      totalLocations = total
     } else {
-      if (this.warehouseId) {
-        if (this._fullLocationFormat) {
-          filters = [
-            {
-              name: 'warehouse_id',
-              operator: 'eq',
-              value: this.warehouseId
-            },
-            {
-              name: 'type',
-              operator: 'noteq',
-              value: 'BUFFER'
-            }
-          ]
-          locations = await this._fetchLocations(filters)
-        } 
+      if (this._fullLocationFormat) {
+        filters.push({
+          name: 'type',
+          operator: 'noteq',
+          value: 'BUFFER'
+        })
+        const { records, total } = await this._fetchLocations(filters, fetcherDetail)
+        locations = records
+        totalLocations = total
+      } else {
         // if partial format:
-        // prevent from printing same location label.  eg: A-01-01-01, A-01-01-02 > will print A-01-01 twice
-        else {
-          if (indicator === 'shelf') {
-            this._showToast({
-              level: 'error',
-              message: i18next.t('text.shelf_is_not_allowed_as_an_indicator_for_partial_format')
-            })       
-            return     
-          } else {
-            filters = [{
-              name: 'warehouse_id',
-              operator: 'eq',
-              value: this.warehouseId
-            }]
-            locations = await this._fetchLocationsByGroup(filters)
-          }
+        // prevent from printing same location label.  eg: A-01-01-01, A-01-01-02 > will print A-01-01 twice{
+        if (indicator == 'shelf') {
+          this._showToast({
+            level: 'error',
+            message: i18next.t('text.shelf_is_not_allowed_as_an_indicator_for_partial_format')
+          })
+          return
+        } else {
+          const { records, total } = await this._fetchLocationsByGroup(filters, fetcherDetail)
+          locations = records
+          totalLocations = total
         }
       }
     }
 
-    locations = locations.map(location => {
-      if (location.type === 'BUFFER') {
-        return {
-          ...location,
-          indicator: location[indicator]
-        }
-      } 
-      
-      else {
+    return {
+      total: totalLocations,
+      records: locations.map(location => {
         return {
           ...location,
-          name: this._fullLocationFormat // check if full location format is true
-          ? `${location.zone}-${location.row}-${location.column}-${location.shelf}`
-          : `${location.zone}-${location.row}-${location.column}`,
-          indicator: location[indicator]
+          indicator: location[indicator],
+          originalName: location.name,
+          name:
+            location.type === 'BUFFER'
+              ? ''
+              : this._fullLocationFormat // check if full location format is true
+              ? `${location.zone}-${location.row}-${location.column}-${location.shelf}`
+              : `${location.zone}-${location.row}-${location.column}`
         }
-      }
-    })
-
-    this._records = locations
-    this._total = locations.length
-
-    this._config = {
-      ...this._config,
-      pagination: { pages: [20, 50, 100, 200] }
+      })
     }
-
-    this.dataGrist.fetch()
   }
 
-  async _fetchLocations(filters) {
-    const sorters = [{ name: 'name', desc: false }]
-
-    if (this.warehouseId) {
-      try {
-        this.dataGrist.showSpinner()
-
-        const response = await client.query({
-          query: gql`
-            query {
-              locations(${gqlBuilder.buildArgs({
-                filters,
-                sortings: sorters
-              })}) {
-                items {
-                  name
-                  zone
-                  row
-                  column
-                  shelf
-                }
-                total
+  async _fetchLocations(filters, fetcherDetail) {
+    try {
+      const response = await client.query({
+        query: gql`
+          query locations($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+            locations(filters: $filters, pagination: $pagination, sortings: $sortings) {
+              items {
+                name
+                zone
+                row
+                column
+                shelf
+                type
               }
+              total
             }
-          `
-        })
+          }
+        `,
+        variables: {
+          filters,
+          paginations: { page: fetcherDetail.page, limit: fetcherDetail.limit },
+          sortings: fetcherDetail.sorters
+        }
+      })
 
-        if (!response.errors) {
-          return response.data.locations.items || []
+      if (!response.errors) {
+        return {
+          records: response.data.locations.items || [],
+          total: response.data.locations.total || 0
         }
-      } catch (e) {
-        this._showToast({
-          level: 'error',
-          message: e
-        })
-      } finally {
-        this.dataGrist.hideSpinner()
       }
+    } catch (e) {
+      this._showToast({
+        level: 'error',
+        message: e
+      })
     }
   }
 
-  async _fetchLocationsByGroup(filters) {
-    const sorters = [{ name: 'name', desc: false }]
-
-    if (this.warehouseId) {
-      try {
-        this.dataGrist.showSpinner()
-
-        const response = await client.query({
-          query: gql`
-            query {
-              locationsByGroup(${gqlBuilder.buildArgs({
-                filters,
-                sortings: sorters
-              })}) {
-                items {
-                  name
-                  zone
-                  row
-                  column
-                }
-                total
+  async _fetchLocationsByGroup(filters, fetcherDetail) {
+    try {
+      const response = await client.query({
+        query: gql`
+          query locationsByGroup($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+            locationsByGroup(filters: $filters, pagination: $pagination, sortings: $sortings) {
+              items {
+                name
+                zone
+                row
+                column
+                type
               }
+              total
             }
-          `
-        })
+          }
+        `,
+        variables: {
+          filters,
+          paginations: { page: fetcherDetail.page, limit: fetcherDetail.limit },
+          sortings: fetcherDetail.sorters
+        }
+      })
 
-        if (!response.errors) {
-          return response.data.locationsByGroup.items || []
+      if (!response.errors) {
+        return {
+          records: response.data.locationsByGroup.items || [],
+          total: response.data.locationsByGroup.total || 0
         }
-      } catch (e) {
-        this._showToast({
-          level: 'error',
-          message: e
-        })
-      } finally {
-        this.dataGrist.hideSpinner()
       }
+    } catch (e) {
+      this._showToast({
+        level: 'error',
+        message: e
+      })
     }
   }
 
   _printLocations() {
-    if (this._records && this._records.length > 0) {
-      this.dispatchEvent(new CustomEvent(i18next.t('text.printing'), { detail: this._records }))
+    const records = this.dataGrist.data && this.dataGrist.data.records
+    if (records && records.length) {
+      this.dispatchEvent(new CustomEvent(i18next.t('text.printing'), { detail: records }))
       history.back()
     } else {
       this._showToast({

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

@@ -652,6 +652,12 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           var decodedHTML = atob(orderDocInfo[0].file)
           this._callPrintDialog(decodedHTML)
           break
+
+        default:
+          let url = new URL(window.location)
+
+          convertedPdfUrl = `${url.origin}/proxy?url=${encodeURIComponent(orderDocInfo[0].airwayBill)}`
+          this._callPrintDialog(convertedPdfUrl)
       }
     }
   }

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

@@ -401,7 +401,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     return {
                       ...record,
                       gtin: productDetail.gtin,
-                      productName: productDetail.name
+                      productName: product.name
                     }
                   })
                 } else {
@@ -442,7 +442,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                     return {
                       ...record,
                       gtin: productDetail.gtin,
-                      productName: productDetail.name
+                      productName: product.name
                     }
                   })
                 } else {
@@ -561,7 +561,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                       return {
                         ...record,
                         gtin: productDetail.gtin,
-                        productName: productDetail.name
+                        productName: product.name
                       }
                     })
                   } else {
@@ -601,7 +601,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                       return {
                         ...record,
                         gtin: productDetail.gtin,
-                        productName: productDetail.name
+                        productName: product.name
                       }
                     })
                   } else {
@@ -698,7 +698,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
                 return {
                   ...record,
                   gtin: productDetail.gtin,
-                  productName: productDetail.name
+                  productName: product.name
                 }
               })
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.8.10",
+  "version": "3.8.15",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -71,7 +71,7 @@
     "@things-factory/print-ui": "^3.8.0",
     "@things-factory/product-base": "^3.8.9",
     "@things-factory/resource-ui": "^3.8.0",
-    "@things-factory/sales-ui": "^3.8.10",
+    "@things-factory/sales-ui": "^3.8.12",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -102,11 +102,11 @@
     "@things-factory/system-ui": "^3.8.0",
     "@things-factory/transport-base": "^3.8.0",
     "@things-factory/tutorial-ui": "^3.8.0",
-    "@things-factory/warehouse-base": "^3.8.10",
-    "@things-factory/worksheet-base": "^3.8.10"
+    "@things-factory/warehouse-base": "^3.8.12",
+    "@things-factory/worksheet-base": "^3.8.12"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "94812199ec2098fe7f9ea7ad362399b09263ebf7"
+  "gitHead": "19c5659022fadb625ef251b09aea65ab70588ef9"
 }