@things-factory/operato-wms 4.3.680 → 4.3.682

package/client/pages/constants/worksheet.js

@@ -115,6 +115,10 @@ export const WORKSHEET_STATUS = {
   PARTIAL_PROCESSING: {
     name: i18next.t('label.partial_processing'),
     value: 'PARTIAL_PROCESSING'
+  },
+  PARTIAL_EXECUTING: {
+    name: i18next.t('label.partial_executing'),
+    value: 'PARTIAL_EXECUTING'
   }
 }
 

package/client/pages/inventory/inventory-adjustment.js

@@ -1166,13 +1166,6 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         if (new Date(itm?.manufactureDate) > new Date()) {
           throw new Error(i18next.t('text.invalid_manufacture_date'))
         }
-        if (itm.expirationDate != null) {
-          if (new Date(itm.expirationDate) < new Date()) {
-            this.showToast({
-              message: `${i18next.t('text.expiration_date_will_be_earlier_than_today')}`
-            })
-          }
-        }
         if (
           itm?.adjustmentCode?.trim() == '' ||
           (itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC01.value &&
@@ -1196,7 +1189,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.sku_is_required_kindly_fill_in_the_sku_to_continue'))
           }
 
-          if (itm.qty < 1 || itm.unitCost < 0 || itm.uomValue < 1) {
+          if (itm.qty < 0 || itm.unitCost < 0 || itm.uomValue < 0) {
             throw new Error(i18next.t('text.invalid_value_in_list'))
           }
 

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

@@ -805,13 +805,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           variables: { orderPackageId: id }
         })
         if (!response.errors) {
-          this.invoice = document.invoice
-          this.airwayBill = document.airwayBill
-
-          return {
-            invoice: response.data.fetchSellercraftDocument.invoice,
-            airwayBill: response.data.fetchSellercraftDocument.airwayBill
-          }
+          const { invoice, airwayBill } = response.data.fetchSellercraftDocument
+          this.invoice = invoice
+          this.airwayBill = airwayBill
+          return { invoice, airwayBill }
         }
       }
 
@@ -823,6 +820,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await fetchOrder(this._orderPackageInformation.orderPackage.id)
           invoice = document.invoice
         }
+        if (!invoice || invoice.trim() === '') throw new Error('Document not available')
         let url = new URL(window.location)
         convertedPdfUrl = `${url.origin}/proxy?url=${invoice}`
       } else if (type == 'awb') {
@@ -832,6 +830,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await fetchOrder(this._orderPackageInformation.orderPackage.id)
           airwayBill = document.airwayBill
         }
+        if (!airwayBill || airwayBill.trim() === '') throw new Error('Document not available')
         if (airwayBill.includes('partner.shopeemobile.com')) {
           convertedPdfUrl = `/pdf/merge?urls=${airwayBill}`
         } else {
@@ -868,7 +867,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (type == 'invoice') {
         let invoice = this.invoice
-
+        if (!invoice || String(invoice).trim() === '') throw new Error('Document not available')
         if (isValidHttpUrl(invoice)) {
           let url = new URL(window.location)
           convertedPdfUrl = `${url.origin}/proxy?url=${invoice}`
@@ -877,7 +876,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
         }
       } else if (type == 'awb') {
         let airwayBill = this.airwayBill
-
+        if (!airwayBill || String(airwayBill).trim() === '') throw new Error('Document not available')
         if (airwayBill.includes('partner.shopeemobile.com')) {
           convertedPdfUrl = `/pdf/merge?urls=${airwayBill}`
         } else if (isValidHttpUrl(airwayBill)) {
@@ -923,6 +922,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await this.fetchPowrupOrderDocument(this._orderPackageInformation.orderPackage.id)
           invoice = document.invoice
         }
+        if (!invoice || invoice.trim() === '') throw new Error('Document not available')
         let url = new URL(window.location)
         convertedPdfUrl = `${url.origin}/proxy?url=${invoice}`
       } else if (type == 'awb') {
@@ -932,6 +932,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await this.fetchPowrupOrderDocument(this._orderPackageInformation.orderPackage.id)
           airwayBill = document.airwayBill
         }
+        if (!airwayBill || airwayBill.trim() === '') throw new Error('Document not available')
         if (airwayBill.includes('partner.shopeemobile.com')) {
           convertedPdfUrl = `/pdf/merge?urls=${airwayBill}`
         } else {
@@ -970,13 +971,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       variables: { orderPackageId: id }
     })
     if (!response.errors) {
-      this.invoice = document.invoice
-      this.airwayBill = document.airwayBill
-
-      return {
-        invoice: response.data.fetchPowrupDocument.invoice,
-        airwayBill: response.data.fetchPowrupDocument.airwayBill
-      }
+      const { invoice, airwayBill } = response.data.fetchPowrupDocument
+      this.invoice = invoice
+      this.airwayBill = airwayBill
+      return { invoice, airwayBill }
     }
   }
 
@@ -999,6 +997,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await this.fetchWebspertOrderDocument(this._orderPackageInformation.orderPackage.id)
           invoice = document.invoice
         }
+        if (!invoice || invoice.trim() === '') throw new Error('Document not available')
         let url = new URL(window.location)
         convertedPdfUrl = `${url.origin}/proxy?url=${invoice}`
       } else if (type == 'awb') {
@@ -1008,6 +1007,7 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
           let document = await this.fetchWebspertOrderDocument(this._orderPackageInformation.orderPackage.id)
           airwayBill = document.airwayBill
         }
+        if (!airwayBill || airwayBill.trim() === '') throw new Error('Document not available')
         if (airwayBill.includes('partner.shopeemobile.com')) {
           convertedPdfUrl = `/pdf/merge?urls=${airwayBill}`
         } else {
@@ -1046,13 +1046,10 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
       variables: { orderPackageId: id }
     })
     if (!response.errors) {
-      this.invoice = document.invoice
-      this.airwayBill = document.airwayBill
-
-      return {
-        invoice: response.data.fetchWebspertDocument.invoice,
-        airwayBill: response.data.fetchWebspertDocument.airwayBill
-      }
+      const { invoice, airwayBill } = response.data.fetchWebspertDocument
+      this.invoice = invoice
+      this.airwayBill = airwayBill
+      return { invoice, airwayBill }
     }
   }
 
@@ -1103,12 +1100,13 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
 
       var orderDocInfo = await this.getOrderDocument(this.refNo, 'shippingLabel')
 
-      if (orderDocInfo?.length === 0) {
+      if (!orderDocInfo || orderDocInfo.length === 0) {
         throw new Error('Document not available')
       } else {
         let content
         if (this.platform == 'shopee' && !orderDocInfo[0]?.isShopeeV2) {
-          const orderDocUrls = orderDocInfo.map(item => item.airwayBill)
+          const orderDocUrls = orderDocInfo.map(item => item.airwayBill).filter(url => url && String(url).trim() !== '')
+          if (orderDocUrls.length === 0) throw new Error('Document not available')
           for (var i = 0; i < orderDocUrls.length; i++) {
             orderDocUrls[i] = 'urls=' + orderDocUrls[i]
           }
@@ -1120,7 +1118,9 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
         // }
         else {
           let url = new URL(window.location)
-          content = `${url.origin}/proxy?url=${encodeURIComponent(orderDocInfo[0].airwayBill)}`
+          const awb = orderDocInfo[0]?.airwayBill
+          if (!awb || String(awb).trim() === '') throw new Error('Document not available')
+          content = `${url.origin}/proxy?url=${encodeURIComponent(awb)}`
         }
         this.callPrintDialog(content)
       }
@@ -1176,6 +1176,14 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async callPrintDialog(contentSource) {
+    if (
+      !contentSource ||
+      (typeof contentSource === 'string' && contentSource.trim() === '') ||
+      contentSource === 'undefined'
+    ) {
+      this.showToast({ type: 'warning', message: i18next.t('text.no_document_available') })
+      return
+    }
     switch (this.platform) {
       //this condition is to select based on the content type
       //for html content will be using srcdoc
@@ -1775,12 +1783,15 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  showToast({ type, message }) {
+  showToast(payload) {
+    const normalized = typeof payload === 'string' ? { message: payload } : payload || {}
+    const notifyType = normalized.type || 'error'
+    const notifyMessage = normalized.message || i18next.t('text.no_document_available')
     document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {
-          type,
-          message
+          type: notifyType,
+          message: notifyMessage
         }
       })
     )

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

@@ -1267,8 +1267,59 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async validatePicking() {
-    // validate for order selection
-    // pallet id existing
+    // Support random picking sequence: auto-select row by scanned identifiers (carton/pallet) and product barcode
+    if (this._pageSettings?.enablePickingRandomSeq === true) {
+      // 1) Carton-based (carton label flow)
+      if (this.cartonInput?.value) {
+        const scannedCartonId = this.cartonInput.value.trim()
+        if (scannedCartonId) {
+          let candidates = (this.data?.records || []).filter(
+            rec => rec.cartonId === scannedCartonId && rec.status !== 'DONE' && rec.status !== 'MISSING'
+          )
+          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'))
+          }
+
+          if (this._enableProductScanning) {
+            // Require product barcode when product scanning enabled
+            if (!this.productBarcodeInput?.value) {
+              this._focusOnProductBarcodeInput()
+              throw new Error(i18next.t('text.empty_product_barcode'))
+            }
+
+            const matchedRecord = await this._selectRecordByGtinFromCandidates(
+              this.productBarcodeInput.value.trim(),
+              candidates
+            )
+
+            if (!matchedRecord) {
+              this._focusOnProductBarcodeInput()
+              this.productBarcodeInput.value = ''
+              throw new Error(i18next.t('text.incorrect_product_barcode'))
+            }
+
+            if (!this._selectedOrderInventory || this._selectedOrderInventory.name !== matchedRecord.name) {
+              this.updateSelectedItemProp(matchedRecord)
+              this.scannableField()
+            }
+          } else {
+            // Product scanning disabled: pick a deterministic candidate
+            const matchedRecord = this._pickBestCandidate(candidates)
+            if (
+              matchedRecord &&
+              (!this._selectedOrderInventory || this._selectedOrderInventory.name !== matchedRecord.name)
+            ) {
+              this.updateSelectedItemProp(matchedRecord)
+              this.scannableField()
+            }
+          }
+        }
+      }
+    }
 
     if ((!this.palletInput?.value || !this.cartonInput?.value) && this._isRequireSerialNumberScanningOutbound) {
       if (!this.serialInput?.value) {
@@ -1320,8 +1371,31 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           // Auto Find matching carton for pick scanning row without forcing the user to choose
           if (this._pageSettings.enablePickingRandomSeq == true) {
             let cartonInputValue = this.cartonInput.value
-            foundRecord = this.data.records.find(rec => rec.cartonId === cartonInputValue)
-            this._selectedOrderInventory = { ...foundRecord }
+            let candidates = this.data.records.filter(
+              rec => rec.cartonId === cartonInputValue && rec.status !== 'DONE' && rec.status !== 'MISSING'
+            )
+            candidates = this._filterCandidatesByInputQty(candidates)
+            if (this._enableProductScanning && this.productBarcodeInput?.value) {
+              foundRecord = await this._selectRecordByGtinFromCandidates(
+                this.productBarcodeInput.value.trim(),
+                candidates
+              )
+            }
+            // If product barcode is provided but no GTIN match, stop without fallback
+            if (this._enableProductScanning && this.productBarcodeInput?.value && !foundRecord) {
+              this._focusOnProductBarcodeInput()
+              this.productBarcodeInput.value = ''
+              throw new Error(i18next.t('text.incorrect_product_barcode'))
+            }
+
+            // No product barcode: deterministically choose best candidate among duplicates
+            if (!foundRecord && (!this._enableProductScanning || !this.productBarcodeInput?.value)) {
+              foundRecord = this._pickBestCandidate(candidates)
+            }
+
+            if (foundRecord) {
+              this.updateSelectedItemProp(foundRecord)
+            }
           } else {
             foundRecord = null
           }
@@ -1579,6 +1653,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                   }
                   bizplaceName
                   partnerDomainId
+                  customerCompanyDomainId
                   refNo
                   refNo2
                   refNo3
@@ -1757,6 +1832,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
                 worksheetInfo {
                   bizplaceName
                   partnerDomainId
+                  customerCompanyDomainId
                   startedAt
                 }
                 worksheetDetailInfos {
@@ -2222,7 +2298,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
           settings: {
             name: 'name',
             operator: 'in',
-            value: ['enable-product-scanning', 'qr-code-scanning', 'enable-tote-scanning']
+            value: ['enable-product-scanning', 'qr-code-scanning', 'enable-tote-scanning', 'enable-input-qty']
           },
           settingsDomain: this._worksheetInfo.partnerDomainId
         })
@@ -2231,6 +2307,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
 
         this._enableProductScanning = settingsMap.get('enable-product-scanning') === 'true'
         this._enableToteScanning = settingsMap.get('enable-tote-scanning') === 'true'
+        this._enableInputQty = settingsMap.get('enable-input-qty')
         this._qrProcessing = settingsMap.get('qr-code-scanning')
 
         this._selectedOrderInventory = this.data?.records[0] || undefined
@@ -2359,6 +2436,104 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   massageReleaseGood(response) {}
+
+  _getTypedQty() {
+    if (!this.releaseQtyInput || !this.releaseQtyInput.value) return null
+    const qty = parseFloat(this.releaseQtyInput.value)
+    if (isNaN(qty) || qty <= 0) return null
+    return qty
+  }
+
+  _filterCandidatesByInputQty(candidates) {
+    const typedQty = this._getTypedQty()
+    if (!typedQty || !Array.isArray(candidates) || !candidates.length) return candidates
+    const matches = candidates.filter(rec => parseFloat(rec?.releaseQty) === typedQty)
+    return matches.length ? matches : candidates
+  }
+
+  _pickBestCandidate(candidates) {
+    if (!Array.isArray(candidates) || !candidates.length) return null
+
+    const sorted = [...candidates].sort((a, b) => {
+      const aCompleted = !!a?.completed
+      const bCompleted = !!b?.completed
+      if (aCompleted !== bCompleted) return aCompleted - bCompleted // prefer incomplete
+
+      const aMissing = a?.status === 'MISSING'
+      const bMissing = b?.status === 'MISSING'
+      if (aMissing !== bMissing) return aMissing - bMissing // prefer not missing
+
+      const aPending = !!a?.hasMissingInventoryChanges
+      const bPending = !!b?.hasMissingInventoryChanges
+      if (aPending !== bPending) return aPending - bPending // prefer not pending
+
+      const aRemain = (a?.releaseQty || 0) - (a?.pickedQty || 0)
+      const bRemain = (b?.releaseQty || 0) - (b?.pickedQty || 0)
+      if (aRemain !== bRemain) return bRemain - aRemain // prefer greater remaining qty
+
+      if (a?.name && b?.name && a.name !== b.name) return a.name.localeCompare(b.name)
+      return 0
+    })
+
+    return sorted[0] || null
+  }
+
+  async _selectRecordByGtinFromCandidates(gtin, candidates) {
+    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`
+          query checkGtin($gtin: String!, $customerCompanyDomainId: String!) {
+            checkGtin(gtin: $gtin, customerCompanyDomainId: $customerCompanyDomainId) {
+              items {
+                id
+                name
+                packingType
+                packingSize
+                gtin
+                product {
+                  id
+                }
+              }
+              total
+            }
+          }
+        `,
+        variables: {
+          gtin,
+          customerCompanyDomainId: this._worksheetInfo?.customerCompanyDomainId
+        }
+      })
+
+      if (response?.errors) return null
+
+      const items = response?.data?.checkGtin?.items || []
+      if (!items.length) return null
+
+      // First try exact product+packing match, then fall back to product-only match
+      const exactMatches = candidates.filter(rec =>
+        items.some(
+          itm =>
+            itm.product?.id === rec?.product?.id &&
+            itm.packingType === rec.packingType &&
+            itm.packingSize === rec.packingSize
+        )
+      )
+      if (exactMatches.length) return this._pickBestCandidate(exactMatches)
+
+      const productOnlyMatches = candidates.filter(rec => items.some(itm => itm.product?.id === rec?.product?.id))
+      if (productOnlyMatches.length) return this._pickBestCandidate(productOnlyMatches)
+
+      return null
+    } catch (e) {
+      return null
+    }
+  }
 }
 
 window.customElements.define('picking-product', PickingProduct)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.680",
+  "version": "4.3.682",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.675",
     "@things-factory/product-base": "^4.3.677",
     "@things-factory/resource-ui": "^4.3.677",
-    "@things-factory/sales-ui": "^4.3.679",
+    "@things-factory/sales-ui": "^4.3.682",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
@@ -107,8 +107,8 @@
     "@things-factory/system-ui": "^4.3.675",
     "@things-factory/transport-base": "^4.3.677",
     "@things-factory/tutorial-ui": "^4.3.677",
-    "@things-factory/warehouse-base": "^4.3.679",
-    "@things-factory/worksheet-base": "^4.3.679"
+    "@things-factory/warehouse-base": "^4.3.682",
+    "@things-factory/worksheet-base": "^4.3.682"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "bb2e45562d5223f988b4c9c0e32daeaba55a2ba3"
+  "gitHead": "b2ad61e11288f94f4fc73b4f74c049e70a77079a"
 }

package/translations/en.json

@@ -1049,6 +1049,7 @@
   "label.order_status_loading": "loading",
   "label.order_status_packing": "packing",
   "label.order_status_partial_return": "partial return",
+  "label.order_status_partial_processing": "partial processing",
   "label.order_status_pending": "pending",
   "label.order_status_pending_approval": "pending approval",
   "label.order_status_pending_cancel": "pending cancel",

package/translations/ko.json

@@ -1041,6 +1041,7 @@
   "label.order_status_loading": "상차중",
   "label.order_status_packing": "[ko] packing",
   "label.order_status_partial_return": "부분 반환",
+  "label.order_status_partial_processing": "부분 처리중",
   "label.order_status_pending_approval": "승인 대기",
   "label.order_status_pending_cancel": "취소 대기",
   "label.order_status_pending_receive": "미수집",

package/translations/ms.json

@@ -1059,6 +1059,7 @@
   "label.order_status_in_transit": "dalam perjalanan",
   "label.order_status_inspecting": "disemak",
   "label.order_status_intransit": "dalam perjalanan",
+  "label.order_status_partial_processing": "sebahagian diproses",
   "label.order_status_pending": "dalam penyediaan",
   "label.order_status_pending_cancel": "pending dibatalkan",
   "label.order_status_pending_receive": "pending diterima",

package/translations/zh.json

@@ -1076,6 +1076,7 @@
   "label.order_status_loading": "装载中",
   "label.order_status_packing": "包装中",
   "label.order_status_partial_return": "部分退货",
+  "label.order_status_partial_processing": "部分处理中",
   "label.order_status_pending": "待处理",
   "label.order_status_pending_approval": "待批准",
   "label.order_status_pending_cancel": "待取消",