From 32459a98edfbbe2efbde289e3c2b9ac4f40241c6 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 24 Jun 2026 18:14:36 +0800 Subject: [PATCH] 624 --- src/api/storage.entry/entry.ts | 185 +++- src/components/ScanBox/index.vue | 25 +- .../component/SelectProductDialog.vue | 121 ++- .../orderManagement/styles/order-sub.scss | 92 +- .../utils/stock-picker-helpers.ts | 119 ++- .../waveOrder/GroupWaveBatchListPanel.vue | 7 +- .../waveOrder/SandanWaveBatchListPanel.vue | 7 +- .../order/waveOrder/WavePickTaskListPanel.vue | 10 +- .../component/WaveBatchDetailPanel.vue | 48 +- .../order/waveOrder/config/wave-config.ts | 69 +- .../stock/combo_stock/combo-stock-config.ts | 2 +- src/views/stock/combo_stock/index.vue | 58 +- src/views/stock/stock/index.vue | 182 +--- src/views/stock/stock/stock-config.ts | 141 +-- .../component/BindReceivingDetailsDialog.vue | 30 +- .../entry/component/QuickInboundForm.vue | 326 ++++++ .../entry/component/ReceivingCompareForm.vue | 961 ++++++++++++++++++ .../UnbindReceivingDetailsDialog.vue | 8 +- .../storage/entry/component/entrydetail.vue | 1 + .../storage/entry/component/entryoperate.vue | 166 +-- src/views/storage/entry/entry-config.ts | 336 +++++- src/views/storage/entry/index.vue | 240 ++--- src/views/storage/inventory/index.vue | 181 +--- .../storage/inventory/inventory-config.ts | 83 +- src/views/storage/log/index.vue | 175 +--- src/views/storage/log/log-config.ts | 86 +- src/views/storage/receiving/index.vue | 192 +--- .../storage/receiving/receiving-config.ts | 155 ++- src/views/storage/report/index.vue | 4 +- src/views/storage/stockout/index.vue | 129 +-- src/views/storage/stockout/stockout-config.ts | 82 +- 31 files changed, 2774 insertions(+), 1447 deletions(-) create mode 100644 src/views/storage/entry/component/QuickInboundForm.vue create mode 100644 src/views/storage/entry/component/ReceivingCompareForm.vue diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index fabc0c99..a61a3c89 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -74,9 +74,33 @@ export type EntryDetailBinding = { [key: string]: unknown } +export type EntryDetailItemBarcode = { + id?: number + barcode?: string + sku_property?: string + [key: string]: unknown +} + export type EntryDetailItem = { id?: number stock_id?: number + external_item_code?: string + external_item_id?: number + warehouse_item_code?: string + warehouse_item_name?: string + warehouse_item_spec?: string + count?: number + received_quantity?: number + confirm_quantity?: number + warehouse_quantity?: number + warehouse_locked_quantity?: number + warehouse_is_batch_mgmt?: string + warehouse_is_shelf_life_mgmt?: string + warehouse_image_url?: string + warehouse_is_images?: number + barcodes?: EntryDetailItemBarcode[] + direct_inbound_quantity?: number + remaining_quantity?: number /** 当前 pending 绑定的总预分配数量 */ pending_total?: number /** 计划入库数量(= count) */ @@ -163,7 +187,23 @@ export function cancelEntry(data: CancelEntryParams): Promise { +export type CompleteEntryParams = { + /** 入库单ID */ + entry_order_id: number +} + +export type CompleteEntryResponse = { + code?: number + message?: string + entry_order_id?: number + order_status?: string + data?: { + entry_order_id?: number + order_status?: string + } +} + +export function completeEntry(data: CompleteEntryParams): Promise { return request({ url: '/system', method: 'post', @@ -194,23 +234,39 @@ export function detailChange(data:any): Promise { } export type BindReceivingDetailsBinding = { + entry_item_id: number receiving_detail_id: number allocated_quantity: number } export type BindReceivingDetailsParams = { - entry_item_id: number + /** 入库单ID */ + entry_order_id: number bindings: BindReceivingDetailsBinding[] } +export type BindReceivingDetailsResultItem = { + entry_item_id?: number + receiving_detail_id?: number + allocated_quantity?: number + error_code?: string + message?: string + detail?: string + [key: string]: unknown +} + export type BindReceivingDetailsResponse = { code?: number message?: string - entry_item_id?: number - binding_count?: number + success?: BindReceivingDetailsResultItem[] + failed?: BindReceivingDetailsResultItem[] + success_count?: number + failed_count?: number data?: { - entry_item_id?: number - binding_count?: number + success?: BindReceivingDetailsResultItem[] + failed?: BindReceivingDetailsResultItem[] + success_count?: number + failed_count?: number } } @@ -512,3 +568,120 @@ export function removeDirectInboundItem( data }) } + +export type QuickInboundParams = { + /** 入库单ID */ + id: number +} + +export type QuickInboundResponse = { + code?: number + message?: string + id?: number + entry_order_code?: string + order_status?: string + sync_status?: string + items_count?: number + total_quantity?: number + data?: Partial +} + +/** 快速入库(一键完成入库单) */ +export function quickInbound(data: QuickInboundParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.quickInbound', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export type ReceivingCompareMatchStatus = 'matched' | 'entry_only' | string + +/** 逐行对照项(comparison 数组元素) */ +export type ReceivingCompareRow = { + stock_id?: number + item_code?: string + warehouse_item_code?: string + product_code?: string + item_name?: string + product_name?: string + warehouse_item_name?: string + barcode?: string + entry_plan_qty?: number + entry_received_qty?: number + plan_qty?: number + count?: number + received_quantity?: number + receiving_qty?: number + receiving_quantity?: number + actual_quantity?: number + box_quantity?: number + match_status?: ReceivingCompareMatchStatus + [key: string]: unknown +} + +/** 汇总统计(summary 对象) */ +export type ReceivingCompareSummary = { + total_rows?: number + total_entry_items?: number + total_receiving_items?: number + matched_items?: number + entry_only_items?: number + receiving_only_items?: number + unmatched_items?: number + matched_count?: number + entry_only_count?: number + receiving_only_count?: number + unmatched_count?: number + total_entry_qty?: number + total_receiving_qty?: number + matched_qty?: number + entry_only_qty?: number + receiving_only_qty?: number + match_rate?: number + is_fully_matched?: boolean + fully_matched?: boolean + comparison_rows?: number + [key: string]: unknown +} + +export type ReceivingCompareParams = { + /** 入库单ID */ + entry_order_id: number + /** 收货单ID */ + receiving_id: number +} + +export type ReceivingCompareResponse = { + code?: number + message?: string + entry_order_id?: number + entry_order_code?: string + receiving_id?: number + receiving_number?: string + comparison?: ReceivingCompareRow[] + receiving_only?: ReceivingCompareRow[] + summary?: ReceivingCompareSummary + data?: Partial> +} + +/** 入库单与收货单商品对照 */ +export function receivingCompare( + data: ReceivingCompareParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.receivingCompare', + v, + timestamp: new Date().getTime() + }, + data + }) +} diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 4d24207f..6763e65f 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -1308,7 +1308,7 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su .scan-tabs { flex-shrink: 0; - border-bottom: 1px solid #e8e8e8; + border-bottom: 1px solid #ebeef5; background: #fafafa; } @@ -1317,13 +1317,34 @@ defineExpose({ getConditions, reset, clear, getFieldDraft, setFieldCondition, su } .scan-tabs :deep(.el-tabs__nav-wrap::after) { - height: 1px; + display: none; +} + +.scan-tabs :deep(.el-tabs__active-bar) { + display: none; } .scan-tabs :deep(.el-tabs__item) { height: 40px; line-height: 40px; font-size: 13px; + padding: 0 12px; + color: #606266; + border: 1px solid transparent; + border-bottom: none; + border-radius: 4px 4px 0 0; + transition: color 0.2s; +} + +.scan-tabs :deep(.el-tabs__item:hover) { + color: var(--el-color-primary); +} + +.scan-tabs :deep(.el-tabs__item.is-active) { + color: var(--el-color-primary); + background-color: #fff; + border-color: #ebeef5; + border-bottom-color: #fff; } .tab-label { diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue index 28470fc9..c4e22007 100644 --- a/src/views/order/orderManagement/component/SelectProductDialog.vue +++ b/src/views/order/orderManagement/component/SelectProductDialog.vue @@ -11,6 +11,7 @@
货主 ID:{{ storeId }} 全部货主 + 组合搜索已展开为子商品 已选 {{ localSelectedItems.length }} 个
@@ -46,17 +47,16 @@ @selection-change="handleSelectionChange" > - - + + + +
@@ -74,12 +74,6 @@
已选商品
- - - @@ -107,11 +101,12 @@ import { nextTick, reactive, ref, watch } from 'vue' import { ElMessage } from 'element-plus' import { applyStockMatchToSelectedItem, + expandComboSearchResults, findStockRowForSelectedItem, getStockItemId, indexStockRowsByLookupKeys, isStockApiSuccess, - mapWarehousePickerItem, + mapStockPickerItem, queryStockProducts, toOrderSelectedProductItem, type OrderSelectedProductItem, @@ -143,12 +138,13 @@ function currentWarehouseMode(): WarehouseSearchMode | undefined { } function tableRowKey(row: any) { - if (searchMode.value === 'combo') { - return row?.combo_id ?? row?.id ?? row?.item_id - } return row?.item_id } +function getPickerRowItemId(row: any): number | undefined { + return getStockItemId(row) +} + function normalizeKeyword() { const raw = keyword.value if (!raw) return @@ -162,6 +158,11 @@ function normalizeKeyword() { keyword.value = normalized } } + +function buildSelectedItemFromStock(row: any, planQty: string): SelectProductItem | null { + return toOrderSelectedProductItem(row, { planQty }) +} + const defaultPlanQty = ref('1') const allRows = ref([]) const list = ref([]) @@ -224,10 +225,6 @@ function hasValidItemId(item: SelectProductItem) { return Number.isInteger(itemId) && itemId > 0 } -function buildSelectedItemFromStock(row: any, planQty: string): SelectProductItem | null { - return toOrderSelectedProductItem(row, { planQty, mode: currentWarehouseMode() }) -} - function enrichLocalSelectedItemsFromRows(rows: any[], mode?: WarehouseSearchMode) { if (!localSelectedItems.value.length || !rows.length) return @@ -246,36 +243,42 @@ function needsStockMatchEnrichment(item: SelectProductItem) { } async function enrichLocalSelectedItems() { - enrichLocalSelectedItemsFromRows(allRows.value, currentWarehouseMode()) + enrichLocalSelectedItemsFromRows(allRows.value) const pendingItems = localSelectedItems.value.filter((item) => needsStockMatchEnrichment(item)) if (!pendingItems.length) return - const stockCodes = Array.from(new Set( - pendingItems.filter((item) => !item.is_combo).map((item) => String(item.item_code).trim()).filter(Boolean) + const codes = Array.from(new Set( + pendingItems.map((item) => String(item.item_code).trim()).filter(Boolean) )) - const comboCodes = Array.from(new Set( - pendingItems.filter((item) => item.is_combo).map((item) => String(item.item_code).trim()).filter(Boolean) - )) - if (!stockCodes.length && !comboCodes.length) return + if (!codes.length) return try { - const fetchTasks: Promise[] = [] - if (stockCodes.length) { - fetchTasks.push(queryStockProducts({ keyword: stockCodes.join(','), storeId: props.storeId })) - } - if (comboCodes.length) { - fetchTasks.push(queryStockProducts({ keyword: comboCodes.join(','), storeId: props.storeId, mode: 'combo' })) - } - const results = await Promise.all(fetchTasks) - for (const { res, list: rawList } of results) { - if (!isStockApiSuccess(res)) continue - const mode = rawList.some((row: any) => row?.combo_code || row?.combo_sku_id) ? 'combo' as const : undefined - const matchedRows = rawList - .map((row: any) => mapWarehousePickerItem(row, mode)) - .filter((item: any) => item.item_id) - enrichLocalSelectedItemsFromRows(matchedRows, mode) + const { res, list: stockList } = await queryStockProducts({ + keyword: codes.join(','), + storeId: props.storeId + }) + if (isStockApiSuccess(res)) { + const matchedRows = stockList + .map((row) => mapStockPickerItem(row)) + .filter((item) => getPickerRowItemId(item)) + enrichLocalSelectedItemsFromRows(matchedRows) } + + const stillPending = localSelectedItems.value.filter((item) => needsStockMatchEnrichment(item)) + const comboCodes = Array.from(new Set( + stillPending.map((item) => String(item.item_code).trim()).filter(Boolean) + )) + if (!comboCodes.length) return + + const comboResult = await queryStockProducts({ + keyword: comboCodes.join(','), + storeId: props.storeId, + mode: 'combo' + }) + if (!isStockApiSuccess(comboResult.res)) return + const expanded = await expandComboSearchResults(comboResult.list, { storeId: props.storeId }) + enrichLocalSelectedItemsFromRows(expanded.filter((item) => getPickerRowItemId(item))) } catch (error) { console.error('enrich selected product names failed:', error) } @@ -295,7 +298,16 @@ async function loadList() { ElMessage.error(res?.message || '查询商品失败') return } - allRows.value = rawList.map((row) => mapWarehousePickerItem(row, mode)).filter((item: any) => item.item_id) + if (mode === 'combo') { + allRows.value = await expandComboSearchResults(rawList, { storeId: props.storeId }) + if (!allRows.value.length && rawList.length) { + ElMessage.warning('组合商品未包含有效子商品') + } + } else { + allRows.value = rawList + .map((row) => mapStockPickerItem(row)) + .filter((item) => getPickerRowItemId(item)) + } pagination.total = allRows.value.length const maxPage = Math.max(1, Math.ceil(pagination.total / pagination.pageSize)) if (pagination.currentPage > maxPage) { @@ -324,7 +336,7 @@ async function syncSelectionFromLocal(releaseSync = true) { localSelectedItems.value.filter((item) => hasValidItemId(item)).map((item) => Number(item.item_id)) ) allRows.value - .filter((item) => selectedIdSet.has(Number(item.item_id))) + .filter((item) => selectedIdSet.has(Number(getPickerRowItemId(item)))) .forEach((item) => { table.toggleRowSelection?.(item, true) }) @@ -338,10 +350,10 @@ async function syncSelectionFromLocal(releaseSync = true) { function applySelectedItems(selections: any[]) { const planQty = String(defaultPlanQty.value || '').trim() || '1' const loadedItemIds = new Set( - allRows.value.map((item) => getStockItemId(item)).filter((id): id is number => Boolean(id)) + allRows.value.map((item) => getPickerRowItemId(item)).filter((id): id is number => Boolean(id)) ) const selectedIdsInTable = new Set( - (selections || []).map((item) => getStockItemId(item)).filter((id): id is number => Boolean(id)) + (selections || []).map((item) => getPickerRowItemId(item)).filter((id): id is number => Boolean(id)) ) const existingQtyMap = new Map( localSelectedItems.value.filter((item) => hasValidItemId(item)).map((item) => [Number(item.item_id), item.plan_qty]) @@ -357,7 +369,7 @@ function applySelectedItems(selections: any[]) { return selectedIdsInTable.has(Number(item.item_id)) }).map((item) => { if (!String(item.item_name || '').trim() || !hasValidItemId(item)) { - const indexes = indexStockRowsByLookupKeys(allRows.value, currentWarehouseMode()) + const indexes = indexStockRowsByLookupKeys(allRows.value) const stockRow = findStockRowForSelectedItem(item, indexes) if (stockRow) { return applyStockMatchToSelectedItem(item, stockRow) @@ -452,6 +464,11 @@ function handleConfirm() { color: #606266; } +.select-product-meta-hint { + color: #909399; + font-size: 12px; +} + .select-product-meta--warn { color: #e6a23c; } diff --git a/src/views/order/orderManagement/styles/order-sub.scss b/src/views/order/orderManagement/styles/order-sub.scss index 1894a57f..6754fa58 100644 --- a/src/views/order/orderManagement/styles/order-sub.scss +++ b/src/views/order/orderManagement/styles/order-sub.scss @@ -4,6 +4,53 @@ width: 100%; background-color: #f0f2f5; + :deep(.scan-box-container) { + flex: 0 0 250px; + flex-shrink: 0; + height: 100%; + } + + :deep(.scan-box-container .scan-tabs) { + flex-shrink: 0; + border-bottom: 1px solid #ebeef5; + background: #fafafa; + } + + :deep(.scan-box-container .scan-tabs .el-tabs__header) { + margin: 0; + } + + :deep(.scan-box-container .scan-tabs .el-tabs__nav-wrap::after) { + display: none; + } + + :deep(.scan-box-container .scan-tabs .el-tabs__active-bar) { + display: none; + } + + :deep(.scan-box-container .scan-tabs .el-tabs__item) { + height: 40px; + line-height: 40px; + font-size: 13px; + padding: 0 12px; + color: #606266; + border: 1px solid transparent; + border-bottom: none; + border-radius: 4px 4px 0 0; + transition: color 0.2s; + } + + :deep(.scan-box-container .scan-tabs .el-tabs__item:hover) { + color: var(--el-color-primary); + } + + :deep(.scan-box-container .scan-tabs .el-tabs__item.is-active) { + color: var(--el-color-primary); + background-color: #fff; + border-color: #ebeef5; + border-bottom-color: #fff; + } + .main-content { flex: 1; display: flex; @@ -98,21 +145,60 @@ .detail-header { background-color: #fafafa; border-bottom: 1px solid #ebeef5; - padding: 0; + padding: 0 12px; display: flex; align-items: center; justify-content: space-between; gap: 12px; - min-height: 40px; + height: 42px; + min-height: 42px; + box-sizing: border-box; .detail-tab { flex: 1; min-width: 0; + margin-bottom: -1px; + + :deep(.el-tabs__header) { + margin: 0; + border-bottom: none; + } + + :deep(.el-tabs__nav-wrap::after) { + display: none; + } + + :deep(.el-tabs__active-bar) { + display: none; + } + + :deep(.el-tabs__item) { + height: 40px; + line-height: 40px; + font-size: 13px; + padding: 0 16px; + color: #606266; + border: 1px solid transparent; + border-bottom: none; + border-radius: 4px 4px 0 0; + transition: color 0.2s; + } + + :deep(.el-tabs__item:hover) { + color: var(--el-color-primary); + } + + :deep(.el-tabs__item.is-active) { + color: var(--el-color-primary); + background-color: #fff; + border-color: #ebeef5; + border-bottom-color: #fff; + } } .detail-header-actions { flex: 0 0 auto; - padding-right: 12px; + padding-right: 0; } } diff --git a/src/views/order/orderManagement/utils/stock-picker-helpers.ts b/src/views/order/orderManagement/utils/stock-picker-helpers.ts index d7e1c651..8bdd566d 100644 --- a/src/views/order/orderManagement/utils/stock-picker-helpers.ts +++ b/src/views/order/orderManagement/utils/stock-picker-helpers.ts @@ -1,4 +1,5 @@ import { warehouseSearch } from '@/api/stock/stock' +import { mapComboGoodsItemsFromRecord } from '@/views/stock/combo_stock/combo-stock-config' export type WarehouseSearchMode = 'combo' @@ -9,7 +10,7 @@ export type OrderSelectedProductItem = { barcode: string plan_qty: string store_id?: number - /** 是否为组合商品(建单 item_id 取 combo_sku_id) */ + /** 是否为组合商品(建单 item_id 优先 combo_sku_id,否则取组合 id) */ is_combo?: boolean combo_id?: number } @@ -62,14 +63,24 @@ export function buildWarehouseSearchRequest(options: { return requestData } -/** stock.warehouse.search 响应:data 为数组,total 为本次返回条数(≤50) */ +/** stock.warehouse.search 响应:普通商品 data 为数组;组合商品为 { list, total } */ export function parseStockWarehouseSearch(res: any): { list: any[]; total: number } { if (!isStockApiSuccess(res)) { return { list: [], total: 0 } } - const list = Array.isArray(res?.data) ? res.data : [] - const total = Number(res?.total ?? list.length) - return { list, total } + const payload = res?.data ?? res + let list: any[] = [] + if (Array.isArray(payload?.list)) { + list = payload.list + } else if (Array.isArray(payload)) { + list = payload + } else if (Array.isArray(res?.list)) { + list = res.list + } else if (Array.isArray(res?.data)) { + list = res.data + } + const total = Number(payload?.total ?? res?.total ?? list.length) + return { list, total: Number.isFinite(total) ? total : list.length } } export async function queryStockProducts(options: { @@ -93,14 +104,19 @@ export function getComboSkuId(row: any): number | undefined { } export function isComboStockRow(row: any): boolean { + if (row?._from_combo_expanded === true) return false if (row?.is_combo === true) return true if (getComboSkuId(row)) return true return Boolean(String(row?.combo_code ?? '').trim() || String(row?.combo_name ?? '').trim()) } -function resolveComboSkuId(row: any): number | undefined { +export function resolveComboSkuId(row: any): number | undefined { const comboSkuId = getComboSkuId(row) if (comboSkuId) return comboSkuId + const comboId = getComboId(row) + if (comboId && (String(row?.combo_code ?? '').trim() || String(row?.combo_name ?? '').trim())) { + return comboId + } if (row?.is_combo === true) { const itemId = Number(row?.item_id) if (Number.isInteger(itemId) && itemId > 0) return itemId @@ -145,6 +161,95 @@ export function mapWarehousePickerItem(row: any, mode?: WarehouseSearchMode) { return mode === 'combo' ? mapComboPickerItem(row) : mapStockPickerItem(row) } +/** 解析 nameNotation:【1】商品A【2】商品B */ +export function parseComboNameNotation(notation: string): Map { + const map = new Map() + const text = String(notation || '').trim() + if (!text) return map + const regex = /【(\d+)】([^【]*)/g + let match: RegExpExecArray | null + while ((match = regex.exec(text)) !== null) { + const index = Number(match[1]) + const name = String(match[2] || '').trim() + if (Number.isInteger(index) && index > 0 && name) { + map.set(index, name) + } + } + return map +} + +/** 将单条组合商品记录展开为子 SKU 草稿行(待库存查询补全编码/条码) */ +export function expandComboRecordToDraftRows(combo: any) { + const comboCode = getComboCode(combo) + const comboName = getComboName(combo) + const nameByIndex = parseComboNameNotation(combo?.nameNotation) + const items = mapComboGoodsItemsFromRecord(combo?.items) + if (!items.length) return [] + + return items.map((item, index) => { + const nameIndex = index + 1 + const itemName = item.item_name + || nameByIndex.get(nameIndex) + || nameByIndex.get(Number(item.sort_order)) + || '' + return { + item_id: item.item_goods_sku_id, + item_code: item.item_code || String(item.item_goods_sku_id), + item_name: itemName, + barcode: item.barcode || '', + source_combo_code: comboCode, + source_combo_name: comboName, + combo_item_quantity: item.item_quantity, + _from_combo_expanded: true + } + }) +} + +/** 组合商品搜索结果 → 展开并补全为与普通商品一致的可选行 */ +export async function expandComboSearchResults( + comboList: any[], + options: { storeId?: number } = {} +) { + const draftRows: any[] = [] + for (const combo of comboList) { + if (!isComboStockRow(combo)) continue + draftRows.push(...expandComboRecordToDraftRows(combo)) + } + if (!draftRows.length) return [] + + const skuIds = Array.from(new Set( + draftRows.map((row) => Number(row.item_id)).filter((id) => Number.isInteger(id) && id > 0) + )) + const enrichById = new Map>() + if (skuIds.length) { + const { res, list } = await queryStockProducts({ + keyword: skuIds.join(','), + storeId: options.storeId + }) + if (isStockApiSuccess(res)) { + for (const row of list) { + const mapped = mapStockPickerItem(row) + if (mapped.item_id) enrichById.set(mapped.item_id, mapped) + } + } + } + + return draftRows.map((draft) => { + const enriched = enrichById.get(Number(draft.item_id)) + const merged = enriched + ? { + ...enriched, + source_combo_code: draft.source_combo_code, + source_combo_name: draft.source_combo_name, + combo_item_quantity: draft.combo_item_quantity, + _from_combo_expanded: true + } + : draft + const mapped = mapStockPickerItem(merged) + return mapped.item_id ? mapped : null + }).filter((row): row is ReturnType => row != null) +} + export function comboRowMatchesKeyword(row: any, keyword: string) { const normalized = String(keyword || '').trim().toLowerCase() if (!normalized) return false @@ -394,6 +499,8 @@ export function indexStockRowsByLookupKeys(rows: any[], mode?: WarehouseSearchMo if (itemId) byId.set(itemId, mapped) if (itemCode) byCode.set(itemCode, mapped) if (mode === 'combo') { + const comboId = getComboId(mapped) + if (comboId && comboId !== itemId) byId.set(comboId, mapped) const customCode = String(mapped?.custom_code ?? '').trim() if (customCode) byCode.set(customCode, mapped) } else { diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index 0044edb2..cf56736f 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -3,9 +3,9 @@ >>([]) const emptyText = ref(pickTaskWaveListDefaults.emptyText) const scanBox = ref(null) const presetTree = ref([]) +const availableFieldsRef = reactive(JSON.parse(JSON.stringify(pickTaskWaveAvailableFields))) const queryTime = ref(0) const cancelingTaskId = ref(null) const batchCancelLoading = ref(false) diff --git a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue index 2f81d99b..d4ddf2da 100644 --- a/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue +++ b/src/views/order/waveOrder/component/WaveBatchDetailPanel.vue @@ -4,9 +4,11 @@