@things-factory/operato-wms 4.3.761 → 4.3.764

package/client/pages/outbound/loading-v2/loading-execution-base.js

@@ -448,19 +448,58 @@ export class LoadingExecutionBase extends LitElement {
         throw new Error(i18next.t('text.no_release_order_selected'))
       }
 
+      // Query for minimum seal number setting
+      let minimumSealNumber = 0
+      try {
+        const validationResponse = await client.query({
+          query: VALIDATE_QC_SEALS,
+          variables: { releaseGoodNo: orderNo },
+          context: gqlContext()
+        })
+
+        if (!validationResponse.errors && validationResponse.data?.validateQcSeals) {
+          minimumSealNumber = validationResponse.data.validateQcSeals.minimumSealNumber || 0
+        }
+      } catch (err) {
+        // If query fails, default to 0 (don't block tote scanning)
+        console.warn('Failed to fetch minimum seal number:', err)
+      }
+
       openPopup(
         html`
           <tote-popup
             .orderNo="${orderNo}"
             .toteNo="${this.toteNo}"
             .bizplace="${bizplace}"
+            .minimumSealNumber="${minimumSealNumber}"
             @completed="${async e => {
               this.toteNo = e.detail
               // Check seal status after tote is sealed (may have changed)
               await this._checkAndUpdateSealStatus()
+
+              // Refresh data for both QC and LOADING tabs to reflect any undone items
+              // Use the same logic as validateSorting to determine which order/bin to refresh
+              const orderNoForRefresh = this.worksheet?.isReleaseGoodScan
+                ? this.worksheet?.releaseGood?.name
+                : this._useQcSku
+                ? this.worksheet?.binLocationName
+                : this.worksheet?.releaseGood?.name
+              const useQcSkuForRefresh = this._useQcSku && !this.worksheet?.isReleaseGoodScan
+
+              const [qcData, loadingData] = await Promise.all([
+                this.fetchData(orderNoForRefresh, 'qc', useQcSkuForRefresh),
+                this.fetchData(orderNoForRefresh, 'loading', useQcSkuForRefresh)
+              ])
+
+              // QC tab: items that still need QC (sortedQty < pickedQty)
+              this.qcData = qcData.filter(data => data?.sortedQty < data?.pickedQty) || []
+              // Loading tab: items that have completed QC (sortedQty >= pickedQty) and are not yet loaded
+              this.loadingData =
+                loadingData.filter(data => data?.sortedQty >= data?.pickedQty && data.status != WORKSHEET_STATUS.DONE.value) || []
+
               // Update button visibility after sealing (Tote button may need to be hidden if sealing is complete)
               this.getButton()
-              // Update QC banner state after tote is sealed
+              // Update QC banner state after data is refreshed
               if (this._updateQcBannerState) {
                 await this._updateQcBannerState()
               }

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

@@ -33,6 +33,17 @@ import {
 } from '../constants'
 
 const PICKING_TYPES = { PICKING, BATCH_PICKING }
+
+const VALIDATE_QC_SEALS = gql`
+  query validateQcSeals($releaseGoodNo: String!) {
+    validateQcSeals(releaseGoodNo: $releaseGoodNo) {
+      valid
+      error
+      minimumSealNumber
+    }
+  }
+`
+
 class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
@@ -976,14 +987,37 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async openTotePopup() {
     await sleep(1010)
+
+    // Query for minimum seal number setting
+    let minimumSealNumber = 0
+    try {
+      const validationResponse = await client.query({
+        query: VALIDATE_QC_SEALS,
+        variables: { releaseGoodNo: this.releaseGoodNo },
+        context: gqlContext()
+      })
+
+      if (!validationResponse.errors && validationResponse.data?.validateQcSeals) {
+        minimumSealNumber = validationResponse.data.validateQcSeals.minimumSealNumber || 0
+      }
+    } catch (err) {
+      // If query fails, default to 0 (don't block tote scanning)
+      console.warn('Failed to fetch minimum seal number:', err)
+    }
+
     openPopup(
       html`
         <tote-popup
           .orderNo="${this.releaseGoodNo}"
           .toteNo="${this.toteNo}"
           .bizplace="${this._bizplaceName}"
+          .minimumSealNumber="${minimumSealNumber}"
           @completed="${async e => {
             this.toteNo = e.detail
+            // Refresh the item list to reflect any undone items
+            await this.fetchInventories(
+              this.refPickingType === PICKING_TYPES.PICKING.value ? this.releaseGoodNo : this.taskNo
+            )
           }}"
         ></tote-popup>
       `,

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

@@ -21,6 +21,16 @@ import { fetchSettingRule } from '../../fetch-setting-value'
 import { WORKSHEET_STATUS } from '../constants'
 import { decodeQR, fetchPageSettings, isValidHttpUrl } from '../../util'
 
+const VALIDATE_QC_SEALS = gql`
+  query validateQcSeals($releaseGoodNo: String!) {
+    validateQcSeals(releaseGoodNo: $releaseGoodNo) {
+      valid
+      error
+      minimumSealNumber
+    }
+  }
+`
+
 class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
     return {
@@ -515,14 +525,34 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async _openTotePopup() {
     await sleep(1010)
+
+    // Query for minimum seal number setting
+    let minimumSealNumber = 0
+    try {
+      const validationResponse = await client.query({
+        query: VALIDATE_QC_SEALS,
+        variables: { releaseGoodNo: this._selectedReleaseGood }
+      })
+
+      if (!validationResponse.errors && validationResponse.data?.validateQcSeals) {
+        minimumSealNumber = validationResponse.data.validateQcSeals.minimumSealNumber || 0
+      }
+    } catch (err) {
+      // If query fails, default to 0 (don't block tote scanning)
+      console.warn('Failed to fetch minimum seal number:', err)
+    }
+
     openPopup(
       html`
         <tote-popup
           .orderNo="${this._selectedReleaseGood}"
           .toteNo="${this.toteNo}"
           .bizplace="${this.bizplaceName}"
+          .minimumSealNumber="${minimumSealNumber}"
           @completed="${async e => {
             this.toteNo = e.detail
+            // Refresh the item list to reflect any undone items
+            await this._fetchItemList(this._selectedReleaseGood)
           }}"
         ></tote-popup>
       `,

package/client/pages/outbound/tote-popup.js

@@ -6,7 +6,7 @@ import { css, html, LitElement } from 'lit-element'
 
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
-import { client } from '@things-factory/shell'
+import { client, CustomAlert } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 import { TOTE_STATUS } from '../constants'
@@ -20,6 +20,7 @@ class TotePopup extends localize(i18next)(LitElement) {
       data: Object,
       orderNo: String,
       toteNo: String,
+      minimumSealNumber: Number,
       _totalSeal: Number,
       _selectedToteNo: String,
       _toteNoList: Object,
@@ -76,11 +77,26 @@ class TotePopup extends localize(i18next)(LitElement) {
         .break {
           word-wrap: break-word;
         }
+        .mobile-hint {
+          padding: 10px;
+          background-color: var(--primary-light-color, #f0f0f0);
+          border-left: 4px solid var(--primary-color, #2196f3);
+          margin: 10px;
+          font-size: 0.9em;
+        }
+        .refresh-button {
+          margin: 10px;
+          display: flex;
+          justify-content: center;
+        }
       `
     ]
   }
 
   render() {
+    const shouldShowSealSection = this._shouldShowSealSection()
+    const sealInputDisabled = !this.toteNo || this.toteNo === ''
+
     return html`
       <form class="multi-column-form">
         <fieldset>
@@ -121,34 +137,46 @@ class TotePopup extends localize(i18next)(LitElement) {
         </fieldset>
       </form>
 
-      <form class="multi-column-form">
-        <fieldset>
-          <label>${i18next.t('field.seal_no')}</label>
-          <barcode-scanable-input
-            name="sealNo"
-            custom-input
-            @keypress="${e => {
-              if (e.keyCode === 13) {
-                e.preventDefault()
-                this.sealNo = this.sealNoInput.value
-                if (this.toteNo) {
-                  this._sealTote()
-                } else {
-                  this._showToast({ message: i18next.t('text.tote_is_not_scanned') })
-                }
-              }
-            }}"
-          ></barcode-scanable-input>
-        </fieldset>
-
-        <label>${i18next.t('field.scanned')} (${this._totalSeal || 0})</label>
-        <select name="sealNoList">
-          <option value="">-- ${i18next.t('text.seal_number')} --</option>
-          ${(this._sealNoList?.orderToteSeals || []).map(
-            list => html` <option value="${list.name}">${list.name}</option> `
-          )}
-        </select>
-      </form>
+      ${shouldShowSealSection
+        ? html`
+            <form class="multi-column-form">
+              <fieldset>
+                <label>${i18next.t('field.seal_no')}</label>
+                <barcode-scanable-input
+                  name="sealNo"
+                  custom-input
+                  ?disabled="${sealInputDisabled}"
+                  @keypress="${e => {
+                    if (e.keyCode === 13) {
+                      e.preventDefault()
+                      this.sealNo = this.sealNoInput.value
+                      if (this.toteNo) {
+                        this._sealTote()
+                      } else {
+                        this._showToast({ message: i18next.t('text.tote_is_not_scanned') })
+                      }
+                    }
+                  }}"
+                ></barcode-scanable-input>
+              </fieldset>
+
+              <label>${i18next.t('field.scanned')} (${this._totalSeal || 0})</label>
+              <select name="sealNoList">
+                <option value="">-- ${i18next.t('text.seal_number')} --</option>
+                ${(this._sealNoList?.orderToteSeals || []).map(
+                  list => html` <option value="${list.name}">${list.name}</option> `
+                )}
+              </select>
+            </form>
+          `
+        : ''}
+      ${isMobileDevice() && this._selectedToteNo?.length > 0
+        ? html`
+            <div class="mobile-hint">
+              ${i18next.t('text.viewing_items_in_tote')}: <strong>${this._selectedToteNo[0].name}</strong>
+            </div>
+          `
+        : ''}
 
       <div class="grist-container">
         <div class="grist">
@@ -161,9 +189,35 @@ class TotePopup extends localize(i18next)(LitElement) {
         </div>
       </div>
 
+      ${isMobileDevice()
+        ? html`
+            <div class="refresh-button">
+              <mwc-button
+                icon="refresh"
+                @click=${async () => {
+                  if (this.grist) {
+                    await this.grist.fetch()
+                    this._showToast({ type: 'info', message: i18next.t('text.list_refreshed') })
+                  }
+                }}
+                label="${i18next.t('button.refresh')}"
+              ></mwc-button>
+            </div>
+          `
+        : ''}
+
       <div class="button-container">
+        ${this._shouldShowUndoButton()
+          ? html`
+              <mwc-button
+                @click=${this._undoSelectedItems.bind(this)}
+                raised
+                style="--mdc-theme-primary: var(--status-warning-color, #ff9800); margin-right: 10px;"
+                label="${i18next.t('button.undo')}"
+              ></mwc-button>
+            `
+          : ''}
         <mwc-button
-          danger
           @click=${() => {
             this.dispatchEvent(
               new CustomEvent('completed', {
@@ -188,11 +242,25 @@ class TotePopup extends localize(i18next)(LitElement) {
   }
 
   get sealNoInput() {
-    return this.shadowRoot.querySelector('barcode-scanable-input[name=sealNo]').shadowRoot.querySelector('input')
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=sealNo]')?.shadowRoot?.querySelector('input')
+  }
+
+  _shouldShowSealSection() {
+    // Only show seal section if minimumSealNumber is greater than 0
+    return (this.minimumSealNumber || 0) > 0
+  }
+
+  _shouldShowUndoButton() {
+    // Show undo button only if selected tote is not sealed
+    const selectedTote = this._selectedToteNo?.[0]
+    return selectedTote && !selectedTote?.closedDate
   }
 
   _focusOnSealNoInput() {
-    setTimeout(() => this.sealNoInput.focus(), 50)
+    const sealInput = this.sealNoInput
+    if (sealInput) {
+      setTimeout(() => sealInput.focus(), 50)
+    }
   }
 
   _focusOnToteNoInput() {
@@ -201,28 +269,36 @@ class TotePopup extends localize(i18next)(LitElement) {
 
   async firstUpdated() {
     this.config = {
+      list: { fields: ['sku', 'packingType', 'pickedQty'] },
       pagination: { pages: [10, 20, 50, 100] },
       rows: {
-        appendable: false
+        appendable: false,
+        selectable: {
+          multiple: true
+        }
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: true },
         {
           type: 'string',
           name: 'sku',
           header: i18next.t('field.sku'),
+          label: true,
           width: 180
         },
         {
           type: 'string',
           name: 'packingType',
           header: i18next.t('field.packing_type'),
+          label: true,
           width: 180
         },
         {
           type: 'string',
           name: 'pickedQty',
           header: i18next.t('field.picked_qty'),
+          label: true,
           width: 180
         }
       ]
@@ -269,7 +345,8 @@ class TotePopup extends localize(i18next)(LitElement) {
         toteNo: this._selectedToteNo[0].name,
         sortings,
         orderNo: this.orderNo
-      }
+      },
+      fetchPolicy: 'no-cache'
     })
 
     if (!response.errors) {
@@ -279,7 +356,10 @@ class TotePopup extends localize(i18next)(LitElement) {
       }
 
       if (this.toteNo && this.toteNo !== '') {
-        this._focusOnSealNoInput()
+        // Only focus on seal input if seal section is visible
+        if (this._shouldShowSealSection()) {
+          this._focusOnSealNoInput()
+        }
       } else {
         this._focusOnToteNoInput()
       }
@@ -306,6 +386,21 @@ class TotePopup extends localize(i18next)(LitElement) {
 
       if (result) {
         await this._checkToteAvailability()
+
+        // After successful tote scan, refresh the tote list and auto-select the scanned tote
+        if (this.toteNo && this.toteNo !== '') {
+          await this._fetchToteList()
+
+          // Auto-select the scanned tote for PDA/mobile users
+          const scannedTote = this._toteNoList?.find(tote => tote.name === this.toteNo)
+          if (scannedTote) {
+            this._selectedToteNo = [scannedTote]
+            // Trigger grist to fetch items for the selected tote
+            if (this.grist) {
+              await this.grist.fetch()
+            }
+          }
+        }
       } else {
         this.toteNoInput.value = ''
         this.toteNo = ''
@@ -315,7 +410,10 @@ class TotePopup extends localize(i18next)(LitElement) {
     }
 
     if (this.toteNo && this.toteNo !== '') {
-      this._focusOnSealNoInput()
+      // Only focus on seal input if seal section is visible
+      if (this._shouldShowSealSection()) {
+        this._focusOnSealNoInput()
+      }
     } else {
       this._focusOnToteNoInput()
     }
@@ -420,6 +518,7 @@ class TotePopup extends localize(i18next)(LitElement) {
               items {
                 id
                 name
+                closedDate
                 orderToteSeals {
                   id
                   name
@@ -446,6 +545,97 @@ class TotePopup extends localize(i18next)(LitElement) {
     }
   }
 
+  async _undoSelectedItems() {
+    // Get selected rows from grist
+    const selectedRecords = this.grist.selected
+
+    if (!selectedRecords || selectedRecords.length === 0) {
+      await CustomAlert({
+        type: 'info',
+        title: i18next.t('text.nothing_selected'),
+        text: i18next.t('text.please_select_items_to_undo')
+      })
+      return
+    }
+
+    // Confirm before deleting
+    const itemCount = selectedRecords.length
+    const itemText =
+      itemCount > 1
+        ? `${itemCount} items`
+        : `${selectedRecords[0].sku} (${selectedRecords[0].pickedQty} ${selectedRecords[0].packingType})`
+
+    const answer = await CustomAlert({
+      type: 'warning',
+      title: i18next.t('button.undo'),
+      text: i18next.t('text.are_you_sure_to_remove_x_from_tote', { x: itemText }),
+      confirmButton: {
+        text: i18next.t('button.confirm'),
+        color: '#ff9800'
+      },
+      cancelButton: {
+        text: i18next.t('button.cancel'),
+        color: '#cfcfcf'
+      }
+    })
+
+    if (!answer.value) return
+
+    try {
+      // Undo all selected items
+      for (const record of selectedRecords) {
+        await this._unsortItem(record.id, false) // Don't show individual toasts
+      }
+
+      // Show single success message for all items
+      this._showToast({
+        type: 'info',
+        message:
+          itemCount > 1
+            ? i18next.t('text.items_removed_from_tote', { count: itemCount })
+            : i18next.t('text.item_removed_from_tote')
+      })
+
+      // Refresh once after all items are removed
+      await this._fetchToteList()
+      await this.grist.fetch()
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  async _unsortItem(orderToteItemId, showToast = true) {
+    try {
+      const response = await client.mutate({
+        mutation: gql`
+          mutation unsortItem($orderToteItemId: String!, $reason: String) {
+            unsortItem(orderToteItemId: $orderToteItemId, reason: $reason)
+          }
+        `,
+        variables: {
+          orderToteItemId,
+          reason: 'Removed by user from tote popup'
+        }
+      })
+
+      if (!response.errors) {
+        if (showToast) {
+          this._showToast({
+            type: 'info',
+            message: i18next.t('text.item_removed_from_tote')
+          })
+
+          // Refresh the tote list and grist
+          await this._fetchToteList()
+          await this.grist.fetch()
+        }
+      }
+    } catch (e) {
+      this._showToast(e)
+      throw e // Re-throw to stop batch processing
+    }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {