@things-factory/operato-wms 4.3.752 → 4.3.755

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

@@ -1,6 +1,7 @@
 import '@things-factory/barcode-ui'
 import '@things-factory/grist-ui'
 import { css, html } from 'lit-element'
+import { gql } from 'graphql-tag'
 import { MultiColumnFormStyles, SingleColumnFormStyles } from '@things-factory/form-ui'
 import { WORKSHEET_STATUS } from '../../constants'
 import { i18next } from '@things-factory/i18n-base'
@@ -8,11 +9,13 @@ import { isMobileDevice } from '@things-factory/utils'
 import { LoadingExecutionBase } from './loading-execution-base'
 import '../../components/list-view/product-list-view'
 import { fetchSettingRule } from '../../../fetch-setting-value'
+import { client, gqlContext } from '@things-factory/shell'
 
 // Constants
 const SETTINGS = {
   QC_SKU: 'qc-sku',
-  DISABLE_QC: 'disable-QC-in-loading'
+  DISABLE_QC: 'disable-QC-in-loading',
+  ENABLE_TOTE_SCANNING: 'enable-tote-scanning'
 }
 
 const TAB_TYPES = {
@@ -24,6 +27,16 @@ const TAB_TYPES = {
 const DEFAULT_TABS = [TAB_TYPES.QC, TAB_TYPES.LOADING, TAB_TYPES.LOADED]
 const LOADING_TABS = [TAB_TYPES.LOADING, TAB_TYPES.LOADED]
 
+const VALIDATE_QC_SEALS = gql`
+  query validateQcSeals($releaseGoodNo: String!) {
+    validateQcSeals(releaseGoodNo: $releaseGoodNo) {
+      valid
+      error
+      minimumSealNumber
+    }
+  }
+`
+
 // List View Configurations
 const QC_LIST_CONFIG = {
   selectable: true,
@@ -121,13 +134,14 @@ const LOADING_LIST_CONFIG = {
   }
 }
 
-
 export class LoadingExecution extends LoadingExecutionBase {
   static get properties() {
     return {
       ...super.properties,
       _useQcSku: { type: Boolean },
-      _currentReleaseGood: { type: Object }
+      _currentReleaseGood: { type: Object },
+      _tabCounts: { type: Object },
+      _qcBannerState: { type: Object }
     }
   }
 
@@ -255,6 +269,52 @@ export class LoadingExecution extends LoadingExecutionBase {
           align-items: center;
           padding: 0 12px 8px;
         }
+        .loading-banner {
+          background-color: #fff3cd;
+          border: 1px solid #ffc107;
+          border-radius: 4px;
+          padding: 12px 16px;
+          margin: 10px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          color: #856404;
+        }
+        .loading-banner button {
+          background-color: #007e7f;
+          color: white;
+          border: none;
+          padding: 6px 12px;
+          border-radius: 4px;
+          cursor: pointer;
+          font-weight: bold;
+        }
+        .loading-banner button:hover {
+          background-color: #005f60;
+        }
+        .qc-banner {
+          background-color: #fff3cd;
+          border: 1px solid #ffc107;
+          border-radius: 4px;
+          padding: 12px 16px;
+          margin: 10px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          color: #856404;
+        }
+        .qc-banner button {
+          background-color: #007e7f;
+          color: white;
+          border: none;
+          padding: 6px 12px;
+          border-radius: 4px;
+          cursor: pointer;
+          font-weight: bold;
+        }
+        .qc-banner button:hover {
+          background-color: #005f60;
+        }
       `
     ]
   }
@@ -264,6 +324,7 @@ export class LoadingExecution extends LoadingExecutionBase {
     this._executionData = { ...this._executionData, ownCollection: false }
     this._useQcSku = false
     this._currentReleaseGood = null
+    this._qcBannerState = { show: false, needsSealing: false, minimumSealNumber: 0 }
     this._deliveryOrderConfig = {
       columnLeft: {
         size: 8,
@@ -306,6 +367,12 @@ export class LoadingExecution extends LoadingExecutionBase {
         startedAt: this.worksheet?.startedAt
       }
     }
+    // Update banner state when QC or loading data changes
+    if (changedProperties.has('qcData') || changedProperties.has('loadingData')) {
+      if (this._updateQcBannerState) {
+        this._updateQcBannerState()
+      }
+    }
   }
 
   combineSameProducts(data) {
@@ -331,16 +398,33 @@ export class LoadingExecution extends LoadingExecutionBase {
     const disableQCSetting = await fetchSettingRule(SETTINGS.DISABLE_QC)
     this._disableQC = disableQCSetting === true || disableQCSetting === 'true'
     this._useQcSku = await fetchSettingRule(SETTINGS.QC_SKU)
-
-    // Set initial active tab based on settings
-    const activeTab = !this._disableQC ? TAB_TYPES.QC : TAB_TYPES.LOADING
+    this._enableToteScanningValue = parseInt((await fetchSettingRule(SETTINGS.ENABLE_TOTE_SCANNING)) || '0', 10)
+    this._enableToteScanning = this._enableToteScanningValue >= 1
+    this.toteNo = ''
+
+    // UX-safe tab selection: Auto-switch to LOADED if LOADING is empty but LOADED has items
+    let activeTab = !this._disableQC ? TAB_TYPES.QC : TAB_TYPES.LOADING
+    if (this._tabCounts && activeTab === TAB_TYPES.LOADING) {
+      const loadingCounts = this._tabCounts.LOADING || { total: 0, pending: 0 }
+      const loadedCounts = this._tabCounts.LOADED || { total: 0, pending: 0 }
+      if (loadingCounts.total === 0 && loadedCounts.total > 0) {
+        activeTab = TAB_TYPES.LOADED
+      }
+    }
     this.state = { ...this.state, activeTab }
 
     // Process worksheet details
     const processedDetails = this._useQcSku ? this.combineSameProducts(this.worksheetDetails) : this.worksheetDetails
 
+    // Check if any order inventory has refWorksheetId (when data comes from props)
+    if (this.worksheetDetails && this.worksheetDetails.length > 0) {
+      this._hasRefWorksheetId = this.worksheetDetails.some(
+        item => item?.relatedOrderInv?.refWorksheetId != null && item?.relatedOrderInv?.refWorksheetId !== ''
+      )
+    }
+
     // Filter data for different tabs
-    this.qcData = processedDetails.filter(data => data?.sortedQty != data?.pickedQty && data.status !== 'LOADED') || []
+    this.qcData = processedDetails.filter(data => data?.sortedQty < data?.pickedQty && data.status !== 'LOADED') || []
     this.loadingData =
       processedDetails.filter(data => data?.sortedQty > 0 && data.status != WORKSHEET_STATUS.DONE.value) || []
     this.loadedData = this.deliveryOrdersInfo || []
@@ -352,7 +436,11 @@ export class LoadingExecution extends LoadingExecutionBase {
       worksheetId: this.worksheet?.worksheet?.id
     }
 
+    // Check seal status after resetting view (needed for Tote button visibility)
+    await this._checkAndUpdateSealStatus()
     this.getButton()
+    // Update QC banner state after resetting view
+    await this._updateQcBannerState()
   }
 
   get qcListItemConfig() {
@@ -367,6 +455,106 @@ export class LoadingExecution extends LoadingExecutionBase {
     return this._deliveryOrderConfig
   }
 
+  /**
+   * Determines if the "Go to LOADED" banner should be shown.
+   * Banner appears when:
+   * - Current tab is LOADING
+   * - LOADING tab has no items (loadingData.length === 0) - uses SAME source as Total SKU
+   * - LOADED tab has items (loadedData.deliveryOrders.length > 0)
+   *
+   * Uses the same data source as Total SKU display to ensure consistency.
+   */
+  _shouldShowLoadingBanner() {
+    // Banner only shows on LOADING tab
+    if (this.state?.activeTab !== TAB_TYPES.LOADING) {
+      return false
+    }
+
+    // Use the SAME source as Total SKU display: this.loadingData?.length
+    const loadingItemCount = this.loadingData?.length || 0
+    const loadedItemCount = this.loadedData?.deliveryOrders?.length || 0
+
+    // Show banner when LOADING is empty but LOADED has items
+    return loadingItemCount === 0 && loadedItemCount > 0
+  }
+
+  /**
+   * Checks if totes need to be sealed by calling the validation query
+   * Returns: { needsSealing: boolean, error?: string, minimumSealNumber?: number }
+   */
+  async _checkToteSealStatus() {
+    if (!this._enableToteScanning) {
+      return { needsSealing: false, minimumSealNumber: 0 }
+    }
+
+    const orderNo = this._currentReleaseGood?.releaseGood?.name || this.worksheet?.releaseGood?.name
+    if (!orderNo) {
+      return { needsSealing: false, minimumSealNumber: 0 }
+    }
+
+    try {
+      const validationResponse = await client.query({
+        query: VALIDATE_QC_SEALS,
+        variables: { releaseGoodNo: orderNo },
+        context: gqlContext()
+      })
+
+      if (!validationResponse.errors && validationResponse.data?.validateQcSeals) {
+        const { valid, error, minimumSealNumber } = validationResponse.data.validateQcSeals
+        const minSealNum = minimumSealNumber || 0
+        // If minimumSealNumber is 0, sealing is not required even if valid is false
+        const needsSealing = !valid && minSealNum > 0
+        return { needsSealing, error, minimumSealNumber: minSealNum }
+      }
+    } catch (e) {
+      // If validation fails, assume sealing is needed
+      return { needsSealing: true, error: e.message || 'Seal validation failed', minimumSealNumber: 0 }
+    }
+
+    return { needsSealing: false, minimumSealNumber: 0 }
+  }
+
+  /**
+   * Updates the QC banner state based on current data
+   */
+  async _updateQcBannerState() {
+    // Banner only shows on QC tab
+    if (this.state?.activeTab !== TAB_TYPES.QC) {
+      this._qcBannerState = { show: false, needsSealing: false, minimumSealNumber: 0 }
+      return
+    }
+
+    // Use the SAME source as Total SKU display: this.qcData?.length
+    const qcItemCount = this.qcData?.length || 0
+    const loadingItemCount = this.loadingData?.length || 0
+
+    // Show banner when QC is empty but LOADING has items
+    const shouldShow = qcItemCount === 0 && loadingItemCount > 0
+
+    if (!shouldShow) {
+      this._qcBannerState = { show: false, needsSealing: false, minimumSealNumber: 0 }
+      return
+    }
+
+    // Check if totes need sealing
+    const sealStatus = await this._checkToteSealStatus()
+
+    this._qcBannerState = {
+      show: true,
+      needsSealing: sealStatus.needsSealing,
+      error: sealStatus.error,
+      minimumSealNumber: sealStatus.minimumSealNumber || 0
+    }
+    this.requestUpdate()
+  }
+
+  /**
+   * Determines if the QC banner should be shown (synchronous getter for render)
+   */
+  get _shouldShowQcBanner() {
+    return this._qcBannerState?.show || false
+  }
+
   render() {
     if (!this.state) {
       this.resetView()
@@ -388,6 +576,12 @@ export class LoadingExecution extends LoadingExecutionBase {
             ${this.state?.activeTab === TAB_TYPES.QC
               ? html`
                   <!-- QC Tab Inputs -->
+                  ${this._enableToteScanning && this._disableQC === true
+                    ? html`
+                        <label class="font-bold">${i18next.t('field.tote')}</label>
+                        <input name="toteNo" custom-input disabled .value="${this.toteNo || ''}" />
+                      `
+                    : ''}
                   <label class="font-bold">${i18next.t('label.product_barcode')}</label>
                   <barcode-scanable-input
                     name="productBarcode"
@@ -447,7 +641,14 @@ export class LoadingExecution extends LoadingExecutionBase {
         }}
       >
         <label class="text-14 font-bold order-no"
-          >Order No.: ${this._currentReleaseGood?.releaseGood?.name || this.worksheet?.binLocationName || ''}</label
+          >Order No.:
+          ${this._currentReleaseGood?.releaseGood?.name || this.worksheet?.releaseGood?.name
+            ? this._currentReleaseGood?.releaseGood?.name || this.worksheet?.releaseGood?.name
+            : this.worksheet?.isReleaseGoodScan
+            ? this.worksheet?.releaseGood?.name
+            : this._useQcSku
+            ? this.worksheet?.binLocationName
+            : ''}</label
         >
         <mwc-icon style="color:#007E7F;">info</mwc-icon>
       </button>
@@ -473,6 +674,55 @@ export class LoadingExecution extends LoadingExecutionBase {
         >
       </div>
 
+      ${this._shouldShowLoadingBanner()
+        ? html`
+            <div class="loading-banner">
+              <span
+                >${i18next.t('text.all_items_loaded_proceed_to_loaded', {
+                  defaultValue: 'All items loaded. Proceed to LOADED to complete dispatch.'
+                })}</span
+              >
+              <button @click=${async e => await this.openTab(e, TAB_TYPES.LOADED)}>
+                ${i18next.t('button.go_to_loaded', { defaultValue: 'Go to LOADED' })}
+              </button>
+            </div>
+          `
+        : ''}
+      ${this._shouldShowQcBanner
+        ? html`
+            <div class="qc-banner">
+              <span
+                >${this._qcBannerState?.needsSealing
+                  ? this._qcBannerState?.error ||
+                    (this._qcBannerState?.minimumSealNumber > 0
+                      ? i18next.t('text.tote_needs_to_be_sealed_with_count', {
+                          defaultValue: `Tote needs to be sealed before proceeding to LOADING. Minimum ${this._qcBannerState.minimumSealNumber} seal(s) required.`,
+                          count: this._qcBannerState.minimumSealNumber
+                        })
+                      : i18next.t('text.tote_needs_to_be_sealed', {
+                          defaultValue: 'Tote needs to be sealed before proceeding to LOADING.'
+                        }))
+                  : i18next.t('text.all_items_qc_complete_proceed_to_loading', {
+                      defaultValue: 'All items QC complete. Proceed to LOADING to continue.'
+                    })}</span
+              >
+              <button
+                @click=${async e => {
+                  if (this._qcBannerState?.needsSealing) {
+                    await this.openTotePopup()
+                  } else {
+                    await this.openTab(e, TAB_TYPES.LOADING)
+                  }
+                }}
+              >
+                ${this._qcBannerState?.needsSealing
+                  ? i18next.t('button.seal_tote', { defaultValue: 'Seal Tote' })
+                  : i18next.t('button.go_to_loading', { defaultValue: 'Go to LOADING' })}
+              </button>
+            </div>
+          `
+        : ''}
+
       <div id="qc" class="tab-content ${this.state?.activeTab === TAB_TYPES.QC ? 'active' : ''}">
         <product-list-view id="qc" .config=${this.qcListItemConfig} .data=${this.qcData || []}></product-list-view>
       </div>

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

@@ -54,6 +54,18 @@ const FIND_LOADABLE_RELEASE_GOOD = gql`
         total
         pending
       }
+      tabCounts {
+        LOADING {
+          total
+          completed
+          pending
+        }
+        LOADED {
+          total
+          completed
+          pending
+        }
+      }
     }
   }
 `
@@ -71,6 +83,7 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
         bizplaceName
         startedAt
         binLocationName
+        isReleaseGoodScan
         releaseGood {
           id
           name
@@ -79,6 +92,9 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
           attentionTo
           deliveryAddress1
           deliveryAddress2
+          refNo
+          refNo2
+          refNo3
         }
       }
       worksheetDetailInfos {
@@ -101,6 +117,7 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
           id
           batchId
           packingType
+          refWorksheetId
           product {
             id
             sku
@@ -161,6 +178,7 @@ const LOADING_WORKSHEET_V2 = gql`
           id
           batchId
           packingType
+          refWorksheetId
           product {
             id
             sku
@@ -244,6 +262,7 @@ const GET_LOADING_TASK = gql`
           id
           batchId
           packingType
+          refWorksheetId
           product {
             id
             sku
@@ -265,7 +284,8 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
       _data: Object,
       _context: Object,
       _qcSku: Boolean,
-      _disableQC: Boolean
+      _disableQC: Boolean,
+      _tabCounts: Object
     }
   }
 
@@ -375,6 +395,7 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
         .worksheetDetails=${this._data?.worksheetDetailInfos}
         .deliveryOrdersInfo=${this._data?.deliveryOrderInfoList}
         ._useQcSku=${this._qcSku}
+        ._tabCounts=${this._tabCounts}
       ></loading-execution>`
     } else {
       return html` <div class="${isMobileDevice() ? 'single-column-form' : 'multi-column-form'}">
@@ -423,7 +444,12 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
 
   async fetchOrder(orderNo) {
     try {
-      if (!this._qcSku) {
+      // Use FIND_LOADABLE_RELEASE_GOOD if:
+      // 1. qc-sku is false, OR
+      // 2. qc-sku is true but disable-QC-in-loading is true (QC tab is hidden, so use order number scanning)
+      const shouldUseOrderNumberQuery = !this._qcSku || this._disableQC === true || this._disableQC === 'true'
+
+      if (shouldUseOrderNumberQuery) {
         const defaultTabName = this._disableQC === true || this._disableQC === 'true' ? 'LOADING' : 'QC'
 
         const response = await client.query({
@@ -432,7 +458,8 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
             orderNo,
             tabName: defaultTabName
           },
-          context: gqlContext()
+          context: gqlContext(),
+          fetchPolicy: 'network-only' // Always fetch fresh data to show updated item counts
         })
 
         if (!response.errors) {
@@ -445,6 +472,7 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
           }
         }
       } else {
+        // Use FIND_LOADABLE_RELEASE_GOOD_BY_BIN when qc-sku is true and QC is enabled
         const response = await client.query({
           query: FIND_LOADABLE_RELEASE_GOOD_BY_BIN,
           variables: { orderNo },
@@ -485,8 +513,17 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
         <show-ro-list-popup
           .releaseOrders=${releaseGoods}
           .sorting=${false}
-          @ro-selected-loading=${e => {
-            this.fetchWorksheet(e.detail.ro?.name)
+          @ro-selected-loading=${async e => {
+            const selectedRO = e.detail.ro
+            // Store tabCounts for passing to loading-execution component
+            if (selectedRO?.tabCounts) {
+              this._tabCounts = selectedRO.tabCounts
+            }
+            // Ensure settings are loaded before fetching worksheet to use correct filter
+            if (this._disableQC === undefined || this._disableQC === null) {
+              await this.initializeSettings()
+            }
+            await this.fetchWorksheet(selectedRO?.name)
           }}
         ></show-ro-list-popup>
       `,
@@ -500,15 +537,48 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
 
   async fetchWorksheet(orderNo) {
     try {
-      const filter = this._disableQC === true || this._disableQC === 'true' ? FILTER_TYPES.LOADING : FILTER_TYPES.QC
+      // Ensure settings are loaded before determining filter
+      // fetchSettingRule returns boolean true/false, so check for boolean true
+      const disableQC = this._disableQC === true
+
+      // Fetch BOTH QC and LOADING data so the banner can properly determine state
+      // This ensures loadingData is available even when QC is complete
+      const [qcResponse, loadingResponse] = await Promise.all([
+        client.query({
+          query: LOADING_WORKSHEET_V2,
+          variables: { orderNo, filter: FILTER_TYPES.QC },
+          fetchPolicy: 'network-only'
+        }),
+        client.query({
+          query: LOADING_WORKSHEET_V2,
+          variables: { orderNo, filter: FILTER_TYPES.LOADING },
+          fetchPolicy: 'network-only'
+        })
+      ])
 
-      const response = await client.query({
-        query: LOADING_WORKSHEET_V2,
-        variables: { orderNo, filter }
-      })
+      if (!qcResponse.errors && !loadingResponse.errors) {
+        const qcData = qcResponse.data?.loadingWorksheetv2
+        const loadingData = loadingResponse.data?.loadingWorksheetv2
 
-      if (!response.errors) {
-        let items = response.data?.loadingWorksheetv2
+        // Combine worksheetDetailInfos from both queries, removing duplicates by id
+        const qcDetails = qcData?.worksheetDetailInfos || []
+        const loadingDetails = loadingData?.worksheetDetailInfos || []
+        const detailsMap = new Map()
+
+        // Add QC details first
+        qcDetails.forEach(detail => {
+          if (detail?.id) detailsMap.set(detail.id, detail)
+        })
+        // Add loading details (will overwrite duplicates)
+        loadingDetails.forEach(detail => {
+          if (detail?.id) detailsMap.set(detail.id, detail)
+        })
+
+        // Use worksheetInfo from whichever has it (prefer QC, fallback to loading)
+        let items = {
+          worksheetInfo: qcData?.worksheetInfo || loadingData?.worksheetInfo,
+          worksheetDetailInfos: Array.from(detailsMap.values())
+        }
         items.deliveryOrderInfoList = await this.fetchDeliveryOrders(orderNo)
         this._data = items
       }

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

@@ -70,7 +70,8 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       toteNo: String,
       _pageSettings: Object,
       _isReplenishment: Boolean,
-      _hasVas: Boolean
+      _hasVas: Boolean,
+      _enableToteScanningValue: Number
     }
   }
 
@@ -148,10 +149,11 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       })
     }
 
+    // Tote button only appears when enable-tote-scanning is exactly 1 (not 2 or higher)
     if (
       this.refPickingType === PICKING_TYPES.PICKING.value &&
       this.releaseGoodNo &&
-      this._enableToteScanning &&
+      this._enableToteScanningValue === 1 &&
       !this._isReplenishment
     ) {
       actions.push({
@@ -328,6 +330,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     this._isLastUnit = false
     this._isReplenishment = false
     this._hasVas = false
+    this._enableToteScanningValue = 0
   }
 
   render() {
@@ -1076,7 +1079,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               binLocation:
                 this._hasBinPicking && (!this.toteNo || this.tote == '') ? this.binLocationInput.value : null,
               serialNumber: this._isRequireSerialNumberScanningOutbound ? this.serialInput.value : null,
-              toteNo: this._enableToteScanning && this.toteNo !== '' ? this.toteNo : null
+              toteNo: this._enableToteScanningValue >= 1 && this.toteNo !== '' ? this.toteNo : null
             }
           })
 
@@ -1167,7 +1170,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               serialNumber: this._isRequireSerialNumberScanningOutbound ? this.serialInput.value : null,
               binLocation:
                 this._hasBinPicking && (!this.toteNo || this.tote == '') ? this.binLocationInput.value : null,
-              toteNo: this._enableToteScanning && this.toteNo !== '' ? this.toteNo : null,
+              toteNo: this._enableToteScanningValue >= 1 && this.toteNo !== '' ? this.toteNo : null,
               pickingQty: qty
             }
           })
@@ -2306,7 +2309,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
         const settingsMap = new Map(pageSettings.settings.map(setting => [setting.name, setting.value]))
 
         this._enableProductScanning = settingsMap.get('enable-product-scanning') === 'true'
-        this._enableToteScanning = settingsMap.get('enable-tote-scanning') === 'true'
+        this._enableToteScanningValue = parseInt(settingsMap.get('enable-tote-scanning') || '0', 10)
         this._enableInputQty = settingsMap.get('enable-input-qty')
         this._qrProcessing = settingsMap.get('qr-code-scanning')
 
@@ -2351,10 +2354,12 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     const settingsMap = new Map(pageSettings.settings.map(setting => [setting.name, setting.value]))
 
     this._enableProductScanning = settingsMap.get('enable-product-scanning') === 'true'
-    this._enableToteScanning = settingsMap.get('enable-tote-scanning') === 'true'
+    this._enableToteScanningValue = parseInt(settingsMap.get('enable-tote-scanning') || '0', 10)
     this._enableInputQty = settingsMap.get('enable-input-qty')
     this._qrProcessing = settingsMap.get('qr-code-scanning')
 
+    // Update context after settings are loaded to ensure tote button visibility is correct
+    this.updateContext()
     this.focusOnInput()
   }
 

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

@@ -272,14 +272,14 @@ export class PickingExecutionBase extends LitElement {
         this.qtyInput.value = ''
         this._focusOnCartonNoInput()
 
-        //fetch data
-        let newData = await this.fetchWorksheet(
-          this._executionData.worksheetNo,
-          this.parent._context.locationSortingRules,
-          'PICKING'
-        )
-
-        this.pickingData = newData.worksheetDetailInfos
+        //fetch data for both tabs to ensure banner condition is accurate
+        const [pickingData, pickedData] = await Promise.all([
+          this.fetchWorksheet(this._executionData.worksheetNo, this.parent._context.locationSortingRules, 'PICKING'),
+          this.fetchWorksheet(this._executionData.worksheetNo, this.parent._context.locationSortingRules, 'PICKED')
+        ])
+
+        this.pickingData = pickingData.worksheetDetailInfos
+        this.pickedData = pickedData.worksheetDetailInfos
       }
     } catch (e) {
       showToast(e)