|
|
|
@ -282,7 +282,7 @@ |
|
|
|
<div class="scan-modal-content"> |
|
|
|
<!-- 扫进时显示层数选择和位置网格 - rqrq --> |
|
|
|
<div v-if="operationType === 'in'" class="modal-form"> |
|
|
|
<!-- 层数选择(混装托盘不显示) - rqrq --> |
|
|
|
<!-- 单层托盘保留选层显示并默认高亮第1层,多层托盘仍可手动切换 - rqrq --> |
|
|
|
<div v-if="!currentMixedMode && scanLayerOptions.length > 0" class="input-group"> |
|
|
|
<label class="input-label">层数(当前选择:第{{ scanLayer }}层)</label> |
|
|
|
<div class="layer-grid"> |
|
|
|
@ -300,7 +300,7 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 位置网格选择器 - rqrq --> |
|
|
|
<!-- 始终显示位置网格;托盘仅有一个位置且可用时自动高亮,层数与位置均已选中后聚焦扫码框 - rqrq --> |
|
|
|
<div class="input-group"> |
|
|
|
<label class="input-label"> |
|
|
|
位置{{ currentSelectedPosition ? `(当前选择:${currentSelectedPosition})` : '' }} |
|
|
|
@ -326,6 +326,10 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- 唯一位置不可用时说明扫码口禁用原因,避免操作员误以为扫码故障 - rqrq --> |
|
|
|
<div v-if="positionGrid.length === 1 && !positionGridLoading && !currentSelectedPosition" class="input-label"> |
|
|
|
位置{{ positionGrid[0].position }}当前不可用,请检查托盘位置状态 |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 标签扫描 - rqrq --> |
|
|
|
@ -675,6 +679,8 @@ export default { |
|
|
|
this.scanCode = '' |
|
|
|
this.scanPosition = '' |
|
|
|
this.scanLayer = 1 |
|
|
|
// 新栈板先清掉旧托盘层高,后续以当前栈板类型和可用位置接口返回值为准 - rqrq |
|
|
|
this.currentMaxLayer = 0 |
|
|
|
this.currentSelectedPosition = '' |
|
|
|
this.sortingList = [] |
|
|
|
this.originalDetailCache = {} |
|
|
|
@ -799,7 +805,11 @@ export default { |
|
|
|
showScanModal() { |
|
|
|
this.scanModalVisible = true |
|
|
|
this.scanCode = '' |
|
|
|
// 每次打开扫码弹窗清除上次托盘的位置,防止尚未加载新位置时误扫到旧位置 - rqrq |
|
|
|
this.scanPosition = '' |
|
|
|
this.currentSelectedPosition = '' |
|
|
|
this.positionGrid = [] |
|
|
|
this.availablePositions = [] |
|
|
|
this.needRefreshOnClose = false |
|
|
|
if (this.operationType === 'in') { |
|
|
|
this.scanLayer = 1 |
|
|
|
@ -846,8 +856,12 @@ export default { |
|
|
|
}, |
|
|
|
// 按层加载位置网格与可扫位置,确保禁用态/加载态与原页面一致 - rqrq |
|
|
|
loadAvailablePositions() { |
|
|
|
// 刷新位置期间暂停扫码,返回后仅恢复仍可用的上次选择;失败时保持禁用,避免误写已占用位置 - rqrq |
|
|
|
const selectedPosition = this.currentSelectedPosition |
|
|
|
this.positionGridLoading = true |
|
|
|
this.availablePositions = [] |
|
|
|
this.currentSelectedPosition = '' |
|
|
|
this.scanPosition = '' |
|
|
|
getPalletDetails({ |
|
|
|
site: this.site, |
|
|
|
palletId: this.palletCode, |
|
|
|
@ -870,11 +884,28 @@ export default { |
|
|
|
if (data && data.code === 0) { |
|
|
|
const result = data.data || {} |
|
|
|
const positions = result.positions || [] |
|
|
|
// 以当前栈板接口返回的层高为准,避免类型清单尚未加载时把单层托盘当成不限高 - rqrq |
|
|
|
if (result.maxLayer != null) { |
|
|
|
this.currentMaxLayer = Number(result.maxLayer) |
|
|
|
if (this.currentMaxLayer > 0) { |
|
|
|
this.scanLayerOptions = Array.from({ length: this.currentMaxLayer }, (_, i) => i + 1) |
|
|
|
} |
|
|
|
} |
|
|
|
this.availablePositions = result.availablePositions || [] |
|
|
|
this.positionGrid = positions.map((position) => ({ |
|
|
|
position, |
|
|
|
count: positionCountMap[position] || 0 |
|
|
|
})) |
|
|
|
// 单位置托盘只在位置可用时默认选中;不可用或多位置时清理失效选择,避免扫码提交到错误位置 - rqrq |
|
|
|
if (positions.length === 1 && this.availablePositions.includes(positions[0])) { |
|
|
|
this.currentSelectedPosition = positions[0] |
|
|
|
this.scanPosition = positions[0] |
|
|
|
this.moveFocusToScanInput() |
|
|
|
} else if (this.availablePositions.includes(selectedPosition)) { |
|
|
|
this.currentSelectedPosition = selectedPosition |
|
|
|
this.scanPosition = selectedPosition |
|
|
|
this.moveFocusToScanInput() |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.availablePositions = [] |
|
|
|
this.positionGrid = [] |
|
|
|
|