From 2a1efd296fd539815297cd2c430be7e5f3d3fccb Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 24 Aug 2026 04:57:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E8=B4=A7=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9B=B4=E5=85=A5=E5=BA=93=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E5=BF=AB=E6=8D=B7=E5=85=A5=E5=BA=93=E6=9B=B4=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E8=BD=AC=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storage.inventory/inventory.ts | 30 +++++++ src/views/storage/receiving/index.vue | 87 +++++++++++++++++-- .../storage/receiving/receiving-config.ts | 11 ++- 3 files changed, 121 insertions(+), 7 deletions(-) diff --git a/src/api/storage.inventory/inventory.ts b/src/api/storage.inventory/inventory.ts index d8e1b873..0243f4f9 100644 --- a/src/api/storage.inventory/inventory.ts +++ b/src/api/storage.inventory/inventory.ts @@ -108,6 +108,36 @@ export function matchPutaway(data: { isSystemApi: true } as any) } + +export type DirectPutawayResponse = { + entry_order_id?: number + entry_order_code?: string + order_status?: string + receiving_id?: number + total_lines?: number + total_quantity?: number + [key: string]: unknown +} + +/** 收货单直入库存(一步完成):将已审核收货单(completed + is_review)未入库明细 + * 按收货明细库位直接写入 wms_storage,生成 SCRK 入库单(一步置为 COMPLETED), + * 明细与收货明细一一对应,不合并。 */ +export function directPutaway(data: { + /** 收货单ID(必填) */ + receiving_id: number +}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.inventory.directPutaway', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} /** 按库位+商品维度移库(合并模式);quantity 必填 */ export function transferByProduct(data: { space_id: number diff --git a/src/views/storage/receiving/index.vue b/src/views/storage/receiving/index.vue index eefae683..31c46b71 100644 --- a/src/views/storage/receiving/index.vue +++ b/src/views/storage/receiving/index.vue @@ -399,6 +399,7 @@ const activeTab = ref('details') const list = ref([]) const loading = ref(false) const quickPutawayLoading = ref(false) +const directPutawayLoading = ref(false) const reviewLoading = ref(false) const queryTime = ref(0) @@ -436,7 +437,8 @@ const buttonLoadingMap = computed(() => ({ loading: loading.value, exportLoading: exportLoading.value, reviewLoading: reviewLoading.value, - quickPutawayLoading: quickPutawayLoading.value + quickPutawayLoading: quickPutawayLoading.value, + directPutawayLoading: directPutawayLoading.value })) const buttonDisabledMap = computed(() => ({ @@ -497,6 +499,9 @@ const toolbarActionMap: Record void> = { handleQuickPutaway: () => { void handleQuickPutaway() }, + handleDirectPutaway: () => { + void handleDirectPutaway() + }, handleOpenPrintDialog: () => { void handleOpenPrintDialog() } @@ -1448,7 +1453,7 @@ function printReceiving() { async function handleQuickPutaway() { if (selectionRows.value.length !== 1) { - ElMessage.warning('请仅选择一条收货单进行快捷入库') + ElMessage.warning('请仅选择一条收货单进行转入库单') return } @@ -1472,7 +1477,7 @@ async function handleQuickPutaway() { if (errors.length > 0) { ElMessageBox.alert( `
${errors.join('
')}
`, - '校验未通过,无法快捷入库', + '校验未通过,无法转入库单', { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } ) return @@ -1480,8 +1485,8 @@ async function handleQuickPutaway() { try { await ElMessageBox.confirm( - `确定对选中的 ${validRows.length} 条收货单执行快捷入库上架吗?`, - '快捷入库确认', + `确定对选中的 ${validRows.length} 条收货单执行转入库单吗?`, + '转入库单确认', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } ) } catch { @@ -1510,7 +1515,7 @@ async function handleQuickPutaway() { { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } ) } else { - ElMessage.success('选中的收货单已全部快捷入库成功') + ElMessage.success('选中的收货单已全部转入库单成功') } loadData() } finally { @@ -1518,6 +1523,76 @@ async function handleQuickPutaway() { } } +/** + * 收货单直入库存(一步完成):将已审核(completed + is_review)且未全部入库的收货单 + * 明细按库位直接写入库位库存,并生成一步完成的 SCRK 入库单。 + */ +async function handleDirectPutaway() { + if (selectionRows.value.length !== 1) { + ElMessage.warning('请仅选择一条收货单进行收货单直入') + return + } + + const row = selectionRows.value[0] + const errors: string[] = [] + const isCompleted = (row.status || '').toLowerCase() === 'completed' + const isReviewed = row.is_review === 1 || row.is_review === true + const hasPendingStorage = (row.storage_status || '') !== 'all' + + if (!isCompleted) { + errors.push(`收货单【${row.receiving_number}】未完成(当前状态:${row.status || '未知'})`) + } else if (!isReviewed) { + errors.push(`收货单【${row.receiving_number}】未审核,不允许直入库存`) + } else if (!hasPendingStorage) { + errors.push(`收货单【${row.receiving_number}】明细已全部入库,禁止重复直入库存`) + } + + if (errors.length > 0) { + ElMessageBox.alert( + `
${errors.join('
')}
`, + '校验未通过,无法收货单直入', + { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } + ) + return + } + + try { + await ElMessageBox.confirm( + `确定对收货单「${row.receiving_number}」执行收货单直入吗?未入库明细将按库位直接写入库存并生成入库单。`, + '收货单直入确认', + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + ) + } catch { + return + } + + directPutawayLoading.value = true + try { + const res: any = await inventoryApi.directPutaway({ receiving_id: row.id }) + if (res && (res.code === 200 || res.flag === 'success' || res.status === 'success')) { + const data = res.data && typeof res.data === 'object' ? res.data : res + const entryOrderCode = data?.entry_order_code || '' + const totalLines = data?.total_lines ?? '' + const totalQuantity = data?.total_quantity ?? '' + const detail = [ + entryOrderCode ? `入库单 ${entryOrderCode}` : '', + totalLines !== '' ? `共 ${totalLines} 行` : '', + totalQuantity !== '' ? `总数量 ${totalQuantity}` : '' + ].filter(Boolean).join(',') + ElMessage.success(detail ? `收货单直入成功:${detail}` : '收货单直入成功') + selectionRows.value = [] + loadData() + } else { + ElMessage.error(res?.message || res?.msg || '收货单直入失败') + } + } catch (e: any) { + console.error('收货单直入出错:', e) + ElMessage.error(e?.message || '收货单直入请求失败') + } finally { + directPutawayLoading.value = false + } +} + function buildExportPayload() { if (currentCondition.value && currentCondition.value !== 'reset') { return { where: normalizeToWhere(currentCondition.value) } diff --git a/src/views/storage/receiving/receiving-config.ts b/src/views/storage/receiving/receiving-config.ts index 73076f53..a3fa4c8c 100644 --- a/src/views/storage/receiving/receiving-config.ts +++ b/src/views/storage/receiving/receiving-config.ts @@ -622,13 +622,22 @@ export const receivingToolbarButtons: ToolbarButtonConfig[] = [ }, { key: 'quickPutaway', - label: '快捷入库', + label: '转入库单', category: 'action', size: 'small', disabledKey: 'singleSelectionOnly', loadingKey: 'quickPutawayLoading', action: 'handleQuickPutaway' }, + { + key: 'directPutaway', + label: '收货单直入', + category: 'action', + size: 'small', + disabledKey: 'singleSelectionOnly', + loadingKey: 'directPutawayLoading', + action: 'handleDirectPutaway' + }, { key: 'print', label: '打印收货单',