diff --git a/pages/work/order/picking.vue b/pages/work/order/picking.vue index 9928e32..3de3f95 100644 --- a/pages/work/order/picking.vue +++ b/pages/work/order/picking.vue @@ -998,8 +998,8 @@ return; } const scanBarcode = this.normalizeBarcodeText(scanText); - const currentBarcode = this.normalizeBarcodeText(this.selectedItemBarcode); - if (scanBarcode && currentBarcode && scanBarcode === currentBarcode) { + const currentBarcodes = (this.selectedItemBarcode || '').split(/[,,、\s]+/).map(b => this.normalizeBarcodeText(b)).filter(b => b); + if (scanBarcode && currentBarcodes.length > 0 && currentBarcodes.includes(scanBarcode)) { this.triggerBarcodeMatchedHighlight(this.selectedPickItem); this.submitWavePickTaskIntermediate(); return; @@ -1634,10 +1634,13 @@ id: stockId }); const list = this.extractBarcodeListFromResponse(response); - const firstBarcode = this.resolveBarcodeFromEntry(list[0]); - this.$set(this.itemBarcodeCache, barcodeKey, firstBarcode || ''); + const allBarcodes = (list || []) + .map(entry => this.resolveBarcodeFromEntry(entry)) + .filter(b => b); + const joinedBarcodes = allBarcodes.join(','); + this.$set(this.itemBarcodeCache, barcodeKey, joinedBarcodes || ''); if (this.getSelectedItemBarcodeKey(this.selectedPickItem) === barcodeKey) { - this.selectedItemBarcode = firstBarcode || ''; + this.selectedItemBarcode = joinedBarcodes || ''; } } catch (error) { this.$set(this.itemBarcodeCache, barcodeKey, '');