diff --git a/src/views/storage/receiving/component/Product.vue b/src/views/storage/receiving/component/Product.vue index 892fa70f..6192e06b 100644 --- a/src/views/storage/receiving/component/Product.vue +++ b/src/views/storage/receiving/component/Product.vue @@ -1583,6 +1583,16 @@ const generateBatchImportList = async () => { const previewRows: any[] = [] const addItems: any[] = [] + interface ParsedImportRow { + rowIndex: number + systemProductId: number | undefined + spaceKeyword: string | undefined + itemPayload: any + } + + // 第一阶段:同步解析所有行 + const parsedRows: ParsedImportRow[] = [] + for (let index = 0; index < rawRows.length; index += 1) { const row = (rawRows[index] || {}) as Record const itemPayload: any = {} @@ -1624,29 +1634,87 @@ const generateBatchImportList = async () => { normalizeQuantityByTotalAndSpec(itemPayload) + if (Object.keys(itemPayload).length === 0) continue + + parsedRows.push({ rowIndex: index + 2, systemProductId, spaceKeyword, itemPayload }) + } + + // 第二阶段:SKU 商品信息并发查询(去重) + const skuIds = [ + ...new Set( + parsedRows + .map((parsedRow) => parsedRow.systemProductId) + .filter((id): id is number => id !== undefined && id > 0) + ) + ] + const productBySku = new Map() + await Promise.all( + skuIds.map(async (skuId) => { + productBySku.set(skuId, await querySystemProductById(skuId)) + }) + ) + + // 第三阶段:库位批量解析(非数字关键词一次 searchSpaces,数字 ID 并发精确查询,失败兜底 id 1) + const rowsByKeyword = new Map() + parsedRows.forEach((parsedRow) => { + if (!parsedRow.spaceKeyword) return + const bucket = rowsByKeyword.get(parsedRow.spaceKeyword) || [] + bucket.push(parsedRow) + rowsByKeyword.set(parsedRow.spaceKeyword, bucket) + }) + + const resolvedSpaceByKeyword = new Map() + const spaceKeywords = [...rowsByKeyword.keys()] + const textKeywords = spaceKeywords.filter((keyword) => { + const numericId = Number(keyword) + return !(Number.isFinite(numericId) && numericId > 0) + }) + + if (textKeywords.length) { + try { + const res: any = await indexApi.searchSpaces({ keywords: textKeywords }) + const data = res && (res.data || res.list || res) + const groups = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : [] + textKeywords.forEach((keyword, keywordIndex) => { + const list = Array.isArray(groups[keywordIndex]) ? groups[keywordIndex] : [] + resolvedSpaceByKeyword.set(keyword, pickSpaceFromList(list, keyword)) + }) + } catch (error) { + console.error('批量查询库位失败,兜底为默认收货区:', error) + textKeywords.forEach((keyword) => { + resolvedSpaceByKeyword.set(keyword, { id: 1, displayName: '默认收货区' }) + }) + } + } + + const numericKeywords = spaceKeywords.filter((keyword) => !resolvedSpaceByKeyword.has(keyword)) + await Promise.all( + numericKeywords.map(async (keyword) => { + resolvedSpaceByKeyword.set(keyword, await resolveSpaceByKeyword(keyword)) + }) + ) + + // 组装预览行 + parsedRows.forEach((parsedRow) => { + const itemPayload = parsedRow.itemPayload + const systemProductId = parsedRow.systemProductId if (systemProductId !== undefined) { - const product = await querySystemProductById(systemProductId) + const product = productBySku.get(systemProductId) if (product) { itemPayload.product_name = product.item_name || product.product_name || itemPayload.product_name itemPayload.barcode = normalizeBarcodeString(product.barcodes, product.barcode) || itemPayload.barcode } } - let resolvedSpaceKeyword = spaceKeyword ?? '' - if (spaceKeyword) { - const resolvedSpace = await resolveSpaceByKeyword(spaceKeyword) - if (resolvedSpace.id) { - itemPayload.space_id = resolvedSpace.id - } - if (resolvedSpace.displayName) { - resolvedSpaceKeyword = resolvedSpace.displayName - } + let resolvedSpaceKeyword = parsedRow.spaceKeyword ?? '' + if (parsedRow.spaceKeyword) { + const resolvedSpace = resolvedSpaceByKeyword.get(parsedRow.spaceKeyword) + if (resolvedSpace?.id) itemPayload.space_id = resolvedSpace.id + if (resolvedSpace?.displayName) resolvedSpaceKeyword = resolvedSpace.displayName } - if (Object.keys(itemPayload).length === 0) return - previewRows.push({ - row_no: index + 2, + row_no: parsedRow.rowIndex, system_product_id: itemPayload.system_product_id ?? '', barcode: itemPayload.barcode ?? '', product_name: itemPayload.product_name ?? '', @@ -1660,7 +1728,7 @@ const generateBatchImportList = async () => { remark: itemPayload.remark ?? '', item_payload: itemPayload }) - } + }) batchImportPreviewRows.value = previewRows addItems.push(...previewRows.map((r) => ({ item: { ...(r.item_payload || {}) } }))) @@ -1681,6 +1749,24 @@ const clearBatchImportData = () => { batchImportFileName.value = '' } +const pickSpaceFromList = (list: any[], keyword: string): { id?: number; displayName?: string } => { + if (!list.length) return {} + + const text = String(keyword || '').trim() + const exact = list.find((item: any) => { + const code = String(item?.space_code ?? '').trim() + const customName = String(item?.custom_name ?? item?.customName ?? '').trim() + const name = String(item?.space_name ?? item?.name ?? '').trim() + return code === text || customName === text || name === text + }) || list[0] + + const id = Number(exact?.id) + return { + id: Number.isFinite(id) && id > 0 ? id : undefined, + displayName: getSpaceDisplayName(exact) + } +} + const resolveSpaceByKeyword = async (keyword: string): Promise<{ id?: number; displayName?: string }> => { const text = String(keyword || '').trim() if (!text) return {} @@ -1700,22 +1786,14 @@ const resolveSpaceByKeyword = async (keyword: string): Promise<{ id?: number; di } } - const res: any = await indexApi.searchSpace({ keyword: text, page: 1, pageSize: 20 }) - const data = res && (res.data || res.list || res) - const list = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : [] - if (!list.length) return {} - - const exact = list.find((item: any) => { - const code = String(item?.space_code ?? '').trim() - const customName = String(item?.custom_name ?? item?.customName ?? '').trim() - const name = String(item?.space_name ?? item?.name ?? '').trim() - return code === text || customName === text || name === text - }) || list[0] - - const id = Number(exact?.id) - return { - id: Number.isFinite(id) && id > 0 ? id : undefined, - displayName: getSpaceDisplayName(exact) + try { + const res: any = await indexApi.searchSpace({ keyword: text, page: 1, pageSize: 20 }) + const data = res && (res.data || res.list || res) + const list = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : [] + return pickSpaceFromList(list, text) + } catch (error) { + console.error('查询库位失败,兜底为默认收货区:', text, error) + return { id: 1, displayName: '默认收货区' } } } diff --git a/src/views/warehouse/components/RackBulkModifyDialog.vue b/src/views/warehouse/components/RackBulkModifyDialog.vue index ef645852..8ce83031 100644 --- a/src/views/warehouse/components/RackBulkModifyDialog.vue +++ b/src/views/warehouse/components/RackBulkModifyDialog.vue @@ -445,39 +445,41 @@ async function validateAll() { // ignore } } else { - // validate existence by searchSpace - const uniques = Array.from(new Set(items.value.map(r => String(r.space_code || '').trim()).filter(Boolean))) - await Promise.all(uniques.map(async (code) => { - try { - const res: any = await indexApi.searchSpace({ keyword: code }) - const data = res && (res.data || res.list || res) - const item = Array.isArray(data) ? (data[0] || null) : data + // validate existence by searchSpaces(一次批量查询,分组与关键词一一对应) + const uniques = Array.from( + new Set(items.value.map((r) => String(getRowValue(r, 'space_code') ?? '').trim()).filter(Boolean)) + ) + if (!uniques.length) return + + const markRowsByCode = (code: string, message: string) => { + items.value.forEach((r, i) => { + if (String(getRowValue(r, 'space_code') ?? '').trim() === code) { + errors[i] = (errors[i] ? errors[i] + ';' : '') + message + } + }) + } + + try { + const res: any = await indexApi.searchSpaces({ keywords: uniques }) + const data = res && (res.data || res.list || res) + const groups = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : [] + uniques.forEach((code, codeIndex) => { + const list = Array.isArray(groups[codeIndex]) ? groups[codeIndex] : [] + const item = list[0] || null if (!item) { // mark all rows with this code - items.value.forEach((r, i) => { - if (String(getRowValue(r, 'space_code') ?? '').trim() === code) { - errors[i] = (errors[i] ? errors[i] + ';' : '') + '仓位不存在' - } - }) + markRowsByCode(code, '仓位不存在') } else { // if item has zone/type info and not rack, try to detect const zoneType = item.zone?.zone_type || item.zone_type || item.type || item.parent_type || '' if (zoneType && String(zoneType) !== 'rack') { - items.value.forEach((r, i) => { - if (String(getRowValue(r, 'space_code') ?? '').trim() === code) { - errors[i] = (errors[i] ? errors[i] + ';' : '') + '仓位不属于货架类型' - } - }) + markRowsByCode(code, '仓位不属于货架类型') } } - } catch (e) { - items.value.forEach((r, i) => { - if (String(r.space_code || '').trim() === code) { - errors[i] = (errors[i] ? errors[i] + ';' : '') + '仓位校验失败' - } - }) - } - })) + }) + } catch (e) { + uniques.forEach((code) => markRowsByCode(code, '仓位校验失败')) + } } }