BLD-ERPAuto/BIPMaterialManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: apply prettier formatting

Browse Source 
Apply consistent formatting across all files (line endings, spacing)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Misaka
2026-03-01 14:57:38 +08:00
parent 8f6ca7b453
commit c39e1504aa
17 changed files with 631 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/services/erp/erp-auth.ts
View File

@@ -1,19 +1,19 @@
import { chromium, type Browser, type BrowserContext, type Page } from 'playwright';
import { ERP_LOCATORS } from './locators';
import type { ErpConfig, ErpSession } from '../../types/erp.types';
import { chromium, type Browser, type BrowserContext, type Page } from 'playwright'
import { ERP_LOCATORS } from './locators'
import type { ErpConfig, ErpSession } from '../../types/erp.types'
/**
* ERP Authentication Service
* Manages login session and browser lifecycle
*/
export class ErpAuthService {
private config: ErpConfig;
private session: ErpSession | null = null;
private ignoreHTTPSErrors: boolean;
private config: ErpConfig
private session: ErpSession | null = null
private ignoreHTTPSErrors: boolean
constructor(config: ErpConfig) {
this.config = config;
this.ignoreHTTPSErrors = process.env.ERP_IGNORE_HTTPS_ERRORS === 'true';
this.config = config
this.ignoreHTTPSErrors = process.env.ERP_IGNORE_HTTPS_ERRORS === 'true'
}
/**
@@ -21,7 +21,7 @@ export class ErpAuthService {
*/
async login(): Promise<ErpSession> {
if (this.session?.isLoggedIn) {
return this.session;
return this.session
}
// Launch browser with SSL certificate errors ignored
@@ -33,9 +33,9 @@ export class ErpAuthService {
'--ignore-certificate-errors',
'--ignore-ssl-errors',
'--ignore-certificate-errors-spki-list',
'--disable-web-security', // Disable web security for internal VPN
],
});
'--disable-web-security' // Disable web security for internal VPN
]
})
const context = await browser.newContext({
acceptDownloads: true,
@@ -43,76 +43,76 @@ export class ErpAuthService {
ignoreHTTPSErrors: true, // Ignore SSL certificate errors
acceptAllDownloads: true, // Accept all downloads
// Disable web security for internal VPN
javaScriptEnabled: true,
});
javaScriptEnabled: true
})
const page = await context.newPage();
const page = await context.newPage()
// Navigate to login page (use actual login URL from Python code)
const loginUrl = `${this.config.url}/yonbip/resources/uap/rbac/login/main/index.html`;
await page.goto(loginUrl);
const loginUrl = `${this.config.url}/yonbip/resources/uap/rbac/login/main/index.html`
await page.goto(loginUrl)
// Wait for page to load
await page.waitForLoadState('domcontentloaded', { timeout: 10000 });
await page.waitForLoadState('domcontentloaded', { timeout: 10000 })
// Wait for iframe to be present
await page.waitForSelector('#forwardFrame', { state: 'attached', timeout: 15000 });
await page.waitForSelector('#forwardFrame', { state: 'attached', timeout: 15000 })
// Extract forwardFrame (Python: main_frame = page.locator("#forwardFrame").content_frame)
// This is the main working frame for all subsequent operations
const frameLocator = page.locator('#forwardFrame');
const contentFrame = await frameLocator.contentFrame();
const frameLocator = page.locator('#forwardFrame')
const contentFrame = await frameLocator.contentFrame()
if (!contentFrame) {
throw new Error('Failed to access forwardFrame content frame');
throw new Error('Failed to access forwardFrame content frame')
}
// Store reference to main frame for later use (Python returns this as main_frame)
const mainFrame = contentFrame;
const mainFrame = contentFrame
// Fill username using role-based locator (Python: get_by_role("textbox", name="用户名"))
try {
await contentFrame.getByRole('textbox', { name: '用户名' }).fill(this.config.username);
await contentFrame.getByRole('textbox', { name: '用户名' }).fill(this.config.username)
} catch (e) {
throw new Error(`Failed to find username input: ${e}`);
throw new Error(`Failed to find username input: ${e}`)
}
// Fill password using role-based locator (Python: get_by_role("textbox", name="密码"))
try {
await contentFrame.getByRole('textbox', { name: '密码' }).fill(this.config.password);
await contentFrame.getByRole('textbox', { name: '密码' }).fill(this.config.password)
} catch (e) {
throw new Error(`Failed to find password input: ${e}`);
throw new Error(`Failed to find password input: ${e}`)
}
// Click login button using role-based locator (Python: get_by_role("button", name="登录"))
try {
await contentFrame.getByRole('button', { name: '登录' }).click();
await contentFrame.getByRole('button', { name: '登录' }).click()
} catch (e) {
throw new Error(`Failed to click login button: ${e}`);
throw new Error(`Failed to click login button: ${e}`)
}
// Wait for navigation after login
// The login will redirect to the main page which has a different structure
try {
await page.waitForLoadState('domcontentloaded', { timeout: 10000 });
await page.waitForLoadState('domcontentloaded', { timeout: 10000 })
} catch (e) {
console.log('Page load state check timed out, continuing...');
console.log('Page load state check timed out, continuing...')
}
// Handle force login confirmation dialog if present (Python: get_by_role("button", name="确定"))
try {
const confirmBtn = mainFrame.getByRole('button', { name: '确定' });
const count = await confirmBtn.count();
const confirmBtn = mainFrame.getByRole('button', { name: '确定' })
const count = await confirmBtn.count()
if (count > 0) {
console.log('Force login detected, clicking confirm button');
await confirmBtn.first().click();
await page.waitForTimeout(2000);
console.log('Force login detected, clicking confirm button')
await confirmBtn.first().click()
await page.waitForTimeout(2000)
} else {
console.log('Normal login, no confirmation dialog');
console.log('Normal login, no confirmation dialog')
}
} catch (e) {
// No force login dialog, continue
console.log('Normal login, no confirmation dialog');
console.log('Normal login, no confirmation dialog')
}
// Create session with mainFrame (Python returns main_frame as part of login result)
@@ -121,10 +121,10 @@ export class ErpAuthService {
context,
page,
mainFrame, // Store forwardFrame content frame for subsequent operations
isLoggedIn: true,
};
isLoggedIn: true
}
return this.session;
return this.session
}
/**
@@ -132,9 +132,9 @@ export class ErpAuthService {
*/
async close(): Promise<void> {
if (this.session) {
await this.session.context.close();
await this.session.browser.close();
this.session = null;
await this.session.context.close()
await this.session.browser.close()
this.session = null
}
}
@@ -143,15 +143,15 @@ export class ErpAuthService {
*/
getSession(): ErpSession {
if (!this.session?.isLoggedIn) {
throw new Error('Not logged in. Call login() first.');
throw new Error('Not logged in. Call login() first.')
}
return this.session;
return this.session
}
/**
* Check if session is active
*/
isActive(): boolean {
return this.session?.isLoggedIn ?? false;
return this.session?.isLoggedIn ?? false
}
}

156
src/main/services/erp/extractor.ts
View File

@@ -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
}
}

16
src/main/services/erp/locators.ts
View File

@@ -9,7 +9,7 @@ export const ERP_LOCATORS = {
login: {
usernameInput: '#username',
passwordInput: '#password',
submitButton: 'button[type="submit"]',
submitButton: 'button[type="submit"]'
},
// Main Frame
@@ -22,7 +22,7 @@ export const ERP_LOCATORS = {
// Inner iframe (inside forward frame)
innerIframe: '#mainiframe',
// Loading overlay text
loadingText: '加载中',
loadingText: '加载中'
},
// Extractor (Data Export) Page
@@ -43,7 +43,7 @@ export const ERP_LOCATORS = {
// Export dialog - threshold input
thresholdInputSelector: 'div:has-text(/^行数阈值$/) input[type="text"]',
// Confirm button
confirmButton: 'internal:has-text="确定(Y)"',
confirmButton: 'internal:has-text="确定(Y)"'
},
// Menu navigation
@@ -55,7 +55,7 @@ export const ERP_LOCATORS = {
// "All" tab
allTab: 'internal:role=tab[name="全部"]',
// Select input for setting limits
selectInput: '#rc_select_0',
selectInput: '#rc_select_0'
},
// Discrete material plan menu item
@@ -65,7 +65,7 @@ export const ERP_LOCATORS = {
cleaner: {
orderNumberInput: 'input[name="orderNumber"]',
materialGrid: 'table.material-grid tbody tr',
saveButton: 'button:has-text("保存")',
saveButton: 'button:has-text("保存")'
},
// Common Elements
@@ -74,6 +74,6 @@ export const ERP_LOCATORS = {
errorMessage: '.message.error',
confirmDialog: '.confirm-dialog',
confirmButton: 'button:has-text("确定")',
cancelButton: 'button:has-text("取消")',
},
};
cancelButton: 'button:has-text("取消")'
}
}

287
src/main/services/excel/excel-parser.ts
View File

@@ -1,10 +1,6 @@
import ExcelJS from 'exceljs';
import type {
DiscreteMaterialPlan,
ExcelParseOptions,
OrderHeader,
} from '../../types/excel.types';
import path from 'path';
import ExcelJS from 'exceljs'
import type { DiscreteMaterialPlan, ExcelParseOptions, OrderHeader } from '../../types/excel.types'
import path from 'path'
/**
* Excel Parser Service
@@ -21,8 +17,8 @@ export class ExcelParser {
// Field name mapping for Python compatibility (from Python code)
private FIELD_NAME_MAPPING: Record<string, string> = {
计划数量: '产品计划数量',
单位: '产品单位',
};
单位: '产品单位'
}
// Mapping from Chinese field names to English property names
private CHINESE_TO_ENGLISH_MAPPING: Record<string, string> = {
@@ -40,18 +36,18 @@ export class ExcelParser {
打印日期: 'printDate',
// Mapped fields (after FIELD_NAME_MAPPING)
产品计划数量: 'plannedQuantity',
产品单位: 'unit',
};
产品单位: 'unit'
}
private verbose: boolean;
private verbose: boolean
constructor(options: ExcelParseOptions = {}) {
this.verbose = options.verbose || false;
this.verbose = options.verbose || false
}
private log(...args: any[]): void {
if (this.verbose) {
console.log('[ExcelParser]', ...args);
console.log('[ExcelParser]', ...args)
}
}
@@ -59,40 +55,40 @@ export class ExcelParser {
* Parse Excel file and extract material plans
*/
async parse(filePath: string, options: ExcelParseOptions = {}): Promise<DiscreteMaterialPlan[]> {
this.log('Parsing Excel file:', filePath);
this.log('Parsing Excel file:', filePath)
const workbook = new ExcelJS.Workbook();
await workbook.xlsx.readFile(filePath);
const workbook = new ExcelJS.Workbook()
await workbook.xlsx.readFile(filePath)
const worksheet = workbook.worksheets[0];
const worksheet = workbook.worksheets[0]
if (!worksheet) {
throw new Error('No worksheet found in file');
throw new Error('No worksheet found in file')
}
const plans: DiscreteMaterialPlan[] = [];
const allRows: any[][] = [];
const plans: DiscreteMaterialPlan[] = []
const allRows: any[][] = []
// Read all rows into memory
worksheet.eachRow((row, rowNumber) => {
allRows.push(row.values as any[]);
});
allRows.push(row.values as any[])
})
this.log(`Total rows read: ${allRows.length} (worksheet has ${worksheet.rowCount} rows)`);
this.log(`Total rows read: ${allRows.length} (worksheet has ${worksheet.rowCount} rows)`)
// Parse orders from rows
const orders = this.parseOrders(allRows);
const orders = this.parseOrders(allRows)
// Store orders for potential Excel export
(this as any).lastOrders = orders;
;(this as any).lastOrders = orders
// Flatten orders into material plans
for (const order of orders) {
const { orderInfo, materials } = order;
const { orderInfo, materials } = order
// Skip empty orders if option is set
if (options.skipEmptyOrders && materials.length === 0) {
this.log('Skipping empty order:', orderInfo.productionOrder);
continue;
this.log('Skipping empty order:', orderInfo.productionOrder)
continue
}
// Create a material plan for each material row
@@ -112,15 +108,15 @@ export class ExcelParser {
warehouse: material.warehouse,
unitUsage: material.unitUsage,
cumulativeOutboundQty: material.cumulativeOutboundQty,
rowNumber: material.rowNumber,
};
plans.push(plan);
rowNumber: material.rowNumber
}
plans.push(plan)
}
}
this.log(`Parsed ${plans.length} material plans from ${orders.length} orders`);
this.log(`Parsed ${plans.length} material plans from ${orders.length} orders`)
return plans;
return plans
}
/**
@@ -131,15 +127,15 @@ export class ExcelParser {
* @param outputPath - Output Excel file path
*/
async saveAsExcel(outputPath: string): Promise<void> {
const orders = (this as any).lastOrders;
const orders = (this as any).lastOrders
if (!orders) {
throw new Error('No parsed data available. Call parse() first.');
throw new Error('No parsed data available. Call parse() first.')
}
this.log('Saving parsed data to Excel:', outputPath);
this.log('Saving parsed data to Excel:', outputPath)
const workbook = new ExcelJS.Workbook();
const worksheet = workbook.addWorksheet('Data');
const workbook = new ExcelJS.Workbook()
const worksheet = workbook.addWorksheet('Data')
// Define columns matching Python excel_converter output format exactly
worksheet.columns = [
@@ -172,12 +168,12 @@ export class ExcelParser {
{ header: '单位用量', key: 'unitUsage', width: 12 },
{ header: '累计出库数量', key: 'cumulativeOutboundQty', width: 15 },
{ header: '打印人', key: 'printer', width: 15 },
{ header: '打印日期', key: 'printDate', width: 20 },
];
{ header: '打印日期', key: 'printDate', width: 20 }
]
// Add data rows - merge orderInfo with each material
for (const order of orders) {
const { orderInfo, materials } = order;
const { orderInfo, materials } = order
for (const material of materials) {
worksheet.addRow({
@@ -213,14 +209,16 @@ export class ExcelParser {
cumulativeOutboundQty: material.cumulativeOutboundQty || 0,
// Footer info (last 2 columns)
printer: orderInfo.printer || '',
printDate: orderInfo.printDate || '',
});
printDate: orderInfo.printDate || ''
})
}
}
// Save workbook
await workbook.xlsx.writeFile(outputPath);
this.log(`Excel file saved: ${outputPath} (${orders.length} orders, ${worksheet.rowCount - 1} data rows)`);
await workbook.xlsx.writeFile(outputPath)
this.log(
`Excel file saved: ${outputPath} (${orders.length} orders, ${worksheet.rowCount - 1} data rows)`
)
}
/**
@@ -228,64 +226,54 @@ export class ExcelParser {
* Reference: _parse_sheet() in Python code
*/
private parseOrders(allRows: any[][]): Array<{ orderInfo: OrderHeader; materials: any[] }> {
const orders: Array<{ orderInfo: OrderHeader; materials: any[] }> = [];
let i = 0;
const orders: Array<{ orderInfo: OrderHeader; materials: any[] }> = []
let i = 0
while (i < allRows.length) {
const row = allRows[i];
const row = allRows[i]
// Check if this is an order title row
if (row && row[2] && String(row[2]).includes('离散备料计划')) {
// Parse order header info (next 4 rows)
const orderInfo: OrderHeader = {};
const orderInfo: OrderHeader = {}
for (let j = 1; j <= 4; j++) {
if (i + j < allRows.length && allRows[i + j]) {
this.parseHeaderRow(allRows[i + j], orderInfo);
this.parseHeaderRow(allRows[i + j], orderInfo)
}
}
// Debug: check productionOrder extraction
this.log(`Order ${orders.length + 1}: productionOrder="${orderInfo.productionOrder}"`);
this.log(`Order ${orders.length + 1}: productionOrder="${orderInfo.productionOrder}"`)
// Find table header row dynamically (look for "序号" in index 1)
// Note: worksheet.eachRow() skips empty rows, so we can't use fixed offsets
let tableRow = i + 1;
while (
tableRow < allRows.length &&
allRows[tableRow] &&
allRows[tableRow][1] !== '序号'
) {
tableRow++;
let tableRow = i + 1
while (tableRow < allRows.length && allRows[tableRow] && allRows[tableRow][1] !== '序号') {
tableRow++
}
if (tableRow >= allRows.length || !allRows[tableRow]) {
this.log(' ⚠️ Table header not found, skipping this order');
i++;
continue;
this.log(' ⚠️ Table header not found, skipping this order')
i++
continue
}
// Check if this is the table header row
// ExcelJS is 1-indexed: index 0=null, index 1=序号, index 2=材料编码
if (
tableRow < allRows.length &&
allRows[tableRow] &&
allRows[tableRow][1] === '序号'
) {
if (tableRow < allRows.length && allRows[tableRow] && allRows[tableRow][1] === '序号') {
// Check if next row is empty (no data)
const nextRow = tableRow + 1;
const nextRow = tableRow + 1
const isEmptyRow =
nextRow < allRows.length &&
allRows[nextRow] &&
allRows[nextRow].every(
(cell: any) => cell === null || String(cell).trim() === ''
);
allRows[nextRow].every((cell: any) => cell === null || String(cell).trim() === '')
if (isEmptyRow) {
// No data, find footer info
this.log('Order has no material data');
const materials: any[] = [];
const footerInfo: OrderHeader = {};
let dataRow = nextRow + 1;
this.log('Order has no material data')
const materials: any[] = []
const footerInfo: OrderHeader = {}
let dataRow = nextRow + 1
while (dataRow < allRows.length && allRows[dataRow]) {
if (
@@ -293,32 +281,32 @@ export class ExcelParser {
(String(allRows[dataRow][2]).includes('制单人') ||
String(allRows[dataRow][2]).includes('打印人'))
) {
this.parseHeaderRow(allRows[dataRow], footerInfo);
this.parseHeaderRow(allRows[dataRow], footerInfo)
if (dataRow + 1 < allRows.length && allRows[dataRow + 1]) {
this.parseHeaderRow(allRows[dataRow + 1], footerInfo);
this.parseHeaderRow(allRows[dataRow + 1], footerInfo)
}
break;
break
}
dataRow++;
dataRow++
}
orders.push({
orderInfo: { ...orderInfo, ...footerInfo },
materials,
});
materials
})
} else {
// Has data, extract materials
this.log('Order has material data');
const materials: any[] = [];
const footerInfo: OrderHeader = {};
let dataRow = tableRow + 1;
this.log('Order has material data')
const materials: any[] = []
const footerInfo: OrderHeader = {}
let dataRow = tableRow + 1
while (dataRow < allRows.length && allRows[dataRow]) {
// Check if CURRENT row is footer info (制单人/打印人)
const isCurrentRowFooter =
allRows[dataRow][2] &&
(String(allRows[dataRow][2]).includes('制单人') ||
String(allRows[dataRow][2]).includes('打印人'));
String(allRows[dataRow][2]).includes('打印人'))
// Check if NEXT row is footer info (to handle empty row before footer)
const isNextRowFooter =
@@ -326,65 +314,67 @@ export class ExcelParser {
allRows[dataRow + 1] &&
allRows[dataRow + 1][2] &&
(String(allRows[dataRow + 1][2]).includes('制单人') ||
String(allRows[dataRow + 1][2]).includes('打印人'));
String(allRows[dataRow + 1][2]).includes('打印人'))
if (isCurrentRowFooter) {
// Current row is footer, parse it and next row if exists
this.parseHeaderRow(allRows[dataRow], footerInfo);
this.parseHeaderRow(allRows[dataRow], footerInfo)
if (dataRow + 1 < allRows.length && allRows[dataRow + 1]) {
this.parseHeaderRow(allRows[dataRow + 1], footerInfo);
this.parseHeaderRow(allRows[dataRow + 1], footerInfo)
}
this.log(' Found footer row, stopping material parsing');
break;
this.log(' Found footer row, stopping material parsing')
break
}
if (isNextRowFooter) {
// Next row is footer, parse current row as material first
const material = this.parseMaterialRowInternal(allRows[dataRow], dataRow + 1);
const material = this.parseMaterialRowInternal(allRows[dataRow], dataRow + 1)
if (material) {
this.log(' Parsed material:', material.materialCode);
materials.push(material);
this.log(' Parsed material:', material.materialCode)
materials.push(material)
}
// Then parse footer rows
this.parseHeaderRow(allRows[dataRow + 1], footerInfo);
this.parseHeaderRow(allRows[dataRow + 1], footerInfo)
if (dataRow + 2 < allRows.length && allRows[dataRow + 2]) {
this.parseHeaderRow(allRows[dataRow + 2], footerInfo);
this.parseHeaderRow(allRows[dataRow + 2], footerInfo)
}
this.log(' Found footer in next row, stopping material parsing');
break;
this.log(' Found footer in next row, stopping material parsing')
break
}
// Extract material data
const material = this.parseMaterialRowInternal(allRows[dataRow], dataRow + 1);
const material = this.parseMaterialRowInternal(allRows[dataRow], dataRow + 1)
if (material) {
this.log(' Parsed material:', material.materialCode);
materials.push(material);
this.log(' Parsed material:', material.materialCode)
materials.push(material)
} else {
this.log(' Skipped material row at', dataRow + 1);
this.log(' Skipped material row at', dataRow + 1)
}
dataRow++;
dataRow++
}
orders.push({
orderInfo: { ...orderInfo, ...footerInfo },
materials,
});
materials
})
}
} else {
this.log(` ⚠️ Table header check failed at row ${tableRow + 1}, value="${allRows[tableRow] ? allRows[tableRow][1] : 'null'}"`);
this.log(
` ⚠️ Table header check failed at row ${tableRow + 1}, value="${allRows[tableRow] ? allRows[tableRow][1] : 'null'}"`
)
}
// Move to next row after this order
i = tableRow + 1;
i = tableRow + 1
} else {
i++;
i++
}
}
this.log(`parseOrders: Returning ${orders.length} orders`);
return orders;
this.log(`parseOrders: Returning ${orders.length} orders`)
return orders
}
/**
@@ -392,38 +382,38 @@ export class ExcelParser {
* Reference: _parse_header_row() in Python code
*/
private parseHeaderRow(row: any[], info: OrderHeader): void {
let j = 0;
let j = 0
while (j < row.length) {
const cell = row[j];
const cell = row[j]
if (cell && String(cell).trim() && String(cell).includes('：')) {
// Found field name
let fieldName = String(cell).replace('：', '').trim();
let fieldName = String(cell).replace('：', '').trim()
// Apply field name mapping (from Python code)
if (fieldName in this.FIELD_NAME_MAPPING) {
fieldName = this.FIELD_NAME_MAPPING[fieldName];
fieldName = this.FIELD_NAME_MAPPING[fieldName]
}
// Map Chinese field name to English property name
const englishFieldName = this.CHINESE_TO_ENGLISH_MAPPING[fieldName] || fieldName;
const englishFieldName = this.CHINESE_TO_ENGLISH_MAPPING[fieldName] || fieldName
// Skip empty cells to find first non-field-name value
let k = j + 1;
let k = j + 1
while (
k < row.length &&
(!row[k] || !String(row[k]).trim() || String(row[k]).includes('：'))
) {
k++;
k++
}
if (k < row.length && row[k] && !String(row[k]).includes('：')) {
info[englishFieldName as keyof OrderHeader] = String(row[k]).trim();
info[englishFieldName as keyof OrderHeader] = String(row[k]).trim()
}
// Skip processed value, continue to next field name
j = k + 1;
j = k + 1
} else {
j++;
j++
}
}
}
@@ -455,15 +445,15 @@ export class ExcelParser {
warehouse: row[11],
unitUsage: this.parseFloat(row[12]),
cumulativeOutboundQty: this.parseFloat(row[13]),
rowNumber,
};
rowNumber
}
// Skip if no material code
if (!material.materialCode) {
return null;
return null
}
return material;
return material
}
/**
@@ -471,10 +461,10 @@ export class ExcelParser {
*/
private parseFloat(value: any): number | undefined {
if (value === null || value === undefined) {
return undefined;
return undefined
}
const parsed = parseFloat(String(value));
return isNaN(parsed) ? undefined : parsed;
const parsed = parseFloat(String(value))
return isNaN(parsed) ? undefined : parsed
}
/**
@@ -486,11 +476,8 @@ export class ExcelParser {
*/
public isOrderRow(values: any[]): boolean {
// ExcelJS arrays are 1-indexed, check index 2 for order title
const firstCell = values[2];
return (
typeof firstCell === 'string' &&
firstCell.includes('离散备料计划')
);
const firstCell = values[2]
return typeof firstCell === 'string' && firstCell.includes('离散备料计划')
}
/**
@@ -505,9 +492,9 @@ export class ExcelParser {
*/
public extractOrderNumber(values: any[]): string {
// Parse the row to extract order number using same logic as header parsing
const orderInfo: OrderHeader = {};
this.parseHeaderRow(values, orderInfo);
return orderInfo.productionOrder || '';
const orderInfo: OrderHeader = {}
this.parseHeaderRow(values, orderInfo)
return orderInfo.productionOrder || ''
}
/**
@@ -533,22 +520,22 @@ export class ExcelParser {
// Index 3: 材料名称
// Index 4: 规格
// etc.
const materialCode = values[2]?.toString().trim();
const materialName = values[3]?.toString().trim();
const specification = values[4]?.toString().trim();
const model = values[5]?.toString().trim();
const drawingNumber = values[6]?.toString().trim();
const material = values[7]?.toString().trim();
const quantity = this.parseFloat(values[8]) || 0;
const unit = values[9]?.toString().trim() || '';
const requiredDate = values[10]?.toString().trim();
const warehouse = values[11]?.toString().trim();
const unitUsage = this.parseFloat(values[12]);
const cumulativeOutboundQty = this.parseFloat(values[13]);
const materialCode = values[2]?.toString().trim()
const materialName = values[3]?.toString().trim()
const specification = values[4]?.toString().trim()
const model = values[5]?.toString().trim()
const drawingNumber = values[6]?.toString().trim()
const material = values[7]?.toString().trim()
const quantity = this.parseFloat(values[8]) || 0
const unit = values[9]?.toString().trim() || ''
const requiredDate = values[10]?.toString().trim()
const warehouse = values[11]?.toString().trim()
const unitUsage = this.parseFloat(values[12])
const cumulativeOutboundQty = this.parseFloat(values[13])
// Skip if no material code
if (!materialCode) {
return null;
return null
}
return {
@@ -566,7 +553,7 @@ export class ExcelParser {
warehouse,
unitUsage,
cumulativeOutboundQty,
rowNumber,
};
rowNumber
}
}
}

22
src/main/types/erp.types.ts
View File

@@ -1,18 +1,18 @@
export interface ErpConfig {
url: string;
username: string;
password: string;
headless?: boolean; // Optional: override default headless setting
url: string
username: string
password: string
headless?: boolean // Optional: override default headless setting
}
export interface ErpSession {
browser: import('playwright').Browser;
context: import('playwright').BrowserContext;
page: import('playwright').Page;
mainFrame: import('playwright').Frame; // #forwardFrame content frame - main working frame after login
isLoggedIn: boolean;
browser: import('playwright').Browser
context: import('playwright').BrowserContext
page: import('playwright').Page
mainFrame: import('playwright').Frame // #forwardFrame content frame - main working frame after login
isLoggedIn: boolean
}
export interface ProgressCallback {
(message: string, progress?: number): void;
}
(message: string, progress?: number): void
}

64
src/main/types/excel.types.ts
View File

@@ -9,52 +9,52 @@
*/
export interface DiscreteMaterialPlan {
/** Order number (e.g., SC202501001) */
orderNumber: string;
orderNumber: string
/** Production ID from order header */
productionId: string;
productionId: string
/** Material code (材料编码) */
materialCode: string;
materialCode: string
/** Material name (材料名称) */
materialName: string;
materialName: string
/** Specification (规格) */
specification?: string;
specification?: string
/** Model (型号) */
model?: string;
model?: string
/** Drawing number (图号) */
drawingNumber?: string;
drawingNumber?: string
/** Material (物料材质) */
material?: string;
material?: string
/** Planned quantity (计划数量) */
quantity: number;
quantity: number
/** Unit (单位) */
unit: string;
unit: string
/** Required date (需用日期) */
requiredDate?: string;
requiredDate?: string
/** Warehouse (发料仓库) */
warehouse?: string;
warehouse?: string
/** Unit usage (单位用量) */
unitUsage?: number;
unitUsage?: number
/** Cumulative outbound quantity (累计出库数量) */
cumulativeOutboundQty?: number;
cumulativeOutboundQty?: number
/** Pending quantity (pending quantity for fulfillment) */
pendingQty?: number;
pendingQty?: number
/** Row number in Excel file */
rowNumber?: number;
rowNumber?: number
}
/**
@@ -62,16 +62,16 @@ export interface DiscreteMaterialPlan {
*/
export interface ExcelParseOptions {
/** Skip orders with no material data */
skipEmptyOrders?: boolean;
skipEmptyOrders?: boolean
/** Skip footer rows (制单人/打印人) */
skipFooter?: boolean;
skipFooter?: boolean
/** Custom field mapping */
fieldMapping?: Record<string, string>;
fieldMapping?: Record<string, string>
/** Verbose logging */
verbose?: boolean;
verbose?: boolean
}
/**
@@ -79,38 +79,38 @@ export interface ExcelParseOptions {
*/
export interface OrderHeader {
/** Order title (离散备料计划) */
title?: string;
title?: string
/** Production department (生产部门) */
productionDepartment?: string;
productionDepartment?: string
/** Production order (生产订单) */
productionOrder?: string;
productionOrder?: string
/** Product code (产品编码) */
productCode?: string;
productCode?: string
/** Product name (产品名称) */
productName?: string;
productName?: string
/** Product specification (产品规格) */
productSpecification?: string;
productSpecification?: string
/** Planned quantity (计划数量) */
plannedQuantity?: string;
plannedQuantity?: string
/** Unit (单位) */
unit?: string;
unit?: string
/** Required date (需用日期) */
requiredDate?: string;
requiredDate?: string
/** Creator (制单人) */
creator?: string;
creator?: string
/** Printer (打印人) */
printer?: string;
printer?: string
/** Print date (打印日期) */
printDate?: string;
printDate?: string
}

20
src/main/types/extractor.types.ts
View File

@@ -1,17 +1,17 @@
export interface ExtractorInput {
orderNumbers: string[];
batchSize?: number;
onProgress?: (message: string, progress: number) => void;
orderNumbers: string[]
batchSize?: number
onProgress?: (message: string, progress: number) => void
}
export interface ExtractorResult {
downloadedFiles: string[];
mergedFile: string | null;
recordCount: number;
errors: string[];
downloadedFiles: string[]
mergedFile: string | null
recordCount: number
errors: string[]
}
export interface OrderInfo {
orderNumber: string;
productionId: string;
}
orderNumber: string
productionId: string
}