diff --git a/web/src/NoCodeDataWorkflow.tsx b/web/src/NoCodeDataWorkflow.tsx index b5cca15..f586a17 100644 --- a/web/src/NoCodeDataWorkflow.tsx +++ b/web/src/NoCodeDataWorkflow.tsx @@ -7,6 +7,7 @@ import { api, collectionItems } from './api'; import type { AuthUser, SourceItem } from './types'; import type { DataField, DataStage, DataWorkflowOperation, DataWorkflowStatus, DeletionSource, MasterWorkbookKeyFormat, MasterWorkbookKind, MasterWorkbookPreview, SourceDeletionPreview, SourceUploadOptions, WorkbookPreview } from './NoCodeDataTypes'; import { useDataWorkflowOperation } from './useDataWorkflowOperation'; +import { detectSourceWorkbook } from './sourceWorkbookDetection'; import { readableSelectPopup } from './readableSelectPopup'; import './no-code-data-workflow.css'; @@ -89,9 +90,8 @@ function SimplifiedDataWorkflow({ options, workflowStatus, pendingDeletion, onDe for (let index = 0; index < selected.length; index += 2) { const results = await Promise.all(selected.slice(index, index + 2).map(async file => { try { - const result = await api.previewSourceWorkbook(file); - const scores = (['black', 'bright'] as DataStage[]).map(value => { const required = (options.fields[value] || []).filter(field => field.required); const matched = matchFields(options.fields[value] || [], result.preview.headers); return { stage: value, score: required.length ? required.filter(field => matched[field.name]).length / required.length : 0 }; }); - const detected = scores.sort((a, b) => b.score - a.score)[0].stage; + const uploaded = await api.previewSourceWorkbook(file); + const { workbook: result, stage: detected } = await detectSourceWorkbook(uploaded, options.fields, api.sourceWorkbookPreview); const nextMonth = Number(file.name.match(/(?:^|\D)(0?[1-9]|1[0-2])月/)?.[1] || new Date().getMonth() + 1); const nextYear = Number(file.name.match(/(20\d{2})年/)?.[1] || new Date().getFullYear()); return { id: crypto.randomUUID(), file, workbook: result, stage: detected, year: nextYear, month: nextMonth, sheetName: result.preview.sheetName, headerRow: result.preview.headerRow, fieldMap: matchFields(options.fields[detected] || [], result.preview.headers), mode: 'ADD' as const, targetId: '', scopeCode: options.scopes[0] || 'ALL' }; diff --git a/web/src/sourceWorkbookDetection.ts b/web/src/sourceWorkbookDetection.ts new file mode 100644 index 0000000..a5876d7 --- /dev/null +++ b/web/src/sourceWorkbookDetection.ts @@ -0,0 +1,29 @@ +import type { DataField, DataStage, WorkbookPreview } from './NoCodeDataTypes'; + +type Candidate = { workbook: WorkbookPreview; stage: DataStage; score: number; matched: number }; + +function identify(workbook: WorkbookPreview, fields: Record): Candidate { + return (['black', 'bright'] as DataStage[]).map(stage => { + const required = fields[stage].filter(field => field.required); + const matched = required.filter(field => workbook.preview.headers.includes(field.name)).length; + return { workbook, stage, matched, score: required.length ? matched / required.length : 0 }; + }).sort((a, b) => b.score - a.score || b.matched - a.matched)[0]; +} + +/** 按业务字段比较各工作表,避免把排在明细前面的汇总页当作导入来源。 */ +export async function detectSourceWorkbook( + initial: WorkbookPreview, + fields: Record, + preview: (uploadId: string, params: { sheetName: string; headerRow: number; stage: DataStage }) => Promise, +): Promise<{ workbook: WorkbookPreview; stage: DataStage }> { + let best = identify(initial, fields); + const sheets = initial.sheets.filter(sheet => sheet.sheetName !== initial.preview.sheetName) + .sort((a, b) => Number(b.sheetName.includes('明细')) - Number(a.sheetName.includes('明细'))); + for (const sheet of sheets) { + if (best.score === 1) break; + const workbook = await preview(initial.uploadId, { sheetName: sheet.sheetName, headerRow: 1, stage: best.stage }); + const candidate = identify(workbook, fields); + if (candidate.score > best.score || candidate.score === best.score && candidate.matched > best.matched) best = candidate; + } + return { workbook: best.workbook, stage: best.stage }; +} diff --git a/web/verification/source_workbook_detection.test.mjs b/web/verification/source_workbook_detection.test.mjs new file mode 100644 index 0000000..0c97e5a --- /dev/null +++ b/web/verification/source_workbook_detection.test.mjs @@ -0,0 +1,43 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +import ts from 'typescript'; + +const compiled = ts.transpileModule(readFileSync(new URL('../src/sourceWorkbookDetection.ts', import.meta.url), 'utf8'), { + compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS }, +}).outputText; +const module = { exports: {} }; +new Function('exports', compiled)(module.exports); +const { detectSourceWorkbook } = module.exports; +const fields = Object.fromEntries(Object.entries({ black: ['序号', '成品规格', '送电镀重量', '责废总重量'], bright: ['序号', '成品规格', '合格重量', '是否电镀来料/二等品库来料'] }) + .map(([stage, names]) => [stage, names.map(name => ({ name, required: true }))])); +const workbook = (sheetName, headers, sheets) => ({ uploadId: 'upload', sourceFile: '10月.xlsx', sheets: sheets.map(sheetName => ({ sheetName })), fields, + preview: { sheetName, headerRow: 1, headers, sampleRows: [] } }); + +test('bright detail following a summary is selected from its business columns', async () => { + const sheets = ['合格率报表', '明细', '成品报废']; + const calls = []; + const detail = workbook('明细', fields.bright.map(x => x.name), sheets); + const result = await detectSourceWorkbook(workbook(sheets[0], ['成品质量统计表(汇总)'], sheets), fields, async (_, params) => { calls.push(params); return detail; }); + assert.equal(result.stage, 'bright'); assert.equal(result.workbook, detail); assert.equal(calls.length, 1); + assert.equal(calls[0].sheetName, '明细'); +}); + +test('black specification summary is rejected in favor of the complete detail', async () => { + const sheets = ['黑片报废(按规格)', '报废明细']; + const result = await detectSourceWorkbook(workbook(sheets[0], ['成品规格', '合格重量'], sheets), fields, + async () => workbook(sheets[1], fields.black.map(x => x.name), sheets)); + assert.equal(result.stage, 'black'); assert.equal(result.workbook.preview.sheetName, '报废明细'); +}); + +test('a complete first sheet needs no further reads; incomplete sheets remain incomplete', async () => { + const complete = workbook('明细', fields.bright.map(x => x.name), ['明细', '汇总']); + assert.equal((await detectSourceWorkbook(complete, fields, async () => { throw Error('unexpected request'); })).workbook, complete); + const partial = workbook('汇总', ['成品规格'], ['汇总', '其他']); + const result = await detectSourceWorkbook(partial, fields, async () => workbook('其他', [], ['汇总', '其他'])); + assert.equal(result.workbook, partial); assert.equal(result.workbook.preview.headers.length, 1); +}); + +test('preview errors propagate instead of silently offering the wrong worksheet', async () => { + await assert.rejects(detectSourceWorkbook(workbook('汇总', [], ['汇总', '明细']), fields, async () => { throw Error('读取失败'); }), /读取失败/); +});