diff --git a/src/main/services/database/data-importer.ts b/src/main/services/database/data-importer.ts index 3302e99..853f7b5 100644 --- a/src/main/services/database/data-importer.ts +++ b/src/main/services/database/data-importer.ts @@ -9,7 +9,6 @@ * 4. Batch insert new records */ -import path from 'path' import { createLogger } from '../logger' import { DiscreteMaterialPlanDAO, type MaterialPlanRecord } from './discrete-material-plan-dao' diff --git a/src/main/services/database/discrete-material-plan-dao.ts b/src/main/services/database/discrete-material-plan-dao.ts index a093a8b..f912d01 100644 --- a/src/main/services/database/discrete-material-plan-dao.ts +++ b/src/main/services/database/discrete-material-plan-dao.ts @@ -577,7 +577,7 @@ export class DiscreteMaterialPlanDAO { private buildRowValues( record: MaterialPlanRecord, columns: string[], - rowIndex: number, + _rowIndex: number, isSqlServer: boolean, values: any[] ): string[] { diff --git a/src/main/services/erp/extractor-core.ts b/src/main/services/erp/extractor-core.ts index ab2d384..9a81526 100644 --- a/src/main/services/erp/extractor-core.ts +++ b/src/main/services/erp/extractor-core.ts @@ -6,9 +6,6 @@ import type { ExtractorCoreResult, ExtractionProgress } from '../../types/extractor.types' -import { createLogger } from '../logger' - -const log = createLogger('ExtractorCore') /** * ExtractorCore - Handles all web page operations for data extraction @@ -142,12 +139,12 @@ export class ExtractorCore { * Reference: Python download_batch() method lines 133-175 */ private async downloadBatch( - session: ErpSession, + _session: ErpSession, popupPage: any, workFrame: any, orderNumbers: string[], batchIndex: number, - totalBatches: number, + _totalBatches: number, downloadDir: string ): Promise { // Fill order numbers (Python lines 143-145) diff --git a/src/main/services/erp/extractor.ts b/src/main/services/erp/extractor.ts index 9c6d191..1bc5be8 100644 --- a/src/main/services/erp/extractor.ts +++ b/src/main/services/erp/extractor.ts @@ -7,8 +7,7 @@ import type { ExtractorInput, ExtractorResult, ImportResult, - LogLevel, - ExtractionProgress + LogLevel } from '../../types/extractor.types' import { DataImportService } from '../database/data-importer' import { createLogger } from '../logger' @@ -72,7 +71,6 @@ export class ExtractorService { const totalPoints = 1 + totalBatches + 2 const progressPerPoint = 100 / totalPoints const mergeProgress = (1 + totalBatches) * progressPerPoint - const importProgress = (1 + totalBatches + 1) * progressPerPoint input.onProgress?.('正在合并文件...', mergeProgress, { phase: 'merging', @@ -131,7 +129,7 @@ export class ExtractorService { } log.info('Starting merge', { fileCount: filePaths.length }) - const parser = new ExcelParser({ verbose: true }) + const parser = new ExcelParser() // Collect all orders with full order info and materials // Each order has: { orderInfo: OrderHeader, materials: MaterialRow[] } @@ -306,42 +304,6 @@ export class ExtractorService { } } - /** - * Import merged Excel data to database - * @param filePath - Path to the merged Excel file - * @returns Import result with statistics - */ - private async importToDatabase(filePath: string): Promise { - log.info('Starting database import', { filePath }) - - const importService = new DataImportService() - - try { - const result = await importService.importFromExcel(filePath, 1000) - - log.info('Import completed', { - success: result.success, - recordsRead: result.recordsRead, - recordsDeleted: result.recordsDeleted, - recordsImported: result.recordsImported - }) - - return result - } catch (error) { - const errorMsg = error instanceof Error ? error.message : String(error) - log.error('Import failed', { error: errorMsg }) - - return { - success: false, - recordsRead: 0, - recordsDeleted: 0, - recordsImported: 0, - uniqueSourceNumbers: 0, - errors: [errorMsg] - } - } - } - /** * Import merged Excel data to database with logging * @param filePath - Path to the merged Excel file diff --git a/src/main/services/excel/excel-parser.ts b/src/main/services/excel/excel-parser.ts index 0e113b2..28cd645 100644 --- a/src/main/services/excel/excel-parser.ts +++ b/src/main/services/excel/excel-parser.ts @@ -1,6 +1,5 @@ import ExcelJS from 'exceljs' import type { DiscreteMaterialPlan, ExcelParseOptions, OrderHeader } from '../../types/excel.types' -import path from 'path' import { createLogger } from '../logger' const log = createLogger('ExcelParser') @@ -53,12 +52,6 @@ export class ExcelParser { 产品单位: 'unit' } - private verbose: boolean - - constructor(options: ExcelParseOptions = {}) { - this.verbose = options.verbose || false - } - /** * Parse Excel file and extract material plans */ @@ -77,7 +70,7 @@ export class ExcelParser { const allRows: any[][] = [] // Read all rows into memory - worksheet.eachRow((row, rowNumber) => { + worksheet.eachRow((row, _rowNumber) => { allRows.push(row.values as any[]) })