style: apply prettier formatting
Apply consistent formatting across all files (line endings, spacing) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import path from 'path';
|
||||
import fs from 'fs/promises';
|
||||
import { ERP_LOCATORS } from './locators';
|
||||
import { ErpAuthService } from './erp-auth';
|
||||
import type { ExtractorInput, ExtractorResult } from '../../types/extractor.types';
|
||||
import type { ErpSession } from '../../types/erp.types';
|
||||
import path from 'path'
|
||||
import fs from 'fs/promises'
|
||||
import { ERP_LOCATORS } from './locators'
|
||||
import { ErpAuthService } from './erp-auth'
|
||||
import type { ExtractorInput, ExtractorResult } from '../../types/extractor.types'
|
||||
import type { ErpSession } from '../../types/erp.types'
|
||||
|
||||
/**
|
||||
* ERP Data Extractor Service
|
||||
@@ -12,15 +12,15 @@ import type { ErpSession } from '../../types/erp.types';
|
||||
* Reference: playwrite/utils/discrete_material_plan_extractor.py
|
||||
*/
|
||||
export class ExtractorService {
|
||||
private authService: ErpAuthService;
|
||||
private downloadDir: string;
|
||||
private authService: ErpAuthService
|
||||
private downloadDir: string
|
||||
|
||||
constructor(authService: ErpAuthService, downloadDir = './downloads') {
|
||||
this.authService = authService;
|
||||
this.downloadDir = downloadDir;
|
||||
this.authService = authService
|
||||
this.downloadDir = downloadDir
|
||||
|
||||
// Ensure download directory exists
|
||||
fs.mkdir(downloadDir, { recursive: true }).catch(() => {});
|
||||
fs.mkdir(downloadDir, { recursive: true }).catch(() => {})
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -31,43 +31,49 @@ export class ExtractorService {
|
||||
downloadedFiles: [],
|
||||
mergedFile: null,
|
||||
recordCount: 0,
|
||||
errors: [],
|
||||
};
|
||||
errors: []
|
||||
}
|
||||
|
||||
try {
|
||||
const session = this.authService.getSession();
|
||||
const session = this.authService.getSession()
|
||||
|
||||
// Navigate to extractor page and get popup page + work frame
|
||||
const { popupPage, workFrame } = await this.navigateToExtractorPage(session);
|
||||
const { popupPage, workFrame } = await this.navigateToExtractorPage(session)
|
||||
|
||||
// Process orders in batches
|
||||
const batchSize = input.batchSize || 100;
|
||||
const batches = this.createBatches(input.orderNumbers, batchSize);
|
||||
const batchSize = input.batchSize || 100
|
||||
const batches = this.createBatches(input.orderNumbers, batchSize)
|
||||
|
||||
for (let i = 0; i < batches.length; i++) {
|
||||
const batch = batches[i];
|
||||
const progress = ((i + 1) / batches.length) * 100;
|
||||
const batch = batches[i]
|
||||
const progress = ((i + 1) / batches.length) * 100
|
||||
|
||||
input.onProgress?.(`Processing batch ${i + 1}/${batches.length}`, progress);
|
||||
input.onProgress?.(`Processing batch ${i + 1}/${batches.length}`, progress)
|
||||
|
||||
try {
|
||||
const filePath = await this.downloadBatch(session, popupPage, workFrame, batch, i, batches.length);
|
||||
result.downloadedFiles.push(filePath);
|
||||
const filePath = await this.downloadBatch(
|
||||
session,
|
||||
popupPage,
|
||||
workFrame,
|
||||
batch,
|
||||
i,
|
||||
batches.length
|
||||
)
|
||||
result.downloadedFiles.push(filePath)
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error';
|
||||
result.errors.push(`Batch ${i + 1}: ${message}`);
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
result.errors.push(`Batch ${i + 1}: ${message}`)
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Merge files (implement in separate task)
|
||||
// result.mergedFile = await this.mergeFiles(result.downloadedFiles);
|
||||
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error';
|
||||
result.errors.push(`Extraction failed: ${message}`);
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
result.errors.push(`Extraction failed: ${message}`)
|
||||
}
|
||||
|
||||
return result;
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,39 +87,41 @@ export class ExtractorService {
|
||||
* 4. f_frame.locator("#mainiframe").content_frame - Get nested inner frame
|
||||
* 5. setup_query_interface(work_frame) - Setup query interface
|
||||
*/
|
||||
private async navigateToExtractorPage(session: ErpSession): Promise<{ popupPage: any; workFrame: any }> {
|
||||
const { page, mainFrame } = session;
|
||||
private async navigateToExtractorPage(
|
||||
session: ErpSession
|
||||
): Promise<{ popupPage: any; workFrame: any }> {
|
||||
const { page, mainFrame } = session
|
||||
|
||||
// Step 1: Click menu icon (Python line 266)
|
||||
// main_frame is #forwardFrame.content_frame returned from login
|
||||
await mainFrame.locator('i').first().click();
|
||||
await mainFrame.locator('i').first().click()
|
||||
|
||||
// Step 2: Click discrete material plan menu item and expect popup (Python lines 267-271)
|
||||
const popupPromise = page.waitForEvent('popup');
|
||||
await mainFrame.getByTitle('离散备料计划维护', { exact: true }).first().click();
|
||||
const popupPage = await popupPromise;
|
||||
const popupPromise = page.waitForEvent('popup')
|
||||
await mainFrame.getByTitle('离散备料计划维护', { exact: true }).first().click()
|
||||
const popupPage = await popupPromise
|
||||
|
||||
// Step 3 & 4: Get nested frame structure in popup window (Python lines 273-276)
|
||||
// popup page contains #forwardFrame, which contains #mainiframe
|
||||
const forwardFrameLocator = popupPage.locator('#forwardFrame');
|
||||
const fFrame = await forwardFrameLocator.contentFrame();
|
||||
const forwardFrameLocator = popupPage.locator('#forwardFrame')
|
||||
const fFrame = await forwardFrameLocator.contentFrame()
|
||||
|
||||
if (!fFrame) {
|
||||
throw new Error('Failed to access popup forward frame');
|
||||
throw new Error('Failed to access popup forward frame')
|
||||
}
|
||||
|
||||
const innerFrameLocator = fFrame.locator('#mainiframe');
|
||||
await innerFrameLocator.waitFor({ state: 'visible', timeout: 15000 });
|
||||
const workFrame = await innerFrameLocator.contentFrame();
|
||||
const innerFrameLocator = fFrame.locator('#mainiframe')
|
||||
await innerFrameLocator.waitFor({ state: 'visible', timeout: 15000 })
|
||||
const workFrame = await innerFrameLocator.contentFrame()
|
||||
|
||||
if (!workFrame) {
|
||||
throw new Error('Failed to access inner work frame');
|
||||
throw new Error('Failed to access inner work frame')
|
||||
}
|
||||
|
||||
// Step 5: Setup query interface (Python line 278)
|
||||
await this.setupQueryInterface(workFrame);
|
||||
await this.setupQueryInterface(workFrame)
|
||||
|
||||
return { popupPage, workFrame };
|
||||
return { popupPage, workFrame }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -122,18 +130,18 @@ export class ExtractorService {
|
||||
*/
|
||||
private async setupQueryInterface(innerFrame: any): Promise<void> {
|
||||
// Click search icon (Python line 233)
|
||||
await innerFrame.locator('.search-name-wrapper > .iconfont').click();
|
||||
await innerFrame.locator('.search-name-wrapper > .iconfont').click()
|
||||
|
||||
// Click "订单号查询" menu item (Python line 234)
|
||||
await innerFrame.getByText('订单号查询').click();
|
||||
await innerFrame.getByText('订单号查询').click()
|
||||
|
||||
// Click "全部" tab (Python line 235)
|
||||
await innerFrame.getByRole('tab', { name: '全部' }).click();
|
||||
await innerFrame.getByRole('tab', { name: '全部' }).click()
|
||||
|
||||
// Set limit to 5000 (Python lines 237-239)
|
||||
const inputBox = innerFrame.locator('#rc_select_0');
|
||||
await inputBox.fill('5000');
|
||||
await inputBox.press('Enter');
|
||||
const inputBox = innerFrame.locator('#rc_select_0')
|
||||
await inputBox.fill('5000')
|
||||
await inputBox.press('Enter')
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -149,43 +157,40 @@ export class ExtractorService {
|
||||
totalBatches: number
|
||||
): Promise<string> {
|
||||
// Fill order numbers (Python lines 143-145)
|
||||
const textbox = workFrame.getByRole('textbox', { name: '来源生产订单号' });
|
||||
await textbox.fill('');
|
||||
await textbox.fill(orderNumbers.join(','));
|
||||
const textbox = workFrame.getByRole('textbox', { name: '来源生产订单号' })
|
||||
await textbox.fill('')
|
||||
await textbox.fill(orderNumbers.join(','))
|
||||
|
||||
// Click search button (Python line 147)
|
||||
await workFrame.locator('.search-component-searchBtn').click();
|
||||
await workFrame.locator('.search-component-searchBtn').click()
|
||||
|
||||
// Wait for loading (Python lines 148-153)
|
||||
await this.waitForLoading(workFrame);
|
||||
await this.waitForLoading(workFrame)
|
||||
|
||||
// Click first row checkbox (Python line 155)
|
||||
await workFrame.getByRole('row', { name: '序号' }).getByLabel('').click();
|
||||
await workFrame.getByRole('row', { name: '序号' }).getByLabel('').click()
|
||||
|
||||
// Hover and click "更多" button (Python lines 156-157)
|
||||
await workFrame.getByRole('button', { name: '更多' }).hover();
|
||||
await workFrame.getByText('输出', { exact: true }).click();
|
||||
await workFrame.getByRole('button', { name: '更多' }).hover()
|
||||
await workFrame.getByText('输出', { exact: true }).click()
|
||||
|
||||
// Set threshold (Python lines 159-164)
|
||||
const thresholdBox = workFrame
|
||||
.locator('div')
|
||||
.filter({ hasText: /^行数阈值$/ })
|
||||
.locator('input[type="text"]');
|
||||
await thresholdBox.fill('300000');
|
||||
.locator('input[type="text"]')
|
||||
await thresholdBox.fill('300000')
|
||||
|
||||
// Setup download handler and click confirm (Python lines 166-172)
|
||||
const downloadPath = path.join(
|
||||
this.downloadDir,
|
||||
`temp_batch_${batchIndex + 1}.xlsx`
|
||||
);
|
||||
const downloadPath = path.join(this.downloadDir, `temp_batch_${batchIndex + 1}.xlsx`)
|
||||
|
||||
const downloadPromise = popupPage.waitForEvent('download');
|
||||
await workFrame.getByRole('button', { name: '确定(Y)' }).click();
|
||||
const downloadPromise = popupPage.waitForEvent('download')
|
||||
await workFrame.getByRole('button', { name: '确定(Y)' }).click()
|
||||
|
||||
const download = await downloadPromise;
|
||||
await download.saveAs(downloadPath);
|
||||
const download = await downloadPromise
|
||||
await download.saveAs(downloadPath)
|
||||
|
||||
return downloadPath;
|
||||
return downloadPath
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -193,11 +198,14 @@ export class ExtractorService {
|
||||
* Reference: Python lines 148-153
|
||||
*/
|
||||
private async waitForLoading(workFrame: any): Promise<void> {
|
||||
const loadingLocator = workFrame.locator('div').filter({ hasText: ERP_LOCATORS.extractor.loadingText }).nth(1);
|
||||
const loadingLocator = workFrame
|
||||
.locator('div')
|
||||
.filter({ hasText: ERP_LOCATORS.extractor.loadingText })
|
||||
.nth(1)
|
||||
|
||||
try {
|
||||
await loadingLocator.waitFor({ state: 'visible', timeout: 3000 });
|
||||
await loadingLocator.waitFor({ state: 'hidden', timeout: 0 });
|
||||
await loadingLocator.waitFor({ state: 'visible', timeout: 3000 })
|
||||
await loadingLocator.waitFor({ state: 'hidden', timeout: 0 })
|
||||
} catch {
|
||||
// Loading completed quickly or never appeared
|
||||
}
|
||||
@@ -208,10 +216,10 @@ export class ExtractorService {
|
||||
* Reference: Python group_order_ids() method lines 128-131
|
||||
*/
|
||||
private createBatches<T>(items: T[], batchSize: number): T[][] {
|
||||
const batches: T[][] = [];
|
||||
const batches: T[][] = []
|
||||
for (let i = 0; i < items.length; i += batchSize) {
|
||||
batches.push(items.slice(i, i + batchSize));
|
||||
batches.push(items.slice(i, i + batchSize))
|
||||
}
|
||||
return batches;
|
||||
return batches
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user