diff --git a/dist.tar.gz b/dist.tar.gz index 5131fd22..b5be6e15 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/stock/stock.ts b/src/api/stock/stock.ts index cbafa9f3..40541efb 100644 --- a/src/api/stock/stock.ts +++ b/src/api/stock/stock.ts @@ -370,6 +370,12 @@ export function warehouseSearch(data: { store_id?: number with_stock?: boolean is_batch?: boolean + /** 传 "combo" 时搜索组合商品 */ + mode?: 'combo' | string + /** mode="combo" 时按组合商品 ID 精确查询 */ + id?: number + /** mode="combo" 时按自定义编码模糊查询 */ + custom_code?: string }) { return request({ url: '/system', diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index 42fdf29c..fabc0c99 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -21,7 +21,30 @@ export type StorageEntryListParams = { sort?: StorageEntryListSort } -export function getEntryList(data: StorageEntryListParams = {}): Promise { +export type StorageEntryListResponse = { + code?: number + message?: string + list?: Record[] + pagination?: { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean + } + summary?: { + total?: number + pending?: number + creating?: number + created?: number + completed?: number + cancelled?: number + } + data?: Partial +} + +export function getEntryList(data: StorageEntryListParams = {}): Promise { return request({ url: '/system', method: 'post', @@ -63,12 +86,27 @@ export type EntryDetailItem = { [key: string]: unknown } +export type EntryOrderReceivingBinding = { + id?: number + receiving_id?: number + receiving?: { + id?: number + receiving_number?: string + status?: string + storage_status?: string + created_at?: string + [key: string]: unknown + } + [key: string]: unknown +} + export type EntryOrderDetail = { entry_order_code?: string purchase_order_code?: string store_name?: string order_status?: string items?: EntryDetailItem[] + receivingBindings?: EntryOrderReceivingBinding[] [key: string]: unknown } @@ -94,7 +132,25 @@ export function getEntryDetail(data: GetEntryDetailParams): Promise { +export type CancelEntryParams = { + /** 入库单ID,兼容旧调用;与 ids 二选一。若同时传入 ids,以 ids 为准 */ + id?: number + /** 入库单ID数组,用于批量作废;必须为非空数组 */ + ids?: number[] +} + +export type CancelEntryResponse = { + code?: number + message?: string + id?: number + ids?: number[] + data?: { + id?: number + ids?: number[] + } +} + +export function cancelEntry(data: CancelEntryParams): Promise { return request({ url: '/system', method: 'post', @@ -239,3 +295,220 @@ export function getEntryPrintData( data }) } + +export type DirectInboundGetItemsParams = { + /** 入库单号 */ + entry_order_code: string +} + +export type DirectInboundEntryOrder = { + id?: number + entry_order_code?: string + order_type?: string + order_status?: string + source_type?: string + warehouse_id?: number + store_id?: number + remark?: string + [key: string]: unknown +} + +export type DirectInboundLog = { + id?: number + stock_id?: number + quantity?: number + inbound_type?: string + remark?: string + /** 存放库位ID,关联 wms_location_space.id */ + space_id?: number + created_at?: string + warehouse_item_code?: string + warehouse_item_name?: string + [key: string]: unknown +} + +export type DirectInboundItem = { + id?: number + stock_id?: number + count?: number + received_quantity?: number + direct_inbound_quantity?: number + remaining_quantity?: number + pending_binding_total?: number + bindings?: EntryDetailBinding[] + direct_logs?: DirectInboundLog[] + [key: string]: unknown +} + +export type DirectInboundSummary = { + total_items?: number + total_planned?: number + total_direct_inbound?: number + [key: string]: unknown +} + +export type DirectInboundGetItemsResponse = { + code?: number + message?: string + entryOrder?: DirectInboundEntryOrder + items?: DirectInboundItem[] + direct_logs?: DirectInboundLog[] + summary?: DirectInboundSummary + data?: { + entryOrder?: DirectInboundEntryOrder + items?: DirectInboundItem[] + direct_logs?: DirectInboundLog[] + summary?: DirectInboundSummary + } +} + +/** 获取入库单的导入/PDA 入库信息 */ +export function getDirectInboundItems( + data: DirectInboundGetItemsParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.getDirectInboundItems', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export type DirectInboundAddItemBatchEntry = { + stock_id: number + quantity: number + inbound_type: 'import' | 'pda' | string + space_id?: number + remark?: string +} + +export type DirectInboundAddItemSingleParams = { + entry_order_code: string + stock_id: number + quantity: number + inbound_type: 'import' | 'pda' | string + space_id?: number + remark?: string +} + +export type DirectInboundAddItemBatchParams = { + entry_order_code: string + items: DirectInboundAddItemBatchEntry[] +} + +export type DirectInboundAddItemParams = + | DirectInboundAddItemSingleParams + | DirectInboundAddItemBatchParams + +export type DirectInboundAddItemResultEntry = { + id?: number + stock_id?: number + quantity?: number + inbound_type?: string + space_id?: number + plan_quantity?: number + existing_before?: number + existing_after?: number + remaining?: number + [key: string]: unknown +} + +export type DirectInboundAddItemResponse = { + code?: number + message?: string + id?: number + stock_id?: number + quantity?: number + inbound_type?: string + plan_quantity?: number + existing_before?: number + existing_after?: number + remaining?: number + count?: number + total_quantity?: number + items?: DirectInboundAddItemResultEntry[] + data?: Partial +} + +/** 按商品增量添加导入/PDA 入库记录(支持单条与批量) */ +export function addDirectInboundItem( + data: DirectInboundAddItemParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.addDirectInboundItem', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export type DirectInboundCommitParams = { + entry_order_code: string +} + +export type DirectInboundCommitResponse = { + code?: number + message?: string + id?: number + entry_order_code?: string + order_status?: string + sync_status?: string + items_count?: number + total_quantity?: number + data?: Partial +} + +/** 提交确认完成导入/PDA 入库 */ +export function commitDirectInbound( + data: DirectInboundCommitParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.commitDirectInbound', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export type DirectInboundRemoveItemParams = { + /** 入库记录ID(wms_inbound_direct_log.id) */ + id: number +} + +export type DirectInboundRemoveItemResponse = { + code?: number + message?: string + id?: number + stock_id?: number + quantity?: number + inbound_type?: string + data?: Partial +} + +/** 移除一条导入/PDA 入库记录(仅限未提交的入库单) */ +export function removeDirectInboundItem( + data: DirectInboundRemoveItemParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.removeDirectInboundItem', + v, + timestamp: new Date().getTime() + }, + data + }) +} diff --git a/src/api/storage.inventory/inventory.ts b/src/api/storage.inventory/inventory.ts index 4f3ede1b..1cdc1211 100644 --- a/src/api/storage.inventory/inventory.ts +++ b/src/api/storage.inventory/inventory.ts @@ -18,7 +18,7 @@ export function getInventoryList(data: any): Promise { } export function quickPutaway(data: { receiving_id: number; id?: number }): Promise { - const body: Record = { ...data } + const body: Record = { ...data } if (body.receiving_id === undefined && body.id != null) { body.receiving_id = Number(body.id) } @@ -35,11 +35,39 @@ export function quickPutaway(data: { receiving_id: number; id?: number }): Promi } as any) } +export type MatchPutawayReceivingResult = { + receiving_id?: number + storage_status?: 'all' | 'partial' | 'none' | string + [key: string]: unknown +} + +export type MatchPutawayEntryOrderResult = { + entry_order_id?: number + order_status?: string + callback_triggered?: boolean + callback_result?: Record | null + [key: string]: unknown +} + +export type MatchPutawayResponse = { + code?: number + message?: string + summary?: { + total_products_matched?: number + total_quantity_inbound?: number + [key: string]: unknown + } + receiving_results?: MatchPutawayReceivingResult[] + entry_order_results?: MatchPutawayEntryOrderResult[] + warnings?: string[] + data?: Partial +} + /** 收货单与入库单匹配入库:按商品维度匹配,需传收货单与入库单 ID 列表 */ export function matchPutaway(data: { receiving_ids: number[] entry_order_ids: number[] -}): Promise { +}): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/storage.receiving/receiving.ts b/src/api/storage.receiving/receiving.ts new file mode 100644 index 00000000..c0358ccf --- /dev/null +++ b/src/api/storage.receiving/receiving.ts @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +const v = '1.0' + +export type GetAvailableInboundQuantityParams = { + stock_id: number +} + +export type AvailableInboundQuantityItem = { + detail_id?: number + receiving_id?: number + receiving_number?: string + product_name?: string + actual_quantity?: number + stored_quantity?: number + pending_allocated_quantity?: number + available_quantity?: number + storage_status?: string + batch_number?: string + production_date?: string + expiry_date?: string + space_id?: number + receiving_status?: string + [key: string]: unknown +} + +export type GetAvailableInboundQuantityResponse = { + code?: number + message?: string + list?: AvailableInboundQuantityItem[] + total?: number + data?: { + list?: AvailableInboundQuantityItem[] + total?: number + } +} + +/** 按 stock_id 查询可入库数量 */ +export function getAvailableInboundQuantity( + data: GetAvailableInboundQuantityParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.getAvailableInboundQuantity', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/storage_receiving/receiving.ts b/src/api/storage_receiving/receiving.ts index c8e5306e..5bdae740 100644 --- a/src/api/storage_receiving/receiving.ts +++ b/src/api/storage_receiving/receiving.ts @@ -361,56 +361,6 @@ export function quickPutaway(data: { } as any) } -export type GetAvailableInboundQuantityParams = { - stock_id: number -} - -export type AvailableInboundQuantityItem = { - detail_id?: number - receiving_id?: number - receiving_number?: string - product_name?: string - actual_quantity?: number - stored_quantity?: number - pending_allocated_quantity?: number - available_quantity?: number - storage_status?: string - batch_number?: string - production_date?: string - expiry_date?: string - space_id?: number - receiving_status?: string - [key: string]: unknown -} - -export type GetAvailableInboundQuantityResponse = { - code?: number - message?: string - list?: AvailableInboundQuantityItem[] - total?: number - data?: { - list?: AvailableInboundQuantityItem[] - total?: number - } -} - -/** 按 stock_id 查询可入库数量 */ -export function getAvailableInboundQuantity( - data: GetAvailableInboundQuantityParams -): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.getAvailableInboundQuantity', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} - export type ManualMatchEntryOrderParams = { receivingId: number entryOrderId: number diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index ce43de9a..6da02998 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -425,7 +425,7 @@ import SelectProductDialog from './SelectProductDialog.vue' import type { SelectProductItem } from './SelectProductDialog.vue' import * as indexApi from '@/api/index/index' import { - lookupStockProductByKeyword + lookupProductByKeyword } from '../utils/stock-picker-helpers' import { orderList } from '@/api/order.index/orderindex' import { @@ -815,7 +815,7 @@ function collectGroupOrderItems(rows: ImportPreviewRow[]) { } async function lookupStockItemByCode(storeId: number, itemCode: string) { - return lookupStockProductByKeyword(storeId, itemCode) + return lookupProductByKeyword(storeId, itemCode) } function applyMatchedStockToSelectedItem(item: PreviewSelectedItem, matched: PreviewSelectedItem) { @@ -825,6 +825,8 @@ function applyMatchedStockToSelectedItem(item: PreviewSelectedItem, matched: Pre item.item_code = displayCode || matched.item_code item.barcode = String(item.barcode || '').trim() || matched.barcode item.store_id = item.store_id || matched.store_id + item.is_combo = matched.is_combo + item.combo_id = matched.combo_id } async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) { diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue index f224ab5a..28470fc9 100644 --- a/src/views/order/orderManagement/component/SelectProductDialog.vue +++ b/src/views/order/orderManagement/component/SelectProductDialog.vue @@ -15,9 +15,13 @@
+ + 普通商品 + 组合商品 + - - - + +
@@ -62,6 +74,12 @@
已选商品
+ + + @@ -93,14 +111,17 @@ import { getStockItemId, indexStockRowsByLookupKeys, isStockApiSuccess, - mapStockPickerItem, + mapWarehousePickerItem, queryStockProducts, toOrderSelectedProductItem, - type OrderSelectedProductItem + type OrderSelectedProductItem, + type WarehouseSearchMode } from '../utils/stock-picker-helpers' export type SelectProductItem = OrderSelectedProductItem +type ProductSearchMode = 'stock' | 'combo' + const visible = defineModel({ default: false }) const props = defineProps<{ @@ -115,6 +136,18 @@ const emit = defineEmits<{ const loading = ref(false) const keyword = ref('') +const searchMode = ref('stock') + +function currentWarehouseMode(): WarehouseSearchMode | undefined { + return searchMode.value === 'combo' ? 'combo' : undefined +} + +function tableRowKey(row: any) { + if (searchMode.value === 'combo') { + return row?.combo_id ?? row?.id ?? row?.item_id + } + return row?.item_id +} function normalizeKeyword() { const raw = keyword.value @@ -143,6 +176,7 @@ const pagination = reactive({ watch(visible, (opened) => { if (!opened) return + searchMode.value = 'stock' defaultPlanQty.value = String(props.planQty || '').trim() || '1' localSelectedItems.value = (props.selectedItems || []).map((item) => ({ ...item })) keyword.value = '' @@ -165,6 +199,7 @@ async function initDialog() { function handleClosed() { keyword.value = '' + searchMode.value = 'stock' defaultPlanQty.value = '1' localSelectedItems.value = [] resetListState() @@ -190,13 +225,13 @@ function hasValidItemId(item: SelectProductItem) { } function buildSelectedItemFromStock(row: any, planQty: string): SelectProductItem | null { - return toOrderSelectedProductItem(row, { planQty }) + return toOrderSelectedProductItem(row, { planQty, mode: currentWarehouseMode() }) } -function enrichLocalSelectedItemsFromRows(rows: any[]) { +function enrichLocalSelectedItemsFromRows(rows: any[], mode?: WarehouseSearchMode) { if (!localSelectedItems.value.length || !rows.length) return - const indexes = indexStockRowsByLookupKeys(rows) + const indexes = indexStockRowsByLookupKeys(rows, mode) localSelectedItems.value = localSelectedItems.value.map((item) => { const stockRow = findStockRowForSelectedItem(item, indexes) if (!stockRow) return item @@ -211,25 +246,36 @@ function needsStockMatchEnrichment(item: SelectProductItem) { } async function enrichLocalSelectedItems() { - enrichLocalSelectedItemsFromRows(allRows.value) + enrichLocalSelectedItemsFromRows(allRows.value, currentWarehouseMode()) const pendingItems = localSelectedItems.value.filter((item) => needsStockMatchEnrichment(item)) if (!pendingItems.length) return - const codes = Array.from(new Set( - pendingItems.map((item) => String(item.item_code).trim()).filter(Boolean) + const stockCodes = Array.from(new Set( + pendingItems.filter((item) => !item.is_combo).map((item) => String(item.item_code).trim()).filter(Boolean) )) - if (!codes.length) return + 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 try { - const { res, list: rawList } = await queryStockProducts({ - keyword: codes.join(','), - storeId: props.storeId - }) - if (!isStockApiSuccess(res)) return - - const matchedRows = rawList.map(mapStockPickerItem).filter((item: any) => item.item_id) - enrichLocalSelectedItemsFromRows(matchedRows) + 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) + } } catch (error) { console.error('enrich selected product names failed:', error) } @@ -237,17 +283,19 @@ async function enrichLocalSelectedItems() { async function loadList() { loading.value = true + const mode = currentWarehouseMode() try { const { res, list: rawList } = await queryStockProducts({ keyword: keyword.value.trim(), - storeId: props.storeId + storeId: props.storeId, + mode }) if (!isStockApiSuccess(res)) { resetListState() ElMessage.error(res?.message || '查询商品失败') return } - allRows.value = rawList.map(mapStockPickerItem).filter((item: any) => item.item_id) + allRows.value = rawList.map((row) => mapWarehousePickerItem(row, mode)).filter((item: any) => item.item_id) pagination.total = allRows.value.length const maxPage = Math.max(1, Math.ceil(pagination.total / pagination.pageSize)) if (pagination.currentPage > maxPage) { @@ -309,7 +357,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) + const indexes = indexStockRowsByLookupKeys(allRows.value, currentWarehouseMode()) const stockRow = findStockRowForSelectedItem(item, indexes) if (stockRow) { return applyStockMatchToSelectedItem(item, stockRow) @@ -350,6 +398,19 @@ function removeSelectedItem(itemCode: string) { }) } +function handleSearchModeChange() { + pagination.currentPage = 1 + keyword.value = '' + syncingSelection.value = true + void loadList() + .then(() => enrichLocalSelectedItems()) + .then(() => syncSelectionFromLocal()) + .finally(async () => { + await nextTick() + syncingSelection.value = false + }) +} + function handleSearch() { pagination.currentPage = 1 syncingSelection.value = true diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 1c714631..8be0a14c 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -1733,7 +1733,8 @@ export const pendingToolbarButtonKeys = [ 'batchUnintercept', 'batchLock', 'batchUnlock', - 'batchPrint' + 'batchPrint', + 'resolveException' ] /** 页面级按钮列表:pendingOrder 直接消费,避免页面内重复拼装 */ @@ -1744,10 +1745,7 @@ export const pendingToolbarButtons = pickToolbarButtons(pendingToolbarButtonKeys /** * deliveryException */ -export const exceptionToolbarButtonKeys = [ - ...pendingToolbarButtonKeys.filter((key) => key !== 'syncOrderIds'), - 'resolveException' -] +export const exceptionToolbarButtonKeys = [...pendingToolbarButtonKeys] export const exceptionToolbarButtons = pickToolbarButtons(exceptionToolbarButtonKeys) diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 0d112b07..01d7890b 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -308,6 +308,13 @@ @closed="resetManualWaybillDialog" @submit="submitManualWaybill" /> + >(() => ({ updateOrderMetaLoading: updateOrderMetaLoading.value, cloneOrderLoading: cloneOrderLoading.value, manualWaybillLoading: manualWaybillLoading.value, + syncOrderIdsLoading: syncOrderIdsLoading.value, updateAddressLoading: updateAddressLoading.value, batchAsyncTaskLoading: batchAsyncTaskLoading.value, resolveExceptionLoading: resolveExceptionLoading.value, diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index 9a84ee66..4b145a56 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -11,13 +11,13 @@ {{ orderCount }} 条 - + /> -->