From c64c11b2ef6b66aa54b48c3ab698333d1257505f Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Thu, 1 Oct 2026 18:19:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8C=85=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BC=B1=E7=BD=91=E9=87=8D=E8=AF=95=E4=B8=8E=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 打包上报失败分流处理:401/403 静默、400(key 失效) 自动重查一次再重提、网络异常弹窗重传 - 新增打包上报失败重传弹窗,团单失败后保持核实状态,扫码/点击商品可重新上报 - 请求层新增默认 20s 超时与硬超时兜底(abort),防弱网下请求无限挂起 - queryPackOrder/packOrder/finishPack 支持透传 timeout,打包提交/结束显式 15s 超时 - 语音播报改为 FIFO 队列,不丢不截断,按真实时长设兜底(替代固定 5s) - 散单预检通过后依次播报各商品打包要求;打包要求样式改为红底警示 - 版本号升至 1.0.42 --- package.json | 2 +- src/api/index.ts | 29 ++-- src/api/request.ts | 47 +++++- src/pages/packaging/index.vue | 301 ++++++++++++++++++++++++++++------ 4 files changed, 315 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index 2df61f0..ae14d60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wms-worker-station", - "version": "1.0.41", + "version": "1.0.42", "description": "WMS仓库工作台(Android端 + 桌面端)", "author": "tianbao", "main": "electron/main.js", diff --git a/src/api/index.ts b/src/api/index.ts index 60427e8..e7aaf01 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -156,12 +156,15 @@ export function removeWorkbenchMember(data: { * - 散单 isSandan=1 附 order.intercept_flag/pack_flag;团购 isSandan=0 附 batch 波次信息 * - 另返回 order.wave_scope(波次范围:0=未分配 1=大团购 2=散单 3=小团购 4=单品单件) */ -export function queryPackOrder(token: string, barcode: string) { - return request( - 'workbench.queryOrder', - { token, barcode }, - { skipAuth: true } - ) +export function queryPackOrder( + token: string, + barcode: string, + options?: RequestOptions +) { + return request('workbench.queryOrder', { token, barcode }, { + skipAuth: true, + ...options, + }) } /** @@ -190,14 +193,20 @@ export function packOrder(data: { id?: number | null real_name?: string }> -}) { - return request('workbench.packOrder', data, { skipAuth: true }) +}, options?: RequestOptions) { + return request('workbench.packOrder', data, { + skipAuth: true, + ...options, + }) } /** * 工作台打包完成(免登录、免鉴权,以工作台 token 鉴权) * - 入参 token(工作台 token);结束该工作台最后一个未结束的打包任务并回写订单打包状态 */ -export function finishPack(token: string) { - return request('workbench.finishPack', { token }, { skipAuth: true }) +export function finishPack(token: string, options?: RequestOptions) { + return request('workbench.finishPack', { token }, { + skipAuth: true, + ...options, + }) } diff --git a/src/api/request.ts b/src/api/request.ts index 94c4fd4..15ea11d 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -119,6 +119,13 @@ function handleUnauthorized() { }, 5000) } +// 默认请求超时(毫秒):弱网/断网时避免请求无限挂起 +const DEFAULT_TIMEOUT_MS = 20000 +// 硬超时兜底:在 uni.request 的 timeout 之上再多等这些毫秒, +// 到点后主动 abort 并结算,确保 Promise 必定 settle +// (部分安卓 WebView / 弱网下 uni.request 的 timeout 可能不触发) +const HARD_TIMEOUT_EXTRA_MS = 2000 + export function request( method: string, data?: Record, @@ -126,8 +133,24 @@ export function request( ): AbortablePromise { const url = buildRequestUrl(method) const authHeader = options?.skipAuth ? {} : getAuthHeader() + const timeoutMs = options?.timeout != null ? options.timeout : DEFAULT_TIMEOUT_MS let requestTask: ReturnType | null = null + let hardTimeoutTimer: ReturnType | null = null + let settled = false + + // 成功/失败/硬超时三方只结算一次,避免重复 resolve/reject + const settle = (fn: () => void) => { + if (settled) { + return + } + settled = true + if (hardTimeoutTimer) { + clearTimeout(hardTimeoutTimer) + hardTimeoutTimer = null + } + fn() + } const promise: AbortablePromise = new Promise((resolve, reject) => { const requestOptions: UniApp.RequestOptions = { @@ -139,6 +162,7 @@ export function request( ...options?.header, }, data: data ?? {}, + timeout: timeoutMs, success: (res) => { const body = res.data as any // 鉴权请求返回 401(令牌无效/过期)→ 清 token 回登录页 @@ -150,18 +174,29 @@ export function request( ) { handleUnauthorized() } - resolve(body as T) + settle(() => resolve(body as T)) }, fail: (err) => { - reject(err) + settle(() => reject(err)) }, } - if (options?.timeout != null) { - requestOptions.timeout = options.timeout - } - requestTask = uni.request(requestOptions) + + // 硬超时兜底:到点后主动 abort 并以超时错误结算 + hardTimeoutTimer = setTimeout(() => { + try { + if (requestTask && typeof requestTask.abort === 'function') { + requestTask.abort() + } + } catch (err) { + // 忽略中断异常 + } + const timeoutErr: any = new Error('网络超时,请稍后重试') + timeoutErr.errMsg = 'request:fail timeout' + timeoutErr.timedOut = true + settle(() => reject(timeoutErr)) + }, timeoutMs + HARD_TIMEOUT_EXTRA_MS) }) promise.abort = () => { diff --git a/src/pages/packaging/index.vue b/src/pages/packaging/index.vue index 19be262..b069aff 100644 --- a/src/pages/packaging/index.vue +++ b/src/pages/packaging/index.vue @@ -56,6 +56,9 @@ + + 打包上报失败,扫描商品条码或单击商品重新上报 + {{ isSandan === 1 ? '运单' : '波次' }} {{ isSandan === 1 ? (currentWaybillCode || '暂无运单') : (currentWaveNo || '暂无波次') }} @@ -332,6 +335,22 @@ + + + + 打包上报失败 + {{ retryPopupText }} + + + + + + + @@ -513,6 +532,11 @@ export default { packStarted: false, packReporting: false, packFinishing: false, + // ---- 打包上报弱网重试 / key 失效自动重查 ---- + retryPopupOpen: false, + retryPopupText: '', + packKeyRetryCount: 0, + groupPackRetryReady: false, // ---- 商品图片预览 ---- imagePreviewVisible: false, imagePreviewList: [], @@ -532,9 +556,9 @@ export default { ttsReady: false, ttsPendingText: '', voiceAudioContext: null, - // 语音播报串行队列状态 + // 语音播报串行队列状态(FIFO:不丢任何一条,按顺序播完) voicePlaying: false, - voicePendingText: '', + voiceQueue: [], voiceNextTimer: null, // ---- 波次范围 / 大团购打包时长闸门 ---- currentWaveScope: null, @@ -571,6 +595,9 @@ export default { return Number(this.workbenchInfo?.status) === 1 }, searchPlaceholder() { + if (this.groupPackRetryReady) { + return '扫描商品条码重新上报' + } return this.workbenchMembers.length > 0 ? '扫描/输入运单号' : '请先扫描工牌登录' }, topbarOperatorText() { @@ -630,9 +657,9 @@ export default { orderBlockReason() { return this.checkOrderBlocked().reason }, - // 大团购打包倒计时展示文案(mm:ss) + // 大团购打包倒计时展示文案(mm:ss,秒四舍五入避免小数尾巴) packWaitRemainingText() { - const total = this.packWaitRemaining + const total = Math.round(this.packWaitRemaining) if (!total || total <= 0) { return '' } @@ -755,7 +782,8 @@ export default { return } // 连续重复扫码限制:与上一次扫描内容一致时不执行任何操作 - if (this.lastScannedCode === kw) { + // 失败态豁免:打包上报失败(重传弹窗/团单补报待命)时允许重扫同一码触发重试 + if (this.lastScannedCode === kw && !this.retryPopupOpen && !this.groupPackRetryReady) { diagDrop('duplicate-consecutive', { code: kw }) console.log('[packaging][scan] handlePackSearch skip: duplicate consecutive code =', kw) this.keyword = '' @@ -787,7 +815,7 @@ export default { this.isGroupOrder && this.precheckPassed && this.detailList.length > 0 && - !this.groupVerifyCompleted + (!this.groupVerifyCompleted || this.groupPackRetryReady) ) { this.matchProductBarcode(kw) return @@ -961,6 +989,11 @@ export default { return } + // 新查询成功:复位打包上报重试状态(key 重查计数 / 团单补报标记) + this.packKeyRetryCount = 0 + this.groupPackRetryReady = false + this.retryPopupOpen = false + const order = raw?.order && typeof raw.order === 'object' ? raw.order : {} const express = raw?.express && typeof raw.express === 'object' ? raw.express : {} const batch = raw?.batch && typeof raw.batch === 'object' ? raw.batch : {} @@ -1107,7 +1140,13 @@ export default { } return } - // 散单:预检通过立即自动上报开始打包 + // 散单:预检通过,依次播报各商品打包要求后自动上报开始打包 + this.detailList.forEach((item) => { + const req = item?.packingRequirements || '' + if (req) { + this.speak(req) + } + }) this.startPack() }, matchProductBarcode(barcode) { @@ -1122,6 +1161,11 @@ export default { this.keyword = '' this.speak('数据一致') uni.showToast({ title: '数据一致', icon: 'none', silentVoice: true }) + // 团单上报失败后(groupPackRetryReady):再次扫码已核实商品即重新上报 + if (this.groupPackRetryReady) { + this.retryPopupOpen = false + this.maybeAutoSubmitGroupPack() + } return } // 按商品种类:扫 1 次即标记为已核实,无需扫满数量 @@ -1129,7 +1173,8 @@ export default { target.scannedQty = Number(target.qty) || 0 this.addScanRecord(barcode) this.keyword = '' - this.speak('数据一致') + const req = target?.packingRequirements || '' + this.speak(req ? `数据一致,${req}` : '数据一致') uni.showToast({ title: '数据一致', icon: 'none', silentVoice: true }) // 全部核实后自动开始打包 this.maybeAutoSubmitGroupPack() @@ -1159,6 +1204,12 @@ export default { if (!item || !this.isGroupOrder) { return } + // 打包上报失败后(groupPackRetryReady):点击商品行即重新上报,失败会再次弹重传弹窗 + if (this.groupPackRetryReady) { + this.retryPopupOpen = false + this.maybeAutoSubmitGroupPack() + return + } const reason = this.verifyBlockReason(item) if (reason) { diagNote('免验-blocked', { reason, source: 'click', item: item?.name || item?.barcode || '' }) @@ -1192,6 +1243,12 @@ export default { if (!item || !this.isGroupOrder) { return } + // 打包上报失败后(groupPackRetryReady):右键商品行同样重新上报 + if (this.groupPackRetryReady) { + this.retryPopupOpen = false + this.maybeAutoSubmitGroupPack() + return + } const reason = this.verifyBlockReason(item) if (reason) { diagNote('免验-blocked', { reason, source: 'contextmenu', item: item?.name || item?.barcode || '' }) @@ -1227,7 +1284,8 @@ export default { // 直接标记为已核实(标绿),无需扫码 item.scannedQty = total this.addScanRecord(`免验:${item.name || item.barcode || ''}`) - this.speak('免验通过') + const req = item?.packingRequirements || '' + this.speak(req ? `免验通过,${req}` : '免验通过') uni.showToast({ title: `「${item.name || ''}」免验通过`, icon: 'none', silentVoice: true }) // 全部核实后自动开始打包 this.maybeAutoSubmitGroupPack() @@ -1313,10 +1371,10 @@ export default { reportPackOrder(status = 1) { const token = this.getWorkbenchToken() if (!token) { - return Promise.reject(new Error('工作台登录已失效')) + return Promise.reject(this.makePackError('工作台登录已失效', 401)) } if (!this.currentOrderKey) { - return Promise.reject(new Error('订单上下文缺失,请重新扫码查询')) + return Promise.reject(this.makePackError('订单上下文缺失,请重新扫码查询', 400)) } const payload = { token: String(token), @@ -1340,27 +1398,39 @@ export default { })) : undefined, } - return packOrder(payload).then((body) => { + // 显式 15s 超时:弱网下不无限挂起(请求层另有硬超时兜底) + return packOrder(payload, { timeout: 15000 }).then((body) => { const res = body?.data || body?.result || body const raw = res && typeof res === 'object' && !Array.isArray(res) ? res : null const flag = body?.flag || raw?.flag || '' + const bizCode = Number(body?.code ?? raw?.code ?? 0) if (this.checkWorkbenchAuthExpired(body)) { - throw new Error('工作台已解绑') + throw this.makePackError('工作台已解绑', bizCode || 401) } if (flag === 'failure') { - throw new Error(body?.message || body?.msg || '打包上报失败') + throw this.makePackError(body?.message || body?.msg || '打包上报失败', bizCode) } return body }) }, + /** 构造带业务码的打包上报错误(code 用于区分 400 key 失效 / 网络异常) */ + makePackError(message, code = 0) { + const err = new Error(message || '打包上报失败') + err.code = Number(code) || 0 + return err + }, startPack() { if (this.packReporting || this.packStarted) { return } this.packReporting = true + uni.showLoading({ title: '打包提交中...', mask: true }) this.reportPackOrder(1) .then((body) => { this.packStarted = true + // 上报成功后复位重试状态(key 重查计数 / 团单补报标记) + this.packKeyRetryCount = 0 + this.groupPackRetryReady = false // 大团购:按 packOrder 响应下发的倒计时字段启动「打包时长闸门」倒计时 this.applyPackCountdown(body) // 新打包提交成功后刷新今日打包统计(服务端为准) @@ -1371,12 +1441,93 @@ export default { uni.showToast({ title: '开始打包', icon: 'none', silentVoice: true }) }) .catch((err) => { - uni.showToast({ title: err?.message || '打包上报失败', icon: 'none' }) + this.handlePackReportFailure(err) }) .finally(() => { this.packReporting = false + uni.hideLoading() }) }, + /** + * 打包上报失败分流: + * - 401/403 已由 checkWorkbenchAuthExpired 处理(清状态回登录页),不再弹窗 + * - code=400(打包上下文 key 失效/过期)→ 自动重查一次拿新 key 再重提 + * - 其它(网络超时/断网/服务端业务失败)→ 弹重传弹窗 + */ + handlePackReportFailure(err) { + const code = Number(err?.code) || 0 + if (code === 401 || code === 403) { + return + } + if (code === 400) { + this.retryQueryForNewKey(err) + return + } + this.openRetryPopup(err?.message || '打包上报失败') + }, + /** + * key 失效自动重查一次:按最近查询条码重新拿 key 后再上报。 + * 仅重试一次(packKeyRetryCount >= 1 后改弹重传弹窗,避免死循环)。 + */ + retryQueryForNewKey(err) { + if (this.packKeyRetryCount >= 1) { + this.openRetryPopup(err?.message || '打包上报失败') + return + } + const code = this.currentOrderCode || this.lastScannedCode + const token = this.getWorkbenchToken() + if (!code || !token) { + this.openRetryPopup(err?.message || '打包上报失败') + return + } + this.packKeyRetryCount += 1 + queryPackOrder(String(token), code, { timeout: 15000 }) + .then((body) => { + if (this.checkWorkbenchAuthExpired(body)) { + return + } + const payload = body?.data || body?.result || body + const raw = + payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : null + const flag = body?.flag || raw?.flag || '' + if (flag === 'failure') { + this.openRetryPopup('打包上下文已失效,请重新扫码查询') + return + } + // 重查成功:更新服务端缓存 key(订单信息以重查结果为准),重试上报 + const key = this.pickInfoField(raw, body, ['key', 'order_key', 'orderKey']) || '' + if (key) { + this.currentOrderKey = key + } + this.startPack() + }) + .catch(() => { + // 重查失败:复位计数,恢复「待重传」能力(弹窗重传/重扫可再次触发重查) + this.packKeyRetryCount = 0 + this.openRetryPopup('网络异常,请稍后重试') + }) + }, + openRetryPopup(message) { + this.retryPopupOpen = true + this.retryPopupText = message || '打包上报失败' + // 团单:上报失败后保持核实状态,扫描商品条码/免验可重新上报 + if (this.isGroupOrder) { + this.groupPackRetryReady = true + } + }, + closeRetryPopup() { + this.retryPopupOpen = false + }, + /** 重传弹窗「重新上传」:保持核实状态重新上报,失败会再次弹出 */ + handleRetryPackReport() { + if (this.packReporting || this.packStarted) { + return + } + this.retryPopupOpen = false + // 重置 key 重查计数:本次手动重试允许重新走「400→自动重查一次」的恢复链路 + this.packKeyRetryCount = 0 + this.startPack() + }, /** * 读取 packOrder 响应下发的倒计时字段(仅大团购 wave_scope=1 非 0): * - pack_wait_seconds:需等待秒数 @@ -1441,7 +1592,7 @@ export default { } this.packFinishing = true try { - const body = await finishPack(String(token)) + const body = await finishPack(String(token), { timeout: 15000 }) if (this.checkWorkbenchAuthExpired(body)) { return } @@ -1470,6 +1621,11 @@ export default { this.sameOrderQuery = false this.precheckPassed = false this.packStarted = false + this.packReporting = false + this.packKeyRetryCount = 0 + this.groupPackRetryReady = false + this.retryPopupOpen = false + this.retryPopupText = '' // 波次范围与打包时长闸门倒计时复位 this.currentWaveScope = null this.stopPackCountdown() @@ -1481,25 +1637,18 @@ export default { if (!str) { return } - // 正在播报:不打断当前音频,只保留最新一条待播(快速连扫时合并为最后一条) + // FIFO:正在播报时按顺序排队,不丢任何一条 if (this.voicePlaying) { - this.voicePendingText = str - console.log('[语音播报] 正在播报,暂存待播文本:', str) + this.voiceQueue.push(str) + console.log('[语音播报] 正在播报,按顺序排队:', str, '待播队列长度:', this.voiceQueue.length) return } this.voicePlaying = true this.playSpeakText(str) }, normalizeSpeakText(text) { - let str = String(text || '').trim() - if (!str) { - return '' - } - // 长文本缩减:语音播报过长很啰嗦,超过 12 字符截断并以“等”收尾 - if (str.length > 12) { - str = str.slice(0, 12) + '等' - } - return str + // 播报文本不做截断,完整播报(仅去除首尾空白) + return String(text || '').trim() }, /** * 播报单条文本(串行队列执行单元) @@ -1531,10 +1680,9 @@ export default { }) }, scheduleNextSpeak() { - const next = this.voicePendingText - this.voicePendingText = '' + const next = this.voiceQueue.shift() if (next) { - console.log('[语音播报] 播放待播文本:', next) + console.log('[语音播报] 播放下一条:', next, '待播队列剩余:', this.voiceQueue.length) this.playSpeakText(next) } else { this.voicePlaying = false @@ -1547,14 +1695,9 @@ export default { speakViaHttp(msg) { return new Promise((resolve) => { let settled = false - let timeoutTimer = null const finish = (ok) => { if (!settled) { settled = true - if (timeoutTimer) { - clearTimeout(timeoutTimer) - timeoutTimer = null - } resolve(ok) } } @@ -1580,13 +1723,10 @@ export default { this.downloadVoiceAudio(src) .then((localSrc) => { this.playVoiceAudio(localSrc, finish) - // 超时兜底:5 秒后仍未播放完成也视为完成,避免一直等待 - timeoutTimer = setTimeout(() => finish(true), 5000) }) .catch(() => { // 下载失败回退为直接播远程地址 this.playVoiceAudio(src, finish) - timeoutTimer = setTimeout(() => finish(true), 5000) }) } catch (e) { console.error('[语音播报] HTTP 接口解析异常:', e) @@ -1633,6 +1773,18 @@ export default { this.voiceAudioContext = audio let playStarted = false let finished = false + let stallTimer = null + const finish = (ok) => { + if (finished) { + return + } + finished = true + if (stallTimer) { + clearTimeout(stallTimer) + stallTimer = null + } + onEnd(ok) + } const doPlay = () => { if (playStarted || finished) { return @@ -1643,23 +1795,26 @@ export default { console.log('[语音播报] 音频已开始播放') } catch (e) { console.error('[语音播报] 音频播放异常:', e) - onEnd(false) + finish(false) } } audio.onError((e) => { - finished = true console.warn('[语音播报] 音频播放错误:', e) - onEnd(false) + finish(false) }) audio.onEnded(() => { - finished = true console.log('[语音播报] 播放结束,总时长:', audio.duration, 's,实际播到:', audio.currentTime, 's') - onEnd(true) + finish(true) }) // 等缓冲就绪再播放:部分 Android 设备设置 src 后立即 play 会在缓冲不足时 // 截断尾帧(末字丢失);onCanplay 后再播更稳,500ms 兜底防止事件不触发 audio.onCanplay(() => { console.log('[语音播报] 音频可播放,总时长:', audio.duration, 's,来源:', String(src).startsWith('http') ? '远程' : '本地') + // 按真实时长设兜底(时长 + 3s 缓冲),替代固定 5s,避免长音频被中途截断 + const dur = Number(audio.duration) + if (!stallTimer) { + stallTimer = setTimeout(() => finish(true), dur > 0 ? Math.ceil((dur + 3) * 1000) : 30000) + } doPlay() }) audio.src = src @@ -1675,7 +1830,7 @@ export default { this.voiceNextTimer = null } this.voicePlaying = false - this.voicePendingText = '' + this.voiceQueue = [] if (this.voiceAudioContext) { try { this.voiceAudioContext.stop() @@ -3851,6 +4006,24 @@ export default { color: #d46b08; } +/* 打包上报失败提示条(弹窗关闭后常驻概要卡片顶部,红底红字) */ +.pack-retry-hint { + margin-bottom: 0.1rem; + background-color: #fdecec; + border: 0.01rem solid #f5c2c2; + border-radius: 0.08rem; + padding: 0.08rem 0.15rem; + box-sizing: border-box; + display: flex; + align-items: center; +} + +.pack-retry-hint-text { + font-size: 0.21rem; + font-weight: 600; + color: var(--wms-danger-strong); +} + /* 搜索输入框 */ .pack-search { background-color: var(--wms-card-bg); @@ -4135,9 +4308,14 @@ export default { /* 打包要求 */ .pack-detail-info-req { font-size: 0.22rem; - color: var(--wms-primary); + color: var(--wms-danger-strong); word-break: break-all; margin-top: 0.04rem; + background-color: #fef0f0; + padding: 0.03rem 0.1rem; + border-radius: 0.06rem; + align-self: flex-start; + max-width: 100%; } .pack-item-img-wrap { @@ -4217,7 +4395,8 @@ export default { } .pack-detail-row--scanned .pack-detail-info-req { - color: var(--wms-white); + color: var(--wms-danger-strong); + background-color: #fef0f0; } /* 今日打包 */ @@ -4564,6 +4743,34 @@ export default { flex: 1; } +/* 打包上报失败重试弹窗 */ +.retry-popup { + width: 5.57rem; + text-align: center; +} + +.retry-popup-title { + display: block; + font-size: 0.3rem; + font-weight: 600; + color: var(--wms-danger-strong); + text-align: center; + margin-bottom: 0.2rem; +} + +.retry-popup-text { + display: block; + padding: 0.16rem 0.2rem; + margin-bottom: 0.05rem; + font-size: 0.23rem; + line-height: 1.55; + color: #666; + background-color: #f5f6f8; + border-radius: 0.1rem; + text-align: left; + word-break: break-all; +} + /* 商品图片预览弹窗 */ .img-preview-mask { position: fixed;