Fix common module and simplify Z1 export

vba_code_kotsu_master.txt

@@ -238,23 +238,31 @@ Sub Z1_ExportMasterDetailData()
     savePath = GetSaveCSVPath()
     If savePath = "" Then Exit Sub
     
-    ' Define columns to export (C, I-R = 3, 9-18)
-    Dim dataColumns(0 To 9) As Long
-    dataColumns(0) = 3
-    dataColumns(1) = 9
-    dataColumns(2) = 10
-    dataColumns(3) = 11
-    dataColumns(4) = 12
-    dataColumns(5) = 13
-    dataColumns(6) = 14
-    dataColumns(7) = 15
-    dataColumns(8) = 16
-    dataColumns(9) = 17
-    dataColumns(10) = 18
-    
-    ' Build CSV content (with header from row 5)
+    ' Build header from row 5
     Dim csvContent As String
-    csvContent = BuildCSVContent(ws, 7, lastDataRow, dataColumns, 5)
+    csvContent = Trim(ws.Cells(5, 3).Value)
+    Dim j As Long
+    For j = 9 To 18
+        csvContent = csvContent & "," & Trim(ws.Cells(5, j).Value)
+    Next j
+    csvContent = csvContent & vbLf
+    
+    ' Build data rows
+    Dim r As Long
+    For r = 7 To lastDataRow
+        If Len(Trim(ws.Cells(r, 3).Value & "")) > 0 Then
+            csvContent = csvContent & CleanCSVField(ws.Cells(r, 3).Value)
+            For j = 9 To 18
+                csvContent = csvContent & "," & CleanCSVField(ws.Cells(r, j).Value)
+            Next j
+            csvContent = csvContent & vbLf
+        End If
+    Next r
+    
+    ' Trim trailing
+    Do While Right(csvContent, 1) = vbLf
+        csvContent = Left(csvContent, Len(csvContent) - 1)
+    Loop
     
     ' Count rows
     Dim rowCount As Long