@things-factory/operato-wms 4.3.795 → 4.3.798

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

@@ -7,6 +7,7 @@ import '../components/worksheet-information-popup'
 import './serial-number-popup'
 import './tote-popup'
 import './vas-list-popup'
+import './picking-same-carton-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -580,7 +581,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
       settings: {
         name: 'name',
         operator: 'in',
-        value: ['enable-bin-picking', 'camera-scan-only', 'enable-picking-random-seq', 'disable-missing-button']
+        value: ['enable-bin-picking', 'camera-scan-only', 'enable-picking-random-seq', 'disable-missing-button', 'display-conversion']
       }
     })
 
@@ -590,6 +591,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     let cameraScanOnly = settingsMap.get('camera-scan-only') === 'true'
     let enablePickingRandomSeq = settingsMap.get('enable-picking-random-seq') === 'true'
     let disableMissingButton = settingsMap.get('disable-missing-button') === 'true'
+    let displayConversion = settingsMap.get('display-conversion') === 'true'
 
     const locationSortingTask = fetchLocationSortingRule(LOCATION_SORTING_RULE.PICKING_PRODUCT.value)
 
@@ -725,6 +727,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           label: true,
           width: 140
         },
+        {
+          type: 'string',
+          name: 'conversion',
+          header: i18next.t('field.pack_conversion'),
+          label: true,
+          hidden: !displayConversion,
+          width: 140
+        },
         {
           type: 'string',
           name: 'releaseProgress',
@@ -749,7 +759,8 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     this._pageSettings = {
       ...this._pageSettings,
       enablePickingRandomSeq: (await enablePickingRandomSeq) || false,
-      cameraScanOnly: (await cameraScanOnly) || false
+      cameraScanOnly: (await cameraScanOnly) || false,
+      displayConversion: (await displayConversion) || false
     }
   }
 
@@ -1311,14 +1322,27 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
         const scannedCartonId = this.cartonInput.value.trim()
         if (scannedCartonId) {
           let candidates = (this.data?.records || []).filter(
-            rec => rec.cartonId === scannedCartonId && rec.status !== 'DONE' && rec.status !== 'MISSING'
+            rec =>
+              rec.cartonId === scannedCartonId &&
+              rec.status !== 'DONE' &&
+              rec.status !== 'MISSING' &&
+              !rec.completed &&
+              rec.pickedQty < rec.releaseQty
           )
-          candidates = this._filterCandidatesByInputQty(candidates)
-
           // Validate carton id: must have at least one candidate
           if (!candidates || candidates.length === 0) {
             this._focusOnCartonNoInput()
-            throw new Error(i18next.t('text.invalid_carton_id'))
+            const hasFullyPickedForCarton = (this.data?.records || []).some(
+              rec =>
+                rec.cartonId === scannedCartonId &&
+                rec.status !== 'DONE' &&
+                rec.status !== 'MISSING' &&
+                !rec.completed &&
+                rec.pickedQty >= rec.releaseQty
+            )
+            throw new Error(
+              i18next.t(hasFullyPickedForCarton ? 'text.qty_exceed_release_qty' : 'text.invalid_carton_id')
+            )
           }
 
           if (this._enableProductScanning) {
@@ -1328,11 +1352,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
               throw new Error(i18next.t('text.empty_product_barcode'))
             }
 
+            this._popupCancelled = false
             const matchedRecord = await this._selectRecordByGtinFromCandidates(
               this.productBarcodeInput.value.trim(),
               candidates
             )
 
+            if (this._popupCancelled) return { value: false }
+
             if (!matchedRecord) {
               this._focusOnProductBarcodeInput()
               this.productBarcodeInput.value = ''
@@ -1345,7 +1372,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
             }
           } else {
             // Product scanning disabled: pick a deterministic candidate
-            const matchedRecord = this._pickBestCandidate(candidates)
+            const matchedRecord = this._pickBestCandidate(this._filterCandidatesByInputQty(candidates))
             if (
               matchedRecord &&
               (!this._selectedOrderInventory || this._selectedOrderInventory.name !== matchedRecord.name)
@@ -1409,14 +1436,36 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           if (this._pageSettings.enablePickingRandomSeq == true) {
             let cartonInputValue = this.cartonInput.value
             let candidates = this.data.records.filter(
-              rec => rec.cartonId === cartonInputValue && rec.status !== 'DONE' && rec.status !== 'MISSING'
+              rec =>
+                rec.cartonId === cartonInputValue &&
+                rec.status !== 'DONE' &&
+                rec.status !== 'MISSING' &&
+                !rec.completed &&
+                rec.pickedQty < rec.releaseQty
             )
-            candidates = this._filterCandidatesByInputQty(candidates)
+            // If no candidates remain, check if it's because all matching items are already fully picked
+            if (!candidates.length) {
+              const hasFullyPickedForCarton = this.data.records.some(
+                rec =>
+                  rec.cartonId === cartonInputValue &&
+                  rec.status !== 'DONE' &&
+                  rec.status !== 'MISSING' &&
+                  !rec.completed &&
+                  rec.pickedQty >= rec.releaseQty
+              )
+              if (hasFullyPickedForCarton) {
+                this._focusOnCartonNoInput()
+                throw new Error(i18next.t('text.qty_exceed_release_qty'))
+              }
+            }
+
             if (this._enableProductScanning && this.productBarcodeInput?.value) {
+              this._popupCancelled = false
               foundRecord = await this._selectRecordByGtinFromCandidates(
                 this.productBarcodeInput.value.trim(),
                 candidates
               )
+              if (this._popupCancelled) return { value: false }
             }
             // If product barcode is provided but no GTIN match, stop without fallback
             if (this._enableProductScanning && this.productBarcodeInput?.value && !foundRecord) {
@@ -1427,7 +1476,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
             // No product barcode: deterministically choose best candidate among duplicates
             if (!foundRecord && (!this._enableProductScanning || !this.productBarcodeInput?.value)) {
-              foundRecord = this._pickBestCandidate(candidates)
+              foundRecord = this._pickBestCandidate(this._filterCandidatesByInputQty(candidates))
             }
 
             if (foundRecord) {
@@ -1683,6 +1732,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                     recall
                     crossDocking
                     type
+                    rtm
                   }
                   replenishment {
                     id
@@ -1724,6 +1774,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   targetName
                   packingType
                   packingSize
+                  conversion
                   location {
                     name
                     description
@@ -1779,7 +1830,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           this._crossDocking = worksheetInfo.releaseGood?._crossDocking
           this._bizplaceName = worksheetInfo?.bizplaceName
           this._orderNo = this.releaseGoodNo
-          this._worksheetInfo = worksheetInfo
+          this._worksheetInfo = { ...worksheetInfo, rtm: worksheetInfo.releaseGood?.rtm }
           let data = { records: this.formatWorksheetDetailInfos(worksheetDetailInfos) }
           this.data = { ...data }
 
@@ -1871,6 +1922,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   partnerDomainId
                   customerCompanyDomainId
                   startedAt
+                  rtm
+                  refNo
+                  refNo2
+                  refNo3
+                  shippingProvider
+                  trackingNo
+                  marketplaceStatus
+                  containerNo
                 }
                 worksheetDetailInfos {
                   hasMissingInventoryChanges
@@ -1892,6 +1951,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   status
                   packingType
                   packingSize
+                  conversion
                   location {
                     name
                   }
@@ -2291,6 +2351,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 targetName
                 packingType
                 packingSize
+                conversion
                 location {
                   name
                   description
@@ -2486,7 +2547,9 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   _filterCandidatesByInputQty(candidates) {
     const typedQty = this._getTypedQty()
     if (!typedQty || !Array.isArray(candidates) || !candidates.length) return candidates
-    const matches = candidates.filter(rec => parseFloat(rec?.releaseQty) === typedQty)
+    const matches = candidates.filter(
+      rec => (parseFloat(rec?.releaseQty) - parseFloat(rec?.pickedQty ?? 0)) === typedQty
+    )
     return matches.length ? matches : candidates
   }
 
@@ -2521,9 +2584,6 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
     try {
       if (!gtin || !candidates?.length) return null
 
-      // Apply qty-based narrowing first when duplicates exist
-      candidates = this._filterCandidatesByInputQty(candidates)
-
       // Use checkGtin to resolve product-packing info to match candidate rows
       const response = await client.query({
         query: gql`
@@ -2563,16 +2623,77 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
             itm.packingSize === rec.packingSize
         )
       )
-      if (exactMatches.length) return this._pickBestCandidate(exactMatches)
+      if (exactMatches.length) return await this._pickBestCandidateOrShowPopup(exactMatches)
 
       const productOnlyMatches = candidates.filter(rec => items.some(itm => itm.product?.id === rec?.product?.id))
-      if (productOnlyMatches.length) return this._pickBestCandidate(productOnlyMatches)
+      if (productOnlyMatches.length) return await this._pickBestCandidateOrShowPopup(productOnlyMatches)
 
       return null
     } catch (e) {
       return null
     }
   }
+
+  _hasDuplicateSameProduct(candidates) {
+    return this._getDuplicateSameProductRows(candidates).length > 0
+  }
+
+  _getDuplicateSameProductRows(candidates) {
+    if (!Array.isArray(candidates) || candidates.length <= 1) return []
+
+    // Group by cartonId + SKU, return only rows that belong to a duplicate group
+    const groups = {}
+    candidates.forEach(c => {
+      const key = `${c?.cartonId || ''}|${c?.product?.sku || ''}`
+      if (!groups[key]) groups[key] = []
+      groups[key].push(c)
+    })
+
+    const duplicateRows = []
+    for (const rows of Object.values(groups)) {
+      if (rows.length > 1) duplicateRows.push(...rows)
+    }
+    return duplicateRows
+  }
+
+  _showPickingSameCartonPopup(candidates) {
+    return new Promise(resolve => {
+      openPopup(
+        html`
+          <picking-same-carton-popup
+            .pickingInventories="${candidates}"
+            @selection="${e => {
+              resolve(e.detail)
+            }}"
+          ></picking-same-carton-popup>
+        `,
+        {
+          backdrop: true,
+          size: 'large',
+          title: i18next.t('title.inventory_selection')
+        }
+      )
+    })
+  }
+
+  async _pickBestCandidateOrShowPopup(candidates) {
+    if (!Array.isArray(candidates) || !candidates.length) return null
+
+    // If multiple candidates have the same cartonId + SKU, show popup for user to choose
+    const duplicateRows = this._getDuplicateSameProductRows(candidates)
+    if (duplicateRows.length) {
+      const selectedRecord = await this._showPickingSameCartonPopup(duplicateRows)
+      if (!selectedRecord) {
+        // User cancelled the popup — signal callers to do nothing
+        this._popupCancelled = true
+        return null
+      }
+      return selectedRecord
+    }
+
+    // Otherwise, use the existing logic to pick the best candidate
+    return this._pickBestCandidate(candidates)
+  }
 }
 
 window.customElements.define('picking-product', PickingProduct)

package/client/pages/outbound/picking-same-carton-popup.js

@@ -0,0 +1,217 @@
+import '@things-factory/grist-ui'
+
+import { css, html, LitElement } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+import { SingleColumnFormStyles } from '@things-factory/form-ui'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { store } from '@things-factory/shell'
+import { isMobileDevice } from '@things-factory/utils'
+
+class PickingSameCartonPopup extends connect(store)(localize(i18next)(LitElement)) {
+  static get properties() {
+    return {
+      config: Object,
+      data: Object,
+      pickingInventories: Array
+    }
+  }
+
+  constructor() {
+    super()
+  }
+
+  static get styles() {
+    return [
+      SingleColumnFormStyles,
+      css`
+        .button-container {
+          padding: 10px 0 12px 0;
+          text-align: center;
+        }
+        .button-container mwc-button {
+          margin: 0 5px;
+        }
+        data-grist {
+          overflow-y: hidden;
+          flex: 1;
+        }
+        .grist {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          overflow-y: auto;
+        }
+        :host {
+          padding: 10px;
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+          background-color: white;
+        }
+        .header {
+          padding: 10px;
+          font-weight: bold;
+          font-size: 14px;
+          color: var(--secondary-color);
+          border-bottom: 1px solid var(--secondary-color);
+          margin-bottom: 10px;
+        }
+      `
+    ]
+  }
+
+  get dataGrist() {
+    return this.shadowRoot.querySelector('data-grist')
+  }
+
+  updated(changeProps) {
+    if (changeProps.has('pickingInventories')) {
+      if (this.pickingInventories && this.pickingInventories.length) {
+        this.data = {
+          records: this.pickingInventories.map(inv => ({
+            ...inv,
+            locationName: inv.location?.name || ''
+          }))
+        }
+      }
+    }
+  }
+
+  render() {
+    return html`
+      <div class="header">
+        ${i18next.t('text.please_select_an_inventory')}
+      </div>
+
+      <div class="grist">
+        <data-grist
+          id="grist"
+          .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
+          .config=${this.config}
+          .data="${this.data}"
+        ></data-grist>
+      </div>
+
+      <div class="button-container">
+        <mwc-button
+          raised
+          @click="${this._selectPickingInventory.bind(this)}"
+          label="${i18next.t('button.select')}"
+        ></mwc-button>
+        <mwc-button
+          @click="${() => {
+            this.dispatchEvent(new CustomEvent('selection', { detail: null }))
+            history.back()
+          }}"
+          label="${i18next.t('button.cancel')}"
+        ></mwc-button>
+      </div>
+    `
+  }
+
+  firstUpdated() {
+    this.config = {
+      pagination: { infinite: true },
+      rows: { selectable: { multiple: false }, appendable: false },
+      list: {
+        fields: [
+          'locationName',
+          'palletId',
+          'batchId',
+          'batchIdRef',
+          'expirationDate',
+          'qty',
+          'releaseQty',
+          'packingType'
+        ]
+      },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'row-selector', multiple: false, header: { renderer: () => '' } },
+        { name: 'name', hidden: true },
+        {
+          type: 'string',
+          name: 'locationName',
+          label: true,
+          header: i18next.t('field.location'),
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'palletId',
+          label: true,
+          header: i18next.t('field.pallet_id'),
+          width: 120
+        },
+        {
+          type: 'string',
+          name: 'batchId',
+          label: true,
+          header: i18next.t('field.batch_no'),
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'batchIdRef',
+          label: true,
+          header: i18next.t('field.lot_id'),
+          width: 100
+        },
+        {
+          type: 'date',
+          name: 'expirationDate',
+          label: true,
+          header: i18next.t('field.expiration'),
+          width: 100
+        },
+        {
+          type: 'float',
+          name: 'qty',
+          label: true,
+          header: i18next.t('field.available_qty'),
+          width: 80
+        },
+        {
+          type: 'float',
+          name: 'releaseQty',
+          label: true,
+          header: i18next.t('field.release_qty'),
+          width: 80
+        },
+        {
+          type: 'string',
+          name: 'packingType',
+          label: true,
+          header: i18next.t('field.packing_type'),
+          width: 100
+        }
+      ]
+    }
+  }
+
+  async _selectPickingInventory() {
+    try {
+      const selectedInventory = this.dataGrist.selected[0]
+      if (!selectedInventory) throw new Error(i18next.t('text.please_select_inventory'))
+
+      this.dispatchEvent(new CustomEvent('selection', { detail: selectedInventory }))
+      history.back()
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  _showToast({ type, message }) {
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          type,
+          message
+        }
+      })
+    )
+  }
+}
+
+window.customElements.define('picking-same-carton-popup', PickingSameCartonPopup)

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

@@ -12,7 +12,7 @@ import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, gqlContext, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 
-import { showToast } from '../../../util'
+import { fetchPageSettings, showToast } from '../../../util'
 import { BATCH_PICKING, PICKING, ZONE_PICKING, ORDER_INVENTORY_STATUS } from '../../constants'
 
 const PICKING_TYPES = { PICKING, BATCH_PICKING, ZONE_PICKING }
@@ -25,10 +25,26 @@ export class PickingExecutionBase extends LitElement {
       data: Object,
       pickingData: Object,
       pickedData: Object,
-      _executionData: Object
+      _executionData: Object,
+      _displayConversion: Boolean
     }
   }
 
+  async connectedCallback() {
+    super.connectedCallback()
+
+    const pageSettings = await fetchPageSettings({
+      settings: {
+        name: 'name',
+        operator: 'in',
+        value: ['display-conversion']
+      }
+    })
+
+    const settingsMap = new Map(pageSettings?.settings?.map(setting => [setting.name, setting.value]) || [])
+    this._displayConversion = settingsMap.get('display-conversion') === 'true'
+  }
+
   get backButton() {
     return {
       title: i18next.t('button.back'),
@@ -392,6 +408,7 @@ export class PickingExecutionBase extends LitElement {
                 status
                 packingType
                 packingSize
+                conversion
               }
               inventoryChanges {
                 id
@@ -451,6 +468,7 @@ async function mapWorksheetData(data) {
     status: orderInv.status,
     packingType: orderInv.packingType,
     packingSize: orderInv.packingSize,
+    conversion: orderInv.conversion,
     location: {
       name: orderInv.inventory.location.name,
       description: orderInv.inventory.location.description

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

@@ -182,14 +182,15 @@ export class PickingExecution extends PickingExecutionBase {
                 field: 'product.name',
                 type: 'string',
                 style: '-webkit-line-clamp: 2;'
-              }
+              },
+              { header: 'SKU', field: 'product.sku', type: 'string' }
             ]
           },
           {
             type: 'row',
             content: [
-              { header: 'SKU', field: 'product.sku', type: 'string' },
-              { header: 'Packing Type', field: 'packingType', type: 'string' }
+              { header: 'Packing Type', field: 'packingType', type: 'string' },
+              ...(this._displayConversion ? [{ header: 'Pack Conversion', field: 'conversion', type: 'string' }] : [])
             ]
           },
           {

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

@@ -192,6 +192,7 @@ class PickingProductV2 extends connect(store)(localize(i18next)(PageView)) {
                 status
                 packingType
                 packingSize
+                conversion
               }
               inventoryChanges {
                 id
@@ -269,6 +270,7 @@ async function fetchWorksheet(worksheetNo, locationSortingRules) {
               status
               packingType
               packingSize
+              conversion
             }
             inventoryChanges {
               id
@@ -354,6 +356,7 @@ function mapWorksheetData(data) {
     status: orderInv.status,
     packingType: orderInv.packingType,
     packingSize: orderInv.packingSize,
+    conversion: orderInv.conversion,
     location: {
       name: orderInv.inventory.location.name,
       description: orderInv.inventory.location.description

package/client/pages/outbound/single-outbound-worksheet.js

@@ -14,7 +14,7 @@ import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
 import { fetchSettingRule } from '../../fetch-setting-value'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
+import { RTM_OPTIONS, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 
 import { applyParamsToFields } from '../../util'
 
@@ -237,6 +237,13 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
         },
         value: new Date().toISOString().split('T')[0]
       },
+      {
+        label: i18next.t('field.rtm'),
+        name: 'releaseGoodRtm',
+        type: 'select',
+        options: [{ value: '' }, ...RTM_OPTIONS.map(option => ({ name: option.label, value: option.value }))],
+        props: { searchOper: 'eq' }
+      },
       {
         label: i18next.t('field.cross_docking'),
         name: 'releaseGoodCrossDocking',
@@ -317,6 +324,14 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
           sortable: true,
           width: 180
         },
+        {
+          type: 'string',
+          name: 'releaseGoodRtm',
+          header: i18next.t('field.rtm'),
+          imex: { header: i18next.t('field.rtm'), key: 'releaseGoodRtm', width: 40, type: 'string' },
+          sortable: true,
+          width: 120
+        },
         {
           type: 'boolean',
           name: 'releaseGoodCrossDocking',
@@ -484,6 +499,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
                 name
                 description
                 refNo
+                rtm
                 crossDocking
                 courierOption
                 packingOption
@@ -533,6 +549,7 @@ class SingleOutboundWorksheet extends localize(i18next)(PageView) {
             return {
               ...item,
               releaseRefNo: item.releaseGood.refNo || '',
+              releaseGoodRtm: item.releaseGood.rtm || '',
               releaseGoodCrossDocking: item.releaseGood.crossDocking,
               releaseGoodCourierOption: item.releaseGood.courierOption,
               releaseGoodPackingOption: item.releaseGood.packingOption,