|
|
@@ -242,10 +242,13 @@ const isLocationInRecommendedList = (locationCode) => {
|
|
|
return locationList.value.some(item => getRecommendedLocationCode(item) === scanned)
|
|
|
}
|
|
|
|
|
|
-// 从已排除库位记录中提取 locationId 列表(换一换时使用)
|
|
|
+// 从已排除库位记录中提取 locationId 列表(换一换时使用,INVENTORY 类型不排除)
|
|
|
const getExcludedLocationIds = (list) => {
|
|
|
- if (!list.length) return undefined
|
|
|
- return [...new Set(list.map(loc => (typeof loc === 'string' ? loc : loc?.locationId)).filter(Boolean))]
|
|
|
+ const ids = [...new Set(list.map(loc => {
|
|
|
+ if (loc?.displayType === 'INVENTORY') return null
|
|
|
+ return loc?.locationId
|
|
|
+ }).filter(Boolean))]
|
|
|
+ return ids.length ? ids : undefined
|
|
|
}
|
|
|
|
|
|
// 单一批次命中:获取推荐库位并进入库位扫描
|