feat: 新增称重页面,修复真机扫描丢码与设置面板样式

- 称重页(weighing):占位页重写为完整称重功能
  按运单号查询订单(index.toOrder)+订单详情(order.detail),
  校验拣货/复核/打包状态(团单跳过打包校验)后展示订单信息,
  支持手动/步进调整重量并提交称重(updateExpressWeighingWeight),
  支持扫描枪扫运单号、扫描记录本地缓存(最多50条)、软键盘模式恢复
- 扫描去重(scan.js):由「锁定单一事件类型」改为「按键去重」
  修复真机 keydown/keyup 触发不稳定导致丢字符、广播扫描未扫完就发送、首扫不完整
- API:新增 fetchOrderByWaybill、fetchOrderDetailForWeigh"
This commit is contained in:
zm2000 2026-10-26 18:15:04 +08:00
parent fb87c56f3d
commit b579554b77
5 changed files with 1047 additions and 54 deletions

View File

@ -210,3 +210,21 @@ export function finishPack(token: string, options?: RequestOptions) {
...options,
})
}
/**
* 称重-按运单号查询订单(index.toOrder)
* 与散单 Web / WMS_PDA 端称重页一致:入参运单号,返回订单 ID(order_id)与波次信息(waves)。
*/
export function fetchOrderByWaybill(
waybillCode: string,
options?: RequestOptions
) {
return request<ApiBody>(
'index.toOrder',
{
...workerPayload,
waybill_code: waybillCode,
},
options
)
}

View File

@ -438,3 +438,25 @@ export function bindExpressPackageMaterialByWaybill(
options
)
}
/**
* 称重-按订单 ID 查询订单详情(order.detail,dispatch 视图)
* 与 WMS_PDA 称重页一致:返回 detail(订单头:wave_no / pick_status / recheck_status /
* pack_status / items_weight)、items(商品明细)、expresses(运单列表,含 waybill_code 与
* weighing_weight)。
* @param orderId 订单 ID(index.toOrder 返回的 order_id)
*/
export function fetchOrderDetailForWeigh(
orderId: number | string,
options?: RequestOptions
) {
return request<ApiBody>(
'order.detail',
{
...workerPayload,
order_id: orderId,
tableType: 'dispatch',
},
options
)
}

View File

@ -82,6 +82,10 @@ let plusShiftPrev = false
let plusLetterCase = 'auto'
let plusLetterCaseLag = 1
let plusKeyEventType = null
// 按键去重(替代事件类型锁定):同一键 keydown/keyup 成对到达只处理一次
let prevPlusKeyCode = 0
let prevPlusKeyType = ''
let prevPlusKeyAt = 0
function debug(...args) {
if (receiver && typeof receiver.onScanDebug === 'function') {
@ -362,13 +366,8 @@ function isPlusEnterKey(keyCode, text) {
function handlePlusKeyEvent(event, type) {
const keyCode = Number((event && event.keyCode) || 0)
const gap = markKeyArrival('plus', { keyCode, type })
// 空闲后重新锁定实际生效的事件类型:自愈「锁错就永久静默」
if (plusKeyEventType && gap > IDLE_LOCK_RESET_MS) {
const locked = plusKeyEventType
plusKeyEventType = null
diagHeal('event-type-lock-idle-reset', { scope: receiverScope(), locked, gapMs: gap })
}
const now = Date.now()
markKeyArrival('plus', { keyCode, type })
if (!receiver || paused) {
diagDrop(receiver ? 'paused' : 'no-receiver', {
scope: receiverScope(),
@ -401,21 +400,21 @@ function handlePlusKeyEvent(event, type) {
return
}
// 锁定实际生效的事件类型,避免 keydown/keyup 都触发时把一个键记两次
if (!plusKeyEventType) {
plusKeyEventType = type
}
if (plusKeyEventType !== type) {
// 这一类丢弃最致命(整串码会丢),必须带上已收到的内容
diagDrop('event-type-locked', {
// 去重:同一键的 keydown/keyup 成对到达(type 不同 + keyCode 相同 + 间隔 <20ms)只处理一次。
// 不再锁定单一事件类型:真机 keydown/keyup 触发不稳定,锁错会丢字符,
// 导致「广播扫描还没扫完就发送、首扫不完整」
if (prevPlusKeyCode === keyCode && prevPlusKeyType !== type && now - prevPlusKeyAt < 20) {
diagDrop('plus-dedup', {
scope: receiverScope(),
keyCode,
type,
locked: plusKeyEventType,
dropped: bufferTail(),
})
return
}
prevPlusKeyCode = keyCode
prevPlusKeyType = type
prevPlusKeyAt = now
if (text) {
const now = Date.now()
@ -467,6 +466,9 @@ function removePlusListener() {
// #endif
plusAttached = false
plusKeyEventType = null
prevPlusKeyCode = 0
prevPlusKeyType = ''
prevPlusKeyAt = 0
plusShiftDown = false
plusShiftPrev = false
diagSetGates({ plusAttached: false })
@ -522,6 +524,9 @@ export function setScanPaused(value) {
resetBuffer()
} else {
plusKeyEventType = null
prevPlusKeyCode = 0
prevPlusKeyType = ''
prevPlusKeyAt = 0
}
}
@ -550,7 +555,7 @@ export function getScanDiagState() {
paused,
receiver: !!receiver,
plusAttached,
eventTypeLock: plusKeyEventType,
eventTypeLock: 'keycode-dedup',
minLength,
bufferLength: buffer.length,
lastKeyAgoMs: lastAnyKeyAt ? Date.now() - lastAnyKeyAt : null,
@ -580,7 +585,7 @@ export function startScanSelfHeal(intervalMs) {
paused,
receiver: !!receiver,
plusAttached,
eventTypeLock: plusKeyEventType || 'none',
eventTypeLock: 'keycode-dedup',
idleSec: lastAnyKeyAt ? Math.round((now - lastAnyKeyAt) / 1000) : 'never',
},
// 真机:Window 焦点 / 输入法状态(决定按键能否到达 WebView),H5 返回空对象

View File

@ -423,37 +423,37 @@
<view class="setting-row">
<text class="setting-row-label">复核流程</text>
<view class="setting-seg setting-seg--nowrap">
<text :class="['setting-seg-item', selectedReviewProcess === '先打印后复核' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('先打印后复核')">先打印后复核</text>
<text :class="['setting-seg-item', selectedReviewProcess === '先复核后打印' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('先复核后打印')">先复核后打印</text>
<text :class="['setting-seg-item', selectedReviewProcess === '不打印' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('不打印')">不打印</text>
<view :class="['setting-seg-item', selectedReviewProcess === '先打印后复核' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('先打印后复核')">先打印后复核</view>
<view :class="['setting-seg-item', selectedReviewProcess === '先复核后打印' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('先复核后打印')">先复核后打印</view>
<view :class="['setting-seg-item', selectedReviewProcess === '不打印' ? 'setting-seg-item--on' : '']" @click="setReviewProcess('不打印')">不打印</view>
</view>
</view>
<view class="setting-row">
<text class="setting-row-label">称重模式</text>
<view class="setting-seg">
<text :class="['setting-seg-item', selectedWeigh === '称重' ? 'setting-seg-item--on' : '']" @click="setWeighSetting('称重')">称重</text>
<text :class="['setting-seg-item', selectedWeigh === '不称重' ? 'setting-seg-item--on' : '']" @click="setWeighSetting('不称重')">不称重</text>
<view :class="['setting-seg-item', selectedWeigh === '称重' ? 'setting-seg-item--on' : '']" @click="setWeighSetting('称重')">称重</view>
<view :class="['setting-seg-item', selectedWeigh === '不称重' ? 'setting-seg-item--on' : '']" @click="setWeighSetting('不称重')">不称重</view>
</view>
</view>
<view class="setting-row">
<text class="setting-row-label">绑定包材</text>
<view class="setting-seg">
<text :class="['setting-seg-item', settingBindPackage ? 'setting-seg-item--on' : '']" @click="setSettingBindPackage(true)">开启</text>
<text :class="['setting-seg-item', !settingBindPackage ? 'setting-seg-item--on' : '']" @click="setSettingBindPackage(false)">关闭</text>
<view :class="['setting-seg-item', settingBindPackage ? 'setting-seg-item--on' : '']" @click="setSettingBindPackage(true)">开启</view>
<view :class="['setting-seg-item', !settingBindPackage ? 'setting-seg-item--on' : '']" @click="setSettingBindPackage(false)">关闭</view>
</view>
</view>
<view class="setting-row">
<text class="setting-row-label">包材软键盘</text>
<view class="setting-seg">
<text :class="['setting-seg-item', settingPmKeyboard ? 'setting-seg-item--on' : '']" @click="setSettingPmKeyboard(true)">激活</text>
<text :class="['setting-seg-item', !settingPmKeyboard ? 'setting-seg-item--on' : '']" @click="setSettingPmKeyboard(false)">不激活</text>
<view :class="['setting-seg-item', settingPmKeyboard ? 'setting-seg-item--on' : '']" @click="setSettingPmKeyboard(true)">激活</view>
<view :class="['setting-seg-item', !settingPmKeyboard ? 'setting-seg-item--on' : '']" @click="setSettingPmKeyboard(false)">不激活</view>
</view>
</view>
<view class="setting-row">
<text class="setting-row-label">发货模式</text>
<view class="setting-seg">
<text :class="['setting-seg-item', settingShipMode === 'auto' ? 'setting-seg-item--on' : '']" @click="setSettingShipMode('auto')">自动发货</text>
<text :class="['setting-seg-item', settingShipMode === 'manual' ? 'setting-seg-item--on' : '']" @click="setSettingShipMode('manual')">手动发货</text>
<view :class="['setting-seg-item', settingShipMode === 'auto' ? 'setting-seg-item--on' : '']" @click="setSettingShipMode('auto')">自动发货</view>
<view :class="['setting-seg-item', settingShipMode === 'manual' ? 'setting-seg-item--on' : '']" @click="setSettingShipMode('manual')">手动发货</view>
</view>
</view>
</view>
@ -5912,7 +5912,6 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
gap: 0.15rem;
padding: 0.15rem 0.04rem;
border-bottom: 0.01rem solid #f0f2f6;
}
@ -5931,23 +5930,27 @@ export default {
display: flex;
align-items: center;
flex-wrap: wrap;
/* 按钮间隔走 gap(真机已实测可用) */
gap: 0.2rem;
margin-left: 0.15rem;
}
.setting-seg-item {
margin-right: 0.08rem;
display: flex;
align-items: center;
justify-content: center;
padding: 0.05rem 0.25rem;
font-size: 0.21rem;
color: var(--wms-text-secondary);
background-color: var(--wms-card-bg);
border: 0.01rem solid var(--wms-border-alt);
/* 未选中态用浅灰底(而非白底):真机 rem 缩放后边框几乎不可见、白底与弹窗同色,
按钮之间会“糊成一片”看不出间隔;浅灰底让每个按钮边界清晰可见 */
background-color: var(--wms-bg-subtle);
border: 0.01rem solid var(--wms-border);
border-radius: 0.07rem;
cursor: pointer;
user-select: none;
white-space: nowrap;
}
.setting-seg-item:last-child {
margin-right: 0;
box-sizing: border-box;
}
.setting-seg-item--on {

File diff suppressed because it is too large Load Diff