@things-factory/operato-wms 4.3.794 → 4.3.797

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -710,14 +710,14 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         header: i18next.t('field.total_uom_value'),
         width: 120
       },
-      {
+      ...(!this.enableDirectInbound ? [{
         type: 'integer',
         name: 'palletQty',
         header: i18next.t('field.pallet_qty'),
         imex: { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 25, type: 'float' },
         record: { editable: editable, options: { min: 0 } },
         width: 80
-      },
+      }] : []),
       ...(this._enableLotIdInput
         ? [
           {
@@ -808,7 +808,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     }
 
     if (this.enableDirectInbound) {
-      const anchor = this._enableLotIdInput ? 'palletId' : 'palletQty'
+      const anchor = this._enableLotIdInput ? 'palletId' : 'totalUomValue'
       insertAfter(productGristColumns, anchor, [expDateColumn])
 
       insertAfter(productGristColumns, 'batchIdRef', [warehouseColumn, locationColumn])
@@ -1234,7 +1234,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       arrivalNotice.orderProducts = this._getOrderProducts()
       const fileUploader = this._document?.files ? this._document.files : undefined
 
-      if (arrivalNotice.orderProducts.some(orderProduct => !orderProduct.palletQty)) {
+      if (!this.enableDirectInbound && arrivalNotice.orderProducts.some(orderProduct => !orderProduct.palletQty)) {
         const result = await CustomAlert({
           title: i18next.t('title.are_you_sure'),
           text: i18next.t('text.there_is_no_pallet_qty'),
@@ -1439,11 +1439,11 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
       throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.uom_value') } }))
     }
 
-    if (records.some(({ palletQty }) => palletQty < 0)) {
+    if (!this.enableDirectInbound && records.some(({ palletQty }) => palletQty < 0)) {
       throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.pallet_qty') } }))
     }
 
-    if (records.some(({ palletQty, packQty }) => palletQty > packQty)) {
+    if (!this.enableDirectInbound && records.some(({ palletQty, packQty }) => palletQty > packQty)) {
       throw new Error(
         i18next.t('text.a_cannot_exceed_b', {
           state: {
@@ -1476,7 +1476,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           )
         }
 
-        if (!record.location || !record.location.id) {
+        if (!record.location || (!record.location.id && !record.location.name)) {
           throw new Error(
             i18next.t('text.location_required_for_product', {
               defaultValue: `Row ${index + 1}: Location is missing for product "${record.product?.name}"`,
@@ -1841,13 +1841,13 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         imex: { header: i18next.t('field.pack_qty'), key: 'packQty', width: 25, type: 'float' },
         width: 100
       },
-      {
+      ...(!this.enableDirectInbound ? [{
         type: 'integer',
         name: 'palletQty',
         header: i18next.t('field.pallet_qty'),
         imex: { header: i18next.t('field.pallet_qty'), key: 'palletQty', width: 25, type: 'float' },
         width: 100
-      },
+      }] : []),
       ...(this._enableLotIdInput
         ? [
           {
@@ -2087,6 +2087,34 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
 
   async _importableData(records) {
     try {
+      // Remap raw Excel header text keys to imex.key values
+      const headerToKey = {}
+      this.excelColumns()
+        .filter(col => col.imex)
+        .forEach(col => {
+          headerToKey[col.imex.header.toLowerCase()] = col.imex.key
+        })
+
+      records = records.map(record => {
+        const remapped = {}
+        Object.entries(record).forEach(([rawKey, value]) => {
+          if (!rawKey) return
+          const mappedKey = headerToKey[rawKey.toLowerCase()]
+          if (mappedKey) {
+            const parts = mappedKey.split('.')
+            if (parts.length === 2) {
+              remapped[parts[0]] = remapped[parts[0]] || {}
+              remapped[parts[0]][parts[1]] = value
+            } else {
+              remapped[mappedKey] = value
+            }
+          } else {
+            remapped[rawKey] = value
+          }
+        })
+        return remapped
+      })
+
       if (!this.enableDirectInbound && records.some(record => record.location)) {
         throw new Error(
           'Location-based assignment is not allowed. Please delete the' +
@@ -2100,11 +2128,17 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
           .map(record => {
             let warehouseName
             if (this.enableDirectInbound) {
-              const match = record.location.name.match(/(.*) \((.*)\)/)
+              const locationItem = record.location?.name
+              const locationName = typeof locationItem === 'object' ? locationItem?.name : locationItem
+              const locationId = typeof locationItem === 'object' ? locationItem?.id : undefined
+              const match = locationName?.match(/(.*) \((.*)\)/)
               if (match && match.length === 3) {
-                record.location.name = match[1].trim()
                 warehouseName = match[2].trim()
-                record = { ...record, warehouseName: warehouseName }
+                record = {
+                  ...record,
+                  location: { id: locationId, name: match[1].trim() },
+                  warehouseName
+                }
               }
             }
             return {
@@ -2112,19 +2146,19 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               unitPrice:
                 record.unitPrice == null && record.unitPrice !== undefined
                   ? '0.00'
-                  : record.unitPrice === undefined
+                  : record.unitPrice === undefined || record.unitPrice == ""
                     ? null
                     : parseFloat(parseFloat(record.unitPrice).toFixed(2)),
               packQty:
                 record.packQty == null && record.packQty !== undefined
                   ? '0'
-                  : record.packQty === undefined
+                  : record.packQty === undefined || record.packQty == ""
                     ? null
                     : parseFloat(parseFloat(record.packQty).toFixed(3)),
               palletQty:
                 record.palletQty == null && record.palletQty !== undefined
                   ? parseInt('0')
-                  : record.palletQty === undefined
+                  : record.palletQty === undefined || record.palletQty == ""
                     ? null
                     : parseInt(record.palletQty),
               uomValue: record.uomValue !== null && record.uomValue !== undefined ? parseFloat(record.uomValue) : ''

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'
@@ -1311,14 +1312,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 +1342,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 +1362,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 +1426,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 +1466,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) {
@@ -2486,7 +2525,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 +2562,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 +2601,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.794",
+  "version": "4.3.797",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.767",
     "@things-factory/product-base": "^4.3.791",
     "@things-factory/resource-ui": "^4.3.790",
-    "@things-factory/sales-ui": "^4.3.794",
+    "@things-factory/sales-ui": "^4.3.795",
     "@things-factory/scene-data-transform": "^4.3.767",
     "@things-factory/scene-excel": "^4.3.767",
     "@things-factory/scene-firebase": "^4.3.767",
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.767",
     "@things-factory/tutorial-ui": "^4.3.767",
     "@things-factory/warehouse-base": "^4.3.791",
-    "@things-factory/worksheet-base": "^4.3.794"
+    "@things-factory/worksheet-base": "^4.3.797"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.767",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "cbcc57e2ef7188213c3e64c7e54d977f4f58b3f2"
+  "gitHead": "1acd354f47dfc15a5670841ddfb51e338f61d15f"
 }