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

fix(order-resolver): support case-insensitive production ID lookup

Browse Source 
Add case-insensitive comparison for production ID database queries:
- SQL Server: use COLLATE SQL_Latin1_General_CP1_CI_AS
- MySQL: use UPPER() function for both field and input
- Map lookup: store keys in lowercase for consistent matching

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Misaka_Company
2026-03-17 16:37:59 +08:00
parent 9248be6310
commit fbcc656b99
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/services/erp/order-resolver.ts
View File

@@ -132,10 +132,12 @@ export class OrderNumberResolver {
let params: any[] let params: any[]
if (this.dbService.type === 'sqlserver') { if (this.dbService.type === 'sqlserver') {
sql = `SELECT TOP 1 [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] = @p0` // 使用 COLLATE 指定不区分大小写的排序规则
sql = `SELECT TOP 1 [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS = @p0`
params = [productionId] params = [productionId]
} else { } else {
sql = `SELECT \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE \`${dbConfig.FIELD_PRODUCTION_ID}\` = ? LIMIT 1` // MySQL 默认不区分大小写，但显式使用 UPPER 确保一致性
sql = `SELECT \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE UPPER(\`${dbConfig.FIELD_PRODUCTION_ID}\`) = UPPER(?) LIMIT 1`
params = [productionId] params = [productionId]
} }
@@ -179,11 +181,13 @@ export class OrderNumberResolver {
let sql: string let sql: string
if (this.dbService.type === 'sqlserver') { if (this.dbService.type === 'sqlserver') {
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships // P0: Use DISTINCT to prevent duplicates from one-to-many relationships
sql = `SELECT DISTINCT [${dbConfig.FIELD_PRODUCTION_ID}], [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] IN (${placeholders})` // 使用 COLLATE 指定不区分大小写的排序规则
sql = `SELECT DISTINCT [${dbConfig.FIELD_PRODUCTION_ID}], [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS IN (${placeholders})`
} else { } else {
const idPlaceholders = uniqueProductionIds.map(() => '?').join(', ') const idPlaceholders = uniqueProductionIds.map(() => 'UPPER(?)').join(', ')
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships // P0: Use DISTINCT to prevent duplicates from one-to-many relationships
sql = `SELECT DISTINCT \`${dbConfig.FIELD_PRODUCTION_ID}\`, \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE \`${dbConfig.FIELD_PRODUCTION_ID}\` IN (${idPlaceholders})` // MySQL: 使用 UPPER 确保不区分大小写
sql = `SELECT DISTINCT \`${dbConfig.FIELD_PRODUCTION_ID}\`, \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE UPPER(\`${dbConfig.FIELD_PRODUCTION_ID}\`) IN (${idPlaceholders})`
} }
const result = await this.dbService.query(sql, params) const result = await this.dbService.query(sql, params)
@@ -232,11 +236,12 @@ export class OrderNumberResolver {
} }
// Batch query productionId to order number mappings // Batch query productionId to order number mappings
// 使用小写 key 存储映射，以支持忽略大小写查找
const mappings = new Map<string, string>() const mappings = new Map<string, string>()
if (productionIds.length > 0) { if (productionIds.length > 0) {
const batchMappings = await this.mapProductionIdsToOrderNumbers(productionIds) const batchMappings = await this.mapProductionIdsToOrderNumbers(productionIds)
batchMappings.forEach((orderNum, prodId) => { batchMappings.forEach((orderNum, prodId) => {
mappings.set(prodId, orderNum) mappings.set(prodId.toLowerCase(), orderNum)
}) })
} }
@@ -258,9 +263,9 @@ export class OrderNumberResolver {
mapping.orderNumber = input mapping.orderNumber = input
mapping.resolved = true mapping.resolved = true
} else if (this.isProductionId(input)) { } else if (this.isProductionId(input)) {
// Is a productionID, lookup from batch mappings // Is a productionID, lookup from batch mappings (使用小写查找以忽略大小写)
mapping.productionId = input mapping.productionId = input
const orderNumber = mappings.get(input) const orderNumber = mappings.get(input.toLowerCase())
if (orderNumber) { if (orderNumber) {
mapping.orderNumber = orderNumber mapping.orderNumber = orderNumber
mapping.resolved = true mapping.resolved = true