style: standardize VBA property and method name casing
All checks were successful
NTFY Notification / notify (push) Successful in 11s
All checks were successful
NTFY Notification / notify (push) Successful in 11s
Standardize all VBA property and method names to lowercase for consistent code style: - Err object: Err.Description → err.Description, Err.Number → err.Number - Collection properties: .Count → .count - Range properties: .Rows.Count → .Rows.count, .Row → .row - Dictionary methods: .Keys → .keys, .Exists → .exists - Worksheet properties: .Sheets.Count → .Sheets.count - Fix typo: Thisworkbook.Path → ThisWorkbook.Path VBA is case-insensitive, but consistent lowercase convention improves readability. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -216,7 +216,7 @@ Public Function RunBOMExtraction() As String
|
||||
Dim msg As String
|
||||
msg = "BOM提取完成!" & vbCrLf & _
|
||||
"处理型号数: " & totalModels & vbCrLf & _
|
||||
"提取物料数: " & allResults.Count & vbCrLf & _
|
||||
"提取物料数: " & allResults.count & vbCrLf & _
|
||||
"成功数: " & successCount & vbCrLf & _
|
||||
"异常数: " & errorCount & vbCrLf & _
|
||||
"已生成库存比对工作表"
|
||||
@@ -231,7 +231,7 @@ Public Function RunBOMExtraction() As String
|
||||
GoTo ExitHandler
|
||||
|
||||
MainErrorHandler:
|
||||
RunBOMExtraction = "发生运行时错误: " & Err.Description & " (错误号: " & Err.Number & ")"
|
||||
RunBOMExtraction = "发生运行时错误: " & err.Description & " (错误号: " & err.Number & ")"
|
||||
|
||||
ExitHandler:
|
||||
' 清理
|
||||
@@ -422,10 +422,10 @@ Private Function ProcessSingleModel( _
|
||||
ErrorHandler:
|
||||
If Not logger Is Nothing Then
|
||||
logger.Record productionOrderNo, "M09.ProcessSingleModel", "SystemError", _
|
||||
"处理型号[" & modelString & "]失败: " & Err.Description, ""
|
||||
"处理型号[" & modelString & "]失败: " & err.Description, ""
|
||||
End If
|
||||
|
||||
results.Add GenerateErrorRow(modelString, "系统错误: " & Err.Description, productionOrderNo, True)
|
||||
results.Add GenerateErrorRow(modelString, "系统错误: " & err.Description, productionOrderNo, True)
|
||||
Set ProcessSingleModel = results
|
||||
End Function
|
||||
|
||||
@@ -495,7 +495,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
Debug.Print " -> 标准匹配: success=" & bomMatchResult("success") & ", rowCount=" & bomMatchResult("rowCount")
|
||||
|
||||
' 步骤2: 如果标准匹配成功,调用部件处理器
|
||||
|
||||
|
||||
Set componentMaterials = New Collection
|
||||
|
||||
If bomMatchResult("success") Then
|
||||
@@ -507,7 +507,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
|
||||
' 步骤3: 创建匹配结果对象,使用标准匹配的rowCount(工作表行数,不是物料数)
|
||||
matchResult("success") = bomMatchResult("success")
|
||||
matchResult("rowCount") = bomMatchResult("rowCount") ' ✅ 关键修复:使用标准匹配的rowCount
|
||||
matchResult("rowCount") = bomMatchResult("rowCount") ' ?? 关键修复:使用标准匹配的rowCount
|
||||
Set matchResult("rowNums") = bomMatchResult("rowNums")
|
||||
|
||||
' 步骤4: 添加物料到匹配结果
|
||||
@@ -551,7 +551,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
End If
|
||||
Next i
|
||||
|
||||
Debug.Print " -> 共添加 " & matchResult("materials").Count & " 个物料"
|
||||
Debug.Print " -> 共添加 " & matchResult("materials").count & " 个物料"
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -575,7 +575,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
If validationResult("valid") Then
|
||||
' 验证通过,收集所有物料
|
||||
Dim resultKey As Variant
|
||||
For Each resultKey In resultsDict.Keys
|
||||
For Each resultKey In resultsDict.keys
|
||||
Dim result As Object
|
||||
Set result = resultsDict(resultKey)
|
||||
|
||||
@@ -587,7 +587,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
Else
|
||||
' 验证失败,仍然收集物料以便在输出中显示错误
|
||||
Dim resultKey2 As Variant
|
||||
For Each resultKey2 In resultsDict.Keys
|
||||
For Each resultKey2 In resultsDict.keys
|
||||
Dim result2 As Object
|
||||
Set result2 = resultsDict(resultKey2)
|
||||
|
||||
@@ -607,7 +607,7 @@ Private Function MatchAllMaterialTypesWithValidation( _
|
||||
ErrorHandler:
|
||||
If Not logger Is Nothing Then
|
||||
logger.Record productionOrderNo, "M09.MatchAllMaterialTypesWithValidation", "SystemError", _
|
||||
"匹配物料类型失败: " & Err.Description, ""
|
||||
"匹配物料类型失败: " & err.Description, ""
|
||||
End If
|
||||
|
||||
Dim emptyColl As Collection
|
||||
@@ -670,7 +670,7 @@ Private Function ValidateAllMatchResults( _
|
||||
Set warnings = New Collection
|
||||
|
||||
Dim sheetKey As Variant
|
||||
For Each sheetKey In resultsDict.Keys
|
||||
For Each sheetKey In resultsDict.keys
|
||||
Dim result As Object
|
||||
Set result = resultsDict(sheetKey)
|
||||
|
||||
@@ -917,7 +917,7 @@ Private Function ValidateAllMatchResults( _
|
||||
ErrorHandler:
|
||||
If Not logger Is Nothing Then
|
||||
logger.Record productionOrderNo, "M09.ValidateAllMatchResults", "SystemError", _
|
||||
"验证匹配结果失败: " & Err.Description, ""
|
||||
"验证匹配结果失败: " & err.Description, ""
|
||||
End If
|
||||
|
||||
validation("valid") = False
|
||||
@@ -1420,7 +1420,7 @@ Private Function WriteInventoryComparisonResults( _
|
||||
Dim i As Long
|
||||
Dim j As Long
|
||||
Dim result As Variant
|
||||
Dim orderNo As String
|
||||
Dim OrderNo As String
|
||||
Dim modelStr As String
|
||||
Dim componentResults As Collection
|
||||
Dim materialType As String
|
||||
@@ -1447,7 +1447,7 @@ Private Function WriteInventoryComparisonResults( _
|
||||
On Error GoTo ErrorHandler
|
||||
|
||||
If ws Is Nothing Then
|
||||
Set ws = ThisWorkbook.Worksheets.Add(After:=ActiveWorkbook.Sheets(ActiveWorkbook.Sheets.Count))
|
||||
Set ws = ThisWorkbook.Worksheets.Add(After:=ActiveWorkbook.Sheets(ActiveWorkbook.Sheets.count))
|
||||
ws.Name = INVENTORY_COMPARISON_SHEET_NAME
|
||||
Else
|
||||
ws.Cells.Clear
|
||||
@@ -1476,16 +1476,16 @@ Private Function WriteInventoryComparisonResults( _
|
||||
|
||||
Set modelToOrderMap = CreateObject("Scripting.Dictionary")
|
||||
|
||||
For i = 1 To results.Count
|
||||
For i = 1 To results.count
|
||||
result = results(i)
|
||||
|
||||
orderNo = CStr(result(1)) ' 第1列:生产订单号
|
||||
OrderNo = CStr(result(1)) ' 第1列:生产订单号
|
||||
modelStr = CStr(result(2)) ' 第2列:原始产品型号
|
||||
|
||||
' 仅当订单号不为空时,添加映射
|
||||
If Len(Trim(orderNo)) > 0 And Len(Trim(modelStr)) > 0 Then
|
||||
If Len(Trim(OrderNo)) > 0 And Len(Trim(modelStr)) > 0 Then
|
||||
If Not modelToOrderMap.Exists(modelStr) Then
|
||||
modelToOrderMap.Add modelStr, orderNo
|
||||
modelToOrderMap.Add modelStr, OrderNo
|
||||
End If
|
||||
End If
|
||||
Next i
|
||||
@@ -1495,7 +1495,7 @@ Private Function WriteInventoryComparisonResults( _
|
||||
' ========================================
|
||||
Set componentResults = New Collection
|
||||
|
||||
For i = 1 To results.Count
|
||||
For i = 1 To results.count
|
||||
result = results(i)
|
||||
|
||||
' 第9列是物料类型
|
||||
@@ -1508,12 +1508,12 @@ Private Function WriteInventoryComparisonResults( _
|
||||
Next i
|
||||
|
||||
' 写入数据
|
||||
If componentResults.Count > 0 Then
|
||||
If componentResults.count > 0 Then
|
||||
' 先设置物料编码列(第3列,C列)为文本格式
|
||||
ws.Range("C2:C" & (componentResults.Count + 1)).NumberFormat = "@"
|
||||
ws.Range("C2:C" & (componentResults.count + 1)).NumberFormat = "@"
|
||||
|
||||
' 准备输出数组
|
||||
ReDim outputArr(1 To componentResults.Count, 1 To 7)
|
||||
ReDim outputArr(1 To componentResults.count, 1 To 7)
|
||||
|
||||
' 序号生成变量
|
||||
baseSeqNum = 0
|
||||
@@ -1524,7 +1524,7 @@ Private Function WriteInventoryComparisonResults( _
|
||||
' ========================================
|
||||
' 步骤3: 写入库存比对数据
|
||||
' ========================================
|
||||
For i = 1 To componentResults.Count
|
||||
For i = 1 To componentResults.count
|
||||
result = componentResults(i)
|
||||
|
||||
' 【关键修复】从映射表中获取订单号
|
||||
@@ -1591,16 +1591,16 @@ Private Function WriteInventoryComparisonResults( _
|
||||
Next i
|
||||
|
||||
' 批量写入数据
|
||||
ws.Range("A2").Resize(componentResults.Count, 7).Value = outputArr
|
||||
ws.Range("A2").Resize(componentResults.count, 7).Value = outputArr
|
||||
|
||||
' 格式化数据区域
|
||||
With ws.Range("A2:G" & (componentResults.Count + 1))
|
||||
With ws.Range("A2:G" & (componentResults.count + 1))
|
||||
.Borders.LineStyle = xlContinuous
|
||||
.Borders.Weight = xlThin
|
||||
End With
|
||||
|
||||
' 根据库存状态设置背景色
|
||||
For i = 1 To componentResults.Count
|
||||
For i = 1 To componentResults.count
|
||||
suffStatus = CStr(outputArr(i, 7))
|
||||
|
||||
If suffStatus = "否" Then
|
||||
|
||||
Reference in New Issue
Block a user