|
@@ -590,16 +590,17 @@ const _getRecommendedLocation = async (item, options = {}) => {
|
|
|
const res = await getRecommendedLocationNew(params)
|
|
const res = await getRecommendedLocationNew(params)
|
|
|
if (res.data) {
|
|
if (res.data) {
|
|
|
forcePublishEnabled.value = res.data.forbidForcePutaway
|
|
forcePublishEnabled.value = res.data.forbidForcePutaway
|
|
|
- const loc = res.data
|
|
|
|
|
|
|
+ const loc = res.data.locationList
|
|
|
if (fromChangeLocation) {
|
|
if (fromChangeLocation) {
|
|
|
- // 按批次维度存储已推荐库位,用于后续换一换排除
|
|
|
|
|
|
|
+ // 按批次维度存储已推荐库位(与接口 locationList 项一致,含 locationId),用于后续换一换排除
|
|
|
const lotExcluded = excludedLocations.value[lotNumber] || []
|
|
const lotExcluded = excludedLocations.value[lotNumber] || []
|
|
|
|
|
+ const recommended = Array.isArray(loc) ? loc : []
|
|
|
excludedLocations.value = {
|
|
excludedLocations.value = {
|
|
|
...excludedLocations.value,
|
|
...excludedLocations.value,
|
|
|
- [lotNumber]: [...lotExcluded, loc]
|
|
|
|
|
|
|
+ [lotNumber]: [...lotExcluded, ...recommended]
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- locationList.value = [loc]
|
|
|
|
|
|
|
+ locationList.value = loc
|
|
|
searchCount.value = 1
|
|
searchCount.value = 1
|
|
|
}
|
|
}
|
|
|
} catch (err) {
|
|
} catch (err) {
|