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

package/client/pages/inbound/undo-unload-popup.js

@@ -12,8 +12,7 @@ import { isMobileDevice } from '@things-factory/utils'
 class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
   static get properties() {
     return {
-      _autoSelectInventoryIds: Array,
-      _selectedInventoryIds: Array,
+      _selectedRecords: Array,
       config: Object,
       data: Object,
       enableCartonLabel: Boolean,
@@ -26,8 +25,7 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
 
   constructor() {
     super()
-    this._selectedInventoryIds = []
-    this._autoSelectInventoryIds = []
+    this._selectedRecords = []
   }
 
   static get styles() {
@@ -96,13 +94,21 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
 
   render() {
     return html`
-      <form id="input-form" class="single-column-form" @keypress="${this._populateTargetedInventory.bind(this)}">
+      <form id="input-form" class="single-column-form">
         <fieldset>
           ${this.enableCartonLabel
             ? html`<label>${i18next.t('label.carton_id')}</label>
-                <barcode-scanable-input name="cartonId" without-enter custom-input></barcode-scanable-input>`
+                <barcode-scanable-input
+                  name="cartonId"
+                  custom-input
+                  @keypress="${this._populateTargetedInventory.bind(this)}"
+                ></barcode-scanable-input>`
             : html`<label>${i18next.t('label.lot_id')}</label>
-                <barcode-scanable-input name="lotId" without-enter custom-input></barcode-scanable-input>`}
+                <barcode-scanable-input
+                  name="lotId"
+                  custom-input
+                  @keypress="${this._populateTargetedInventory.bind(this)}"
+                ></barcode-scanable-input>`}
         </fieldset>
       </form>
 
@@ -112,6 +118,7 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
           .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
           .config=${this.config}
           .data="${this.data}"
+          .selectedRecords=${this._selectedRecords}
         ></data-grist>
       </div>
 
@@ -125,7 +132,9 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
     this.config = {
       pagination: { infinite: true },
       rows: { selectable: { multiple: true }, appendable: false },
-      list: { fields: ['palletId', 'cartonId', 'batchId', 'product', 'packingType', 'packingSize', 'qty', 'status'] },
+      list: {
+        fields: ['palletId', 'cartonId', 'batchId', 'sku', 'product', 'packingType', 'packingSize', 'qty', 'status']
+      },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
@@ -151,6 +160,13 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
           header: i18next.t('field.batch_id'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'sku',
+          label: true,
+          header: i18next.t('field.sku'),
+          width: 120
+        },
         {
           type: 'object',
           name: 'product',
@@ -199,11 +215,8 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
   async _undoUnloading() {
     try {
       let selectedInventoryIds = []
-      if (this._autoSelectInventoryIds?.length) {
-        selectedInventoryIds = this._autoSelectInventoryIds
-      } else {
-        selectedInventoryIds = this.dataGrist.selected.map(inventory => inventory.id)
-      }
+      selectedInventoryIds = this.dataGrist.selected.map(inventory => inventory.id)
+
       if (!selectedInventoryIds?.length) throw new Error(i18next.t('text.select_at_least_one_inventory_to_undo'))
 
       this._validateScanInventory()
@@ -226,9 +239,9 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
   }
 
   _populateTargetedInventory(e) {
-    if (e.keyCode === 13) {
-      e.preventDefault()
-
+    if (e.keyCode !== 13) return
+    e.preventDefault()
+    try {
       let targetedUndoInventories = []
 
       if (this.enableCartonLabel) {
@@ -248,13 +261,16 @@ class UndoUnloadPopup extends connect(store)(localize(i18next)(LitElement)) {
           this.lotInput.value = ''
         }
         this._showToast({ message: i18next.t('text.no_matching_unloaded_inventory_found') })
-      } else if (targetedUndoInventories?.length == 1) {
-        this.data = { records: targetedUndoInventories }
-        this._autoSelectInventoryIds = targetedUndoInventories.map(inventory => inventory.id)
-        this._undoUnloading()
       } else {
-        this.data = { records: targetedUndoInventories }
+        this.data = {
+          records: targetedUndoInventories.map(itm => {
+            return { ...itm, sku: itm.product.sku }
+          })
+        }
+        this._selectedRecords = targetedUndoInventories?.length == 1 ? targetedUndoInventories : []
       }
+    } catch (e) {
+      this._showToast(e)
     }
   }
 

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

@@ -35,7 +35,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       _enableProductScanning: Boolean,
       _expirationPeriod: Number,
       _enableCartonLabel: Boolean,
-      _enableInputQty: Boolean,
+      _enableInputQty: Number,
       _isLooseItem: Boolean,
       _isQtyChecked: Boolean,
       _isRequiredCheckExpiry: Boolean,
@@ -274,7 +274,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 <barcode-scanable-input name="productBarcode" without-enter custom-input></barcode-scanable-input>
               `
             : ''}
-          ${this._enableInputQty && !this._isRequireSerialNumberScanningInbound
+          ${this._enableInputQty >= 0 && this._enableInputQty < 4 && !this._isRequireSerialNumberScanningInbound
             ? html`
                 <label>${i18next.t('label.actual_qty')}</label>
                 <input name="qty" type="number" min="1" />
@@ -322,7 +322,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     this._worksheetLoaded = false
     this._usingReusablePallet = false
     this._enableCartonLabel = false
-    this._enableInputQty = true
+    this._enableInputQty = 0
     this._enableProductScanning = false
     this._expirationPeriod = 0
     this._isLooseItem = false
@@ -644,11 +644,24 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           records: worksheetDetailInfo
         }
 
-        if (!this._selectedOrderProduct) {
-          this._selectedOrderProduct = worksheetDetailInfo[0]
-          this._isRequiredCheckExpiry = worksheetDetailInfo[0].product?.isRequiredCheckExpiry
-          this._isRequireSerialNumberScanningInbound =
-            worksheetDetailInfo[0].product?.isRequireSerialNumberScanningInbound
+        if (this._selectedOrderProduct) {
+          let quantityTally = worksheetDetailInfo.filter(
+            itm => itm.id == this._selectedOrderProduct.id && itm.actualPackQty == itm.packQty
+          )
+          if (quantityTally?.length == 1) {
+            this._selectedOrderProduct = null
+            if (this._isRequireSerialNumberScanningInbound) {
+              this.serialNumberInput.value = ''
+              if (this._enableCartonLabel) {
+                this.cartonInput.value = ''
+                this.productBarcodeInput.value = ''
+                this._focusOnCartonInput()
+              } else {
+                this.lotInput.value = ''
+                this._focusOnLotInput()
+              }
+            }
+          }
         }
 
         const partnerDomainId = worksheetInfo.partnerDomainId
@@ -656,7 +669,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         this._enableProductScanning = await fetchSettingRule('enable-product-scanning', partnerDomainId)
         this._enableCartonLabel = await fetchSettingRule('enable-carton-label', partnerDomainId)
         if (this._enableProductScanning)
-          this._enableInputQty = await fetchSettingRule('enable-input-qty', partnerDomainId)
+          this._enableInputQty = parseInt(await fetchSettingRule('enable-input-qty', partnerDomainId))
 
         this._fetchInventories()
       }
@@ -803,23 +816,29 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
     if (this._enableCartonLabel) {
       if (this._isRequireSerialNumberScanningInbound) {
-        this.serialNumberInput.value = ''
-        this._focusOnSerialNumberInput()
+        if (this.cartonInput.value == '') {
+          this._focusOnCartonInput()
+        } else {
+          this.serialNumberInput.value = ''
+          this._focusOnSerialNumberInput()
+        }
       } else {
-        if (this._enableInputQty) {
+        if (this._enableInputQty >= 0 && this._enableInputQty < 4) {
           this.actualQtyInput.value = ''
-          this.cartonInput.value = ''
-          this._focusOnCartonInput()
         }
+        this.cartonInput.value = ''
+        this._focusOnCartonInput()
       }
     } else {
-      if (this._isRequireSerialNumberScanningInbound) {
-        this.serialNumberInput.value = ''
-        this._focusOnSerialNumberInput()
-      } else {
-        this.lotInput.value = ''
-        if (this._enableInputQty) this.actualQtyInput.value = ''
-        this._focusOnLotInput()
+      if (this.lotInput.value !== '') {
+        if (this._isRequireSerialNumberScanningInbound) {
+          this.serialNumberInput.value = ''
+          this._focusOnSerialNumberInput()
+        } else {
+          this.lotInput.value = ''
+          if (this._enableInputQty >= 0 && this._enableInputQty < 4) this.actualQtyInput.value = ''
+          this._focusOnLotInput()
+        }
       }
     }
 
@@ -847,14 +866,18 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     e.preventDefault()
     try {
       if (!this._enableCartonLabel) return this._unloadSelected()
-      await this._validateUnloading()
-
-      if (this._isRequireSerialNumberScanningInbound) {
-        return this._scanSerialNumberUnload()
+      let orderProducts = await this._validateUnloading()
+      if (orderProducts?.length > 1) {
+        this.selectOrderProduct(orderProducts)
       } else {
-        if (!(this._enableProductScanning && !this._enableInputQty)) return this._qtyUnload()
+        if (this._isRequireSerialNumberScanningInbound) {
+          return this._scanSerialNumberUnload()
+        } else {
+          if (!(this._enableProductScanning && (this._enableInputQty < 0 || this._enableInputQty > 3)))
+            return this._qtyUnload()
+        }
+        this._scanProductUnload()
       }
-      this._scanProductUnload()
     } catch (e) {
       this._showToast(e)
     }
@@ -890,7 +913,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           inventory: {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this.expDateInput?.value ? this.expDateInput.value : null
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null
           }
         }
       })
@@ -917,6 +940,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
     if (this.serialNumberInput.value == '') {
       this._scanning = false
+      this._focusOnSerialNumberInput()
       return this._showToast({ message: i18next.t('text.enter_serial_number') })
     }
 
@@ -946,7 +970,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           inventory: {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this.expDateInput?.value ? this.expDateInput.value : null
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null
           }
         }
       })
@@ -1044,6 +1068,37 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     })
   }
 
+  async fetchProductDetails(gtin) {
+    return await client.query({
+      query: gql`
+        query checkGtin($gtin: String!, $customerCompanyDomainId: String!) {
+          checkGtin(gtin: $gtin, customerCompanyDomainId: $customerCompanyDomainId) {
+            items {
+              id
+              name
+              packingType
+              packingSize
+              gtin
+              product {
+                id
+                name
+                sku
+                isRequiredCheckExpiry
+                isRequireSerialNumberScanningInbound
+                expirationPeriod
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        gtin,
+        customerCompanyDomainId: this.customerCompanyDomainId
+      }
+    })
+  }
+
   //need to enhance
   async _checkedLotScannedProduct() {
     const response = await this.fetchProductDetail('', this._selectedOrderProduct.product.id)
@@ -1054,23 +1109,28 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async _checkedScannedProduct() {
     try {
-      const response = await this.fetchProductDetail(this.productBarcodeInput?.value || '', '')
+      //fetch any product details that has entered gtin
+      const response = await this.fetchProductDetails(this.productBarcodeInput?.value || '', '')
 
       if (!response.errors) {
-        const { product, packingSize, packingType } = response.data.productDetail
-        const foundOrderProducts = this.orderProductData.records.filter(
-          orderProduct =>
-            orderProduct.product.id === product.id &&
-            orderProduct.packingType === packingType &&
-            orderProduct.packingSize === packingSize
-        )
-        const foundParentProducts = this.orderProductData.records.filter(
-          orderProduct => orderProduct.product.id === product.id
-        )
+        let orderProductData = this.orderProductData.records
+        let checkedProductDetails = response.data.checkGtin.items
+
+        //check from grist if any is matched
+        const foundOrderProducts = orderProductData.filter(op => {
+          return checkedProductDetails.some(
+            itm =>
+              itm.product.id == op.product.id && itm.packingType == op.packingType && itm.packingSize == op.packingSize
+          )
+        })
+
+        const foundParentProducts = orderProductData.filter(op => {
+          return checkedProductDetails.some(itm => itm.product.id == op.product.id)
+        })
 
         if (!foundOrderProducts?.length) {
           if (!foundParentProducts?.length) {
-            if (this._enableInputQty && !this._isRequireSerialNumberScanningInbound) {
+            if (this._enableInputQty >= 0 && this._enableInputQty < 4 && !this._isRequireSerialNumberScanningInbound) {
               if (this.actualQtyInput?.value) this.actualQtyInput.value = ''
             }
 
@@ -1083,21 +1143,35 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.no_matching_product_found'))
           }
         }
-        this._expirationPeriod = product.expirationPeriod
-        this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
-        this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
+
+        const product =
+          foundOrderProducts?.length >= 1
+            ? foundOrderProducts[0].product
+            : foundOrderProducts?.length == 0 && foundParentProducts?.length > 0
+            ? foundParentProducts[0].product
+            : null
 
         if (this._selectedOrderProduct && this._selectedOrderProduct.product.sku !== product.sku)
           this._selectedOrderProduct = null
 
-        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]
+        if (foundOrderProducts?.length > 1) {
+          if (this._isRequireSerialNumberScanningInbound) {
+            if (!this._selectedOrderProduct) {
+              return foundOrderProducts
+            }
+          } else {
+            return foundOrderProducts
           }
+        } else if (foundOrderProducts?.length == 1) {
+          this._expirationPeriod = product.expirationPeriod
+          this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
+          this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
+          this._selectedOrderProduct = foundOrderProducts[0]
+        } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length > 0) {
+          this._expirationPeriod = product.expirationPeriod
+          this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
+          this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
+          this._selectedOrderProduct = foundParentProducts[0]
         }
       }
     } catch (e) {
@@ -1112,14 +1186,22 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           .orderProducts="${orderProducts}"
           @selected-batch="${async e => {
             this._selectedOrderProduct = e.detail
-
+            this._expirationPeriod = this._selectedOrderProduct.product.expirationPeriod
+            this._isRequiredCheckExpiry = this._selectedOrderProduct.product.isRequiredCheckExpiry
+            this._isRequireSerialNumberScanningInbound =
+              this._selectedOrderProduct.product.isRequireSerialNumberScanningInbound
             if (e.detail.product.isRequireSerialNumberScanningInbound) {
+              this._isRequireSerialNumberScanningInbound = true
+              if (!this.serialNumberInput.value) {
+                this._focusOnSerialNumberInput()
+                this._showToast(Error(i18next.t('text.serial_number_is_empty')))
+              }
               await this._scanSerialNumberUnload()
             } else {
-              if (this._enableProductScanning && !this._enableInputQty) {
+              if (this._enableProductScanning && (this._enableInputQty < 0 || this._enableInputQty > 3)) {
                 await this._scanProductUnload()
               } else {
-                this._focusOnActualQtyInput()
+                await this._qtyUnload()
               }
             }
           }}"
@@ -1182,9 +1264,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         throw new Error(i18next.t('text.scan_product_barcode'))
       }
 
-      await this._checkedScannedProduct()
+      let orderProducts = await this._checkedScannedProduct()
 
-      if (this._enableInputQty && !this._isRequireSerialNumberScanningInbound) {
+      if (this._enableInputQty >= 0 && this._enableInputQty < 4 && !this._isRequireSerialNumberScanningInbound) {
         if (!parseInt(this.actualQtyInput.value)) {
           this._focusOnActualQtyInput()
           throw new Error(i18next.t('text.enter_qty'))
@@ -1195,9 +1277,11 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           throw new Error(i18next.t('text.qty_should_be_positive'))
         }
       } else if (this._isRequireSerialNumberScanningInbound) {
-        if (!this.serialNumberInput.value) {
-          this._focusOnSerialNumberInput()
-          throw new Error(i18next.t('text.enter_serial_number'))
+        if (this.serialNumberInput) {
+          if (!this.serialNumberInput.value) {
+            this._focusOnSerialNumberInput()
+            throw new Error(i18next.t('text.enter_serial_number'))
+          }
         }
       }
 
@@ -1207,6 +1291,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           throw new Error(i18next.t('text.expiry_date_is_empty'))
         }
       }
+
+      if (orderProducts?.length > 1) {
+        return orderProducts
+      }
     }
   }
 

package/client/pages/inbound/worksheet-putaway.js

@@ -485,7 +485,7 @@ class WorksheetPutaway extends localize(i18next)(PageView) {
     const currentLocationColumn = {
       type: 'object',
       name: 'location',
-      header: i18next.t('field.current_location'),
+      header: i18next.t('field.location'),
       width: 170
     }
     const statusColumnConfig = {

package/client/pages/inbound/worksheet-unloading.js

@@ -17,7 +17,7 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice, sleep } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../fetch-setting-value'
 import {
@@ -253,7 +253,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
       // await this.fetchVas()
       // await this.fetchOrderVas()
       this.updateContext()
-      this._updateGristConfig()
+      await this._updateGristConfig()
     }
   }
 
@@ -435,6 +435,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
         }
       ]
     }
+    this.config = this.preConfig
   }
 
   updated(changedProps) {
@@ -723,7 +724,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
     })
   }
 
-  _updateGristConfig() {
+  async _updateGristConfig() {
     const statusColumnConfig = {
       type: 'string',
       name: 'status',
@@ -886,7 +887,7 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
 
         await this.fetchWorksheet()
         this.updateContext()
-        this._updateGristConfig()
+        await this._updateGristConfig()
       }
     } catch (e) {
       this._showToast(e)
@@ -935,7 +936,8 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
     })
   }
 
-  _openLotLabelPrintPopup() {
+  async _openLotLabelPrintPopup() {
+    await sleep(1010)
     const _pallets = {
       records: this.data.records.map(record => {
         return {
@@ -957,7 +959,8 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
     })
   }
 
-  _openCartonLabelPrintPopup() {
+  async _openCartonLabelPrintPopup() {
+    await sleep(1010)
     openPopup(html` <carton-label-popup .bizplaceName="${this._bizplace}"></carton-label-popup> `, {
       backdrop: true,
       size: 'small',
@@ -965,7 +968,8 @@ class WorksheetUnloading extends localize(i18next)(PageView) {
     })
   }
 
-  _showPutawayWorksheetPopup() {
+  async _showPutawayWorksheetPopup() {
+    await sleep(1010)
     openPopup(
       html`
         <putaway-worksheet-generate-popup