@things-factory/operato-wms 4.1.30 → 5.0.0-alpha.3

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

@@ -10,7 +10,7 @@ import './select-product-batch'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
-import orderBy from 'lodash/orderBy'
+import orderBy from 'lodash-es/orderBy'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'

package/client/pages/inventory-check/create-cycle-count.js

@@ -16,8 +16,6 @@ import { isMobileDevice } from '@things-factory/utils'
 import { fetchLocationSortingRule } from '../../fetch-location-sorting-rule'
 import { LOCATION_SORTING_RULE } from '../constants'
 
-const _ = require('lodash')
-
 class CreateCycleCount extends localize(i18next)(PageView) {
   static get properties() {
     return {

package/client/pages/master/product/product-detail-bizplace-setting-popup.js

@@ -9,8 +9,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 export class ProductDetailBizplaceSettingPopup extends localize(i18next)(LitElement) {
   static get styles() {
     return [

package/client/pages/master/product/product-details-popup.js

@@ -3,6 +3,9 @@ import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
 import { css, html, LitElement } from 'lit-element'
+import isEmpty from 'lodash-es/isEmpty'
+import isNaN from 'lodash-es/isNaN'
+import isNumber from 'lodash-es/isNumber'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -10,8 +13,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 export class ProductDetailsPopup extends localize(i18next)(LitElement) {
   static get styles() {
     return [
@@ -555,20 +556,20 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
     let data = this.dataGrist._data.records.map(itm => {
       itm.error = false
 
-      if (_.isEmpty(itm.gtin) || '') {
+      if (isEmpty(itm.gtin) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'gtin')) errors.push({ type: 'gtin', value: 'GTIN is required' })
       }
-      if (_.isEmpty(itm.packingType) || '') {
+      if (isEmpty(itm.packingType) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'packingType'))
           errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
-      if (_.isEmpty(itm.uom) || '') {
+      if (isEmpty(itm.uom) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '') {
+      if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '') {
         itm.error = true
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
@@ -626,7 +627,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           ...this.dataGrist._data,
           records: this._updateRowOption(
             this.dataGrist._data.records.map((record, idx) => {
-              if (!_.isEmpty(record.childProductDetail) && record.childProductDetail == before) {
+              if (!isEmpty(record.childProductDetail) && record.childProductDetail == before) {
                 record.childProductDetail = after
               }
               return record
@@ -636,7 +637,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
         break
       case 'uomValue':
-        if (_.isNaN(after)) {
+        if (isNaN(after)) {
           updatedRecords.records[row].uomValue = 1
         }
         break
@@ -691,7 +692,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
                 value: ''
               },
               ...data
-                .filter(child => child.gtin != itm.gtin && !_.isEmpty(child.gtin))
+                .filter(child => child.gtin != itm.gtin && !isEmpty(child.gtin))
                 .map(x => {
                   const rowOption = {
                     display: x.gtin,

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

@@ -5,6 +5,9 @@ import './product-detail-bizplace-setting-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
+import isEmpty from 'lodash-es/isEmpty'
+import isNaN from 'lodash-es/isNaN'
+import isNumber from 'lodash-es/isNumber'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
@@ -14,8 +17,6 @@ import { client, CustomAlert, gqlContext, PageView } from '@things-factory/shell
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
-const _ = require('lodash')
-
 class ProductList extends localize(i18next)(PageView) {
   static get properties() {
     return {
@@ -821,7 +822,7 @@ class ProductList extends localize(i18next)(PageView) {
 
   async _saveProducts(patches) {
     try {
-      if (_.isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
+      if (isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
         return this.showToast(i18next.t('text.no_company_selected'))
       }
 
@@ -944,23 +945,23 @@ class ProductList extends localize(i18next)(PageView) {
   _validate(data) {
     let errors = []
     data = data.map(itm => {
-      if (_.isEmpty(itm.sku) || '') {
+      if (isEmpty(itm.sku) || '') {
         if (!errors.find(err => err.type == 'sku')) errors.push({ type: 'sku', value: 'Product SKU is required' })
       }
-      if (_.isEmpty(itm.name) || '') {
+      if (isEmpty(itm.name) || '') {
         if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'Product name is required' })
       }
-      if (_.isEmpty(itm.type) || '') {
+      if (isEmpty(itm.type) || '') {
         if (!errors.find(err => err.type == 'type')) errors.push({ type: 'name', value: 'Product type is required' })
       }
-      if (_.isEmpty(itm.packingType) || '') {
+      if (isEmpty(itm.packingType) || '') {
         if (!errors.find(err => err.type == 'packingType'))
           errors.push({ type: 'packingType', value: 'Packing type is required' })
       }
-      if (_.isEmpty(itm.uom) || '') {
+      if (isEmpty(itm.uom) || '') {
         if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
       }
-      if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
+      if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }

package/client/pages/order/release-order/b2b/b2b-order-list.js

@@ -1,13 +1,14 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../batch-generate-single-picking-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
-import { client, navigate, PageView, CustomAlert } from '@things-factory/shell'
+import { client, navigate, PageView } from '@things-factory/shell'
 import { openPopup } from '@things-factory/layout-base'
 import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
@@ -72,7 +73,7 @@ class B2bOrderList extends localize(i18next)(PageView) {
         },
         {
           title: i18next.t('button.generate_worksheet'),
-          action: this._generatePickingWorksheet.bind(this),
+          action: this._openBatchGenerateSinglePickingWorksheetPopup.bind(this),
           ...CommonButtonStyles.activate
         }
       )
@@ -221,7 +222,6 @@ class B2bOrderList extends localize(i18next)(PageView) {
       pagination: { limit: 100, pages: [20, 50, 100, 200, 500] },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
-        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'gutter',
           gutterName: 'button',
@@ -502,45 +502,22 @@ class B2bOrderList extends localize(i18next)(PageView) {
     )
   }
 
-  async _generatePickingWorksheet() {
-    try {
-      let releaseGoodNos = []
-      if (this.dataGrist.selected.length <= 0)
-        throw new Error(i18next.t('text.please_select_one_or_more_order_to_generate_worksheet'))
-
-      let readyToPick = this.dataGrist.selected.filter(itm => itm.status === ORDER_STATUS.PENDING_WORKSHEET.value)
-      releaseGoodNos = readyToPick.map(record => record.name)
-
-      if (releaseGoodNos.length <= 0)
-        throw new Error(i18next.t('text.selected_release_order(s)_has_existing_worksheet'))
-
-      let result = await CustomAlert({
-        title: i18next.t('title.are_you_sure'),
-        text: i18next.t('text.generate_worksheet'),
-        confirmButton: { text: i18next.t('button.submit') },
-        cancelButton: { text: i18next.t('button.cancel') }
-      })
-
-      if (!result.value) return
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation generateMultipleReleaseGoodWorksheet($releaseGoodNos: [String!]) {
-            generateMultipleReleaseGoodWorksheet(releaseGoodNos: $releaseGoodNos)
-          }
-        `,
-        variables: {
-          releaseGoodNos
-        }
-      })
-
-      if (!response.errors) {
-        navigate('single_outbound_worksheets')
-        this._showToast({ message: i18next.t('text.worksheet(s)_has_been_generated') })
+  _openBatchGenerateSinglePickingWorksheetPopup() {
+    openPopup(
+      html`
+        <batch-generate-single-picking-worksheet-popup
+          @generated="${() => {
+            this._showToast({ message: i18next.t('text.orders_has_been_activated') })
+            this.dataGrist.fetch()
+          }}"
+        ></batch-generate-single-picking-worksheet-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.generate_picking_worksheet')
       }
-    } catch (e) {
-      this._showToast(e)
-    }
+    )
   }
 
   _compareValues(key, order = 'asc') {

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -1,6 +1,7 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 import '../batch-picking-popup'
+import '../batch-generate-single-picking-worksheet-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -11,7 +12,7 @@ import { GhostPrint } from '@operato/ghost-print'
 import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
-import { client, navigate, PageView, store, CustomAlert } from '@things-factory/shell'
+import { client, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
@@ -90,7 +91,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
       },
       {
         title: i18next.t('button.generate_worksheet'),
-        action: this._generatePickingWorksheet.bind(this),
+        action: this._openBatchGenerateSinglePickingWorksheetPopup.bind(this),
         ...CommonButtonStyles.activate
       }
     ]
@@ -704,45 +705,22 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _generatePickingWorksheet() {
-    try {
-      let releaseGoodNos = []
-      if (this.dataGrist.selected.length <= 0)
-        throw new Error(i18next.t('text.please_select_one_or_more_order_to_generate_worksheet'))
-
-      let readyToPick = this.dataGrist.selected.filter(itm => itm.status === ORDER_STATUS.PENDING_WORKSHEET.value)
-      releaseGoodNos = readyToPick.map(record => record.name)
-
-      if (releaseGoodNos.length <= 0)
-        throw new Error(i18next.t('text.selected_release_order(s)_has_existing_worksheet'))
-
-      let result = await CustomAlert({
-        title: i18next.t('title.are_you_sure'),
-        text: i18next.t('text.generate_worksheet'),
-        confirmButton: { text: i18next.t('button.submit') },
-        cancelButton: { text: i18next.t('button.cancel') }
-      })
-
-      if (!result.value) return
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation generateMultipleReleaseGoodWorksheet($releaseGoodNos: [String!]) {
-            generateMultipleReleaseGoodWorksheet(releaseGoodNos: $releaseGoodNos)
-          }
-        `,
-        variables: {
-          releaseGoodNos
-        }
-      })
-
-      if (!response.errors) {
-        navigate('single_outbound_worksheets')
-        this._showToast({ message: i18next.t('text.worksheet(s)_has_been_generated') })
+  _openBatchGenerateSinglePickingWorksheetPopup() {
+    openPopup(
+      html`
+        <batch-generate-single-picking-worksheet-popup
+          @generated="${() => {
+            this._showToast({ message: i18next.t('text.orders_has_been_activated') })
+            this.dataGrist.fetch()
+          }}"
+        ></batch-generate-single-picking-worksheet-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.generate_picking_worksheet')
       }
-    } catch (e) {
-      this._showToast(e)
-    }
+    )
   }
 
   _compareValues(key, order = 'asc') {

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

@@ -35,8 +35,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       _productName: String,
       _logisticsInitiated: Boolean,
       _selectedTaskStatus: String,
-      _worksheetInfo: Object,
-      _scanning: Boolean
+      _worksheetInfo: Object
     }
   }
 
@@ -216,15 +215,19 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       </form>
 
       <form id="input-form" class="multi-column-form" @keypress="${this.packing.bind(this)}">
-        <fieldset>
-          ${this._enableProductScanning
-            ? html` <label>${i18next.t('label.product_barcode')}</label>
-                <barcode-scanable-input name="productBarcode" custom-input></barcode-scanable-input>`
-            : html`
-                <label>${i18next.t('label.packed_qty')}</label>
-                <input type="number" min="1" name="packedQty" />
-              `}
-        </fieldset>
+        ${this.scannable
+          ? html`
+              <fieldset>
+                ${this._enableProductScanning
+                  ? html` <label>${i18next.t('label.product_barcode')}</label>
+                      <barcode-scanable-input name="productBarcode" custom-input></barcode-scanable-input>`
+                  : html`
+                      <label>${i18next.t('label.packed_qty')}</label>
+                      <input type="number" min="1" name="packedQty" />
+                    `}
+              </fieldset>
+            `
+          : ''}
       </form>
 
       <data-grist .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.config} .data=${this.data}>
@@ -253,7 +256,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     this._productName = ''
     this._selectedOrderInventory = null
     this._selectedTaskStatus = null
-    this._scanning = false
   }
 
   updated(changedProps) {
@@ -272,8 +274,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               this._selectedOrderInventory = record
               this._selectedTaskStatus = record.status
 
-              if (this._enableProductScanning) this._focusOnProductBarcodeInput()
-              else this._focusOnReleaseQtyInput()
+              if (this.scannable) {
+                if (this._enableProductScanning) this._focusOnProductBarcodeInput()
+                else this._focusOnReleaseQtyInput()
+              }
             }
           }
         }
@@ -386,13 +390,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
               product {
                 name
                 description
-                gtin
-                productDetails {
-                  id
-                  packingType
-                  packingSize
-                  gtin
-                }
               }
               qty
               releaseQty
@@ -426,10 +423,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       if (!response.data?.packingWorksheet) return
 
       const { worksheetInfo, worksheetDetailInfos } = response.data.packingWorksheet
-      this.data = { records: this.formatWorksheetDetailInfos(worksheetDetailInfos) }
-      if (this.data?.records?.length && !this.data.records.some(record => record.completed == false)) {
-        return this._completeHandler()
-      }
 
       this.trackingNo = worksheetInfo.trackingNo
       this.airwayBill = worksheetInfo.airwayBill
@@ -442,6 +435,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       this._bizplaceName = worksheetInfo.bizplaceName
       this._worksheetInfo = worksheetInfo
 
+      this.data = { records: this.formatWorksheetDetailInfos(worksheetDetailInfos) }
       if (this._selectedOrderInventory) {
         const record = this.data.records.find(record => record.name === this._selectedOrderInventory.name)
         if (record.packedQty == record.releaseQty) {
@@ -453,11 +447,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
       this._enableProductScanning = await fetchSettingRule('enable-product-scanning', worksheetInfo.partnerDomainId)
 
-      if (this._enableProductScanning) {
-        this._focusOnProductBarcodeInput()
-      } else {
-        this._focusOnReleaseQtyInput()
-      }
       this.updateContext()
     }
   }
@@ -620,7 +609,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     if (e.keyCode === 13) {
       e.preventDefault()
       try {
-        await this._validatePacking()
+        this._validatePacking()
 
         let response
         if (this._enableProductScanning) response = await this.productBarcodePacking()
@@ -629,9 +618,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
         if (!response.errors) {
           if (this._enableProductScanning) {
             this.productBarcodeInput.value = ''
-            this._selectedOrderInventory = null
+            this._focusOnProductBarcodeInput()
           } else {
             this.releaseQtyInput.value = ''
+            this._focusOnReleaseQtyInput()
             this._selectedTaskStatus = null
             this._selectedOrderInventory = null
           }
@@ -639,25 +629,12 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           this._fetchInventories(this.releaseGoodNo)
         }
       } catch (e) {
-        if (this._enableProductScanning) {
-          this.productBarcodeInput.value = ''
-          this._focusOnProductBarcodeInput()
-        } else {
-          this.releaseQtyInput.value = ''
-          this._focusOnReleaseQtyInput()
-          this._selectedTaskStatus = null
-        }
-        this._selectedOrderInventory = null
         this._showToast(e)
-      } finally {
-        this._scanning = false
       }
     }
   }
 
   async productBarcodePacking() {
-    if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
-    this._scanning = true
     return await client.mutate({
       mutation: gql`
         mutation scanProductPacking($worksheetDetailName: String!, $productBarcode: String!) {
@@ -672,8 +649,6 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async commonPacking() {
-    if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
-    this._scanning = true
     return await client.mutate({
       mutation: gql`
         mutation packing($worksheetDetailName: String!, $releaseQty: Int!) {
@@ -689,45 +664,28 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async _validatePacking() {
     // validate for order selection
-    if (this._enableProductScanning) {
-      //if no input
-      if (!this.productBarcodeInput.value) {
-        this._focusOnProductBarcodeInput()
-        throw new Error(i18next.t('text.no_product_barcode_detected'))
-      }
-
-      //find product match with input barcode
-      const foundOrderInventory = this.data.records.filter(itm =>
-        itm.product.productDetails.filter(
-          detail =>
-            detail.gtin === this.productBarcodeInput.value.trim() &&
-            detail.packingType == itm.product.packingType &&
-            detail.packingSize == itm.product.packingSize
-        )
-      )
+    if (!this._selectedOrderInventory) throw new Error(i18next.t('text.target_is_not_selected'))
 
-      if (foundOrderInventory?.length > 0 && foundOrderInventory[0]?.status === WORKSHEET_STATUS.EXECUTING.value) {
-        this._selectedOrderInventory = foundOrderInventory[0]
-      } else if (foundOrderInventory?.length == 1 && foundOrderInventory[0]?.status === WORKSHEET_STATUS.DONE.value) {
-        throw new Error(i18next.t('text.scanned_product_status_is_done'))
+    if (this._selectedOrderInventory) {
+      if (this._enableProductScanning) {
+        if (!this.productBarcodeInput.value) {
+          this._focusOnProductBarcodeInput()
+          throw new Error(i18next.t('text.no_product_barcode_detected'))
+        }
       } else {
-        throw new Error(i18next.t('text.incorrect_product_barcode'))
-      }
-    } else {
-      if (!this._selectedOrderInventory) throw new Error(i18next.t('text.target_is_not_selected'))
-
-      if (!this.releaseQtyInput.checkValidity()) throw new Error(i18next.t('text.release_qty_invalid'))
+        if (!this.releaseQtyInput.checkValidity()) throw new Error(i18next.t('text.release_qty_invalid'))
 
-      // Release qty existing
-      if (!parseInt(this.releaseQtyInput.value)) {
-        this._focusOnReleaseQtyInput()
-        throw new Error(i18next.t('text.release_qty_is_empty'))
-      }
+        // Release qty existing
+        if (!parseInt(this.releaseQtyInput.value)) {
+          this._focusOnReleaseQtyInput()
+          throw new Error(i18next.t('text.release_qty_is_empty'))
+        }
 
-      // typed qty should be matched with release qty.
-      if (parseInt(this.releaseQtyInput.value) !== this._selectedOrderInventory.releaseQty) {
-        this._focusOnReleaseQtyInput()
-        throw new Error(i18next.t('text.wrong_release_qty'))
+        // typed qty should be matched with release qty.
+        if (parseInt(this.releaseQtyInput.value) !== this._selectedOrderInventory.releaseQty) {
+          this._focusOnReleaseQtyInput()
+          throw new Error(i18next.t('text.wrong_release_qty'))
+        }
       }
     }
   }

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

@@ -6,7 +6,7 @@ import './select-operator-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
-import orderBy from 'lodash/orderBy'
+import orderBy from 'lodash-es/orderBy'
 
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'