From 8199234bd7273c59f3b7814f0ff51301427d0f34 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 4 Nov 2026 14:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=BE=85=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E7=AE=B1=E5=90=8E=E7=9A=84=E6=8E=92=E9=98=9F=E6=89=AB=E7=A0=81?=
=?UTF-8?q?=E5=B9=B6=E9=98=BB=E6=AD=A2=E6=8F=90=E5=89=8D=E7=BB=93=E6=9D=9F?=
=?UTF-8?q?=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/operation/operation.vue | 6 ++---
tests/receiving-lifecycle.test.mjs | 40 ++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/pages/operation/operation.vue b/src/pages/operation/operation.vue
index 4246b3e..bb592ea 100644
--- a/src/pages/operation/operation.vue
+++ b/src/pages/operation/operation.vue
@@ -122,7 +122,7 @@
本次已收 {{ lastReceipt.acceptedPackages }} 箱，整柜剩余 {{ current.pendingPackages }} 箱
-
+
@@ -202,7 +202,7 @@
this.cartonInput = scan.value
return this.resolveCarton(scan.value)
},
- drainScanQueue() { if (!this._pageActive || this.loading || this.busy || this.activeTarget === 'quantity' || !this.scanQueue.length || this.phase !== 'receive') return; const next = this.scanQueue.shift(); this.dispatchHardwareScan(next) },
+ drainScanQueue() { if (!this._pageActive || this.loading || this.busy || this.canSubmitReceipt || this.activeTarget === 'quantity' || !this.scanQueue.length || this.phase !== 'receive') return; const next = this.scanQueue.shift(); this.dispatchHardwareScan(next) },
suspendReceiving() { this._pageActive = false; this._scanEpoch = (this._scanEpoch || 0) + 1; this._resumeReceiving = true; clearTimeout(this._drainTimer); clearTimeout(this._toastTimer); this.scanQueue = []; this.stopScanner() },
scheduleScanDrain() { clearTimeout(this._drainTimer); if (!this._pageActive) return; const epoch = this._scanEpoch || 0; this._drainTimer = setTimeout(() => { if (this._pageActive && epoch === (this._scanEpoch || 0)) this.drainScanQueue() }, 0) },
async run(action, work, isCurrent = () => true) {
@@ -265,7 +265,7 @@
} catch (error) { if (!this.error) this.error = error }
},
async submitReceipt() { const isFba = this.activeInbound?.destinationType === 'FBA'; if (isFba && Number(this.packageCount) > MAX_PACKAGES_PER_PALLET) { this.error = Object.assign(new Error(PALLET_CAPACITY_MESSAGE), { code: 'A0409' }); playErrorSound(); this.showToast(PALLET_CAPACITY_MESSAGE, 'error'); return } if (!this.canSubmitReceipt) return; const payload = isFba ? { inboundCode: this.activeInbound.inboundCode, palletCode: this.resolvedPallet.palletCode, packageCount: Number(this.packageCount), expectedPalletVersion: this.resolvedPallet.version } : { cartonMark: this.activeInbound.cartonMark, palletCode: this.resolvedPallet.palletCode }; const key = idempotencyKey(isFba ? 'bulk-receipt' : 'carton-receipt', { containerNo: this.current?.containerNo, groupKey: this.activeInbound.groupKey, ...payload }); try { const result = await this.run('提交实收', async () => { const receipt = isFba ? await receiveCurrentBulk({ ...payload, idempotencyKey: key.value }) : await receiveCurrentCarton({ ...payload, idempotencyKey: key.value }); const current = this.validateReceivingWarehouse(await getCurrentReceiving(), '当前接柜会话'); return { receipt, current } }); releaseIdempotencyKey(key.signature); receiving.lastReceipt = result.receipt; await this.applyCurrentReceiving(result.current); this.clearReceiptContext(); playSuccessSound() } catch (_) {} },
- async completeContainer() { if (!this.canFinishOnsite || this.activeTarget === 'quantity' || this.scanQueue.length) return; const payload = { allowDifference: !this.allInboundsReconciled }; const key = idempotencyKey('complete', { containerNo: this.current.containerNo, ...payload }); try { const value = await this.run(this.allInboundsReconciled ? '完成入库' : '结束现场收货', async () => this.validateReceivingWarehouse(await completeCurrentReceiving({ ...payload, idempotencyKey: key.value }), '当前接柜会话')); releaseIdempotencyKey(key.signature); await this.applyCurrentReceiving(value) } catch (_) {} },
+ async completeContainer() { if (!this.canFinishOnsite || this.canSubmitReceipt || this.activeTarget === 'quantity' || this.scanQueue.length) return; const payload = { allowDifference: !this.allInboundsReconciled }; const key = idempotencyKey('complete', { containerNo: this.current.containerNo, ...payload }); try { const value = await this.run(this.allInboundsReconciled ? '完成入库' : '结束现场收货', async () => this.validateReceivingWarehouse(await completeCurrentReceiving({ ...payload, idempotencyKey: key.value }), '当前接柜会话')); releaseIdempotencyKey(key.signature); await this.applyCurrentReceiving(value) } catch (_) {} },
async finishAndReturn() { resetReceivingDraft(); await this.loadCandidates(false) },
showToast(message, type) { clearTimeout(this._toastTimer); this.toast = { visible: true, message, type }; this._toastTimer = setTimeout(() => { this.toast.visible = false }, 2600) }
}
diff --git a/tests/receiving-lifecycle.test.mjs b/tests/receiving-lifecycle.test.mjs
index 2833698..0dba0bb 100644
--- a/tests/receiving-lifecycle.test.mjs
+++ b/tests/receiving-lifecycle.test.mjs
@@ -88,6 +88,46 @@ test('queued pallet scan follows the current step while a pending carton require
assert.deepEqual(calls, [['pallet', 'PAL-A'], ['carton', 'IN-A#2']])
})
+test('queued carton remains pending until the current carton receipt is confirmed', async t => {
+ store.resetReceivingSession(); store.setCurrentReceiving(sessionValue())
+ store.receiving.resolvedCarton = { inboundCode: 'IN-A', cartonMark: 'IN-A#1', destinationType: 'OVERSEAS' }
+ store.receiving.resolvedPallet = { palletCode: 'PAL-A', compatible: true }
+ const { vm } = page()
+ t.after(() => vm.suspendReceiving())
+ const parsed = []
+ vm.resolveCarton = value => parsed.push(value)
+ vm.palletInput = 'PAL-A'; vm.activeTarget = 'carton'
+ vm.scanQueue = [{ value: 'IN-A#2', target: 'carton' }]
+
+ vm.drainScanQueue()
+ assert.equal(vm.scanQueue.length, 1)
+ assert.deepEqual(parsed, [])
+ vm.clearReceiptContext()
+ await new Promise(resolve => setTimeout(resolve, 5))
+ assert.deepEqual(parsed, ['IN-A#2'])
+ assert.equal(vm.scanQueue.length, 0)
+})
+
+test('cannot finish a container while an overseas carton awaits receipt confirmation', async t => {
+ store.resetReceivingSession(); store.setCurrentReceiving(sessionValue())
+ store.receiving.resolvedCarton = { inboundCode: 'IN-A', cartonMark: 'IN-A#1', destinationType: 'OVERSEAS' }
+ store.receiving.resolvedPallet = { palletCode: 'PAL-A', compatible: true }
+ let completions = 0
+ const { vm } = page({ completeCurrentReceiving: async () => {
+ completions++
+ return sessionValue({ status: 'COMPLETED_WITH_DIFFERENCE' })
+ } })
+ t.after(() => vm.suspendReceiving())
+ vm.applyCurrentReceiving = async () => {}
+ vm.palletInput = 'PAL-A'; vm.activeTarget = 'carton'
+
+ await vm.completeContainer()
+ assert.equal(completions, 0)
+ vm.clearReceiptContext()
+ await vm.completeContainer()
+ assert.equal(completions, 1)
+})
+
test('an incompatible pallet never reports success and a corrected scan can be validated normally', async t => {
store.resetReceivingSession(); store.setCurrentReceiving(sessionValue())
store.receiving.resolvedCarton = { inboundCode: 'IN-A', cartonMark: 'IN-A#22-1', destinationType: 'FBA' }