From 0162cc677e07ddd6ef351d532633b129e47462f6 Mon Sep 17 00:00:00 2001
From: updsv7 <updsv7@guan.onehr>
Date: Mon, 13 Apr 2026 12:10:43 +0900
Subject: [PATCH] Fix FillFromKukanMaster - ensure D,E columns are filled

---
 vba_code_kukan_detail_master.txt | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/vba_code_kukan_detail_master.txt b/vba_code_kukan_detail_master.txt
index 46ed2c6..91238ac 100644
--- a/vba_code_kukan_detail_master.txt
+++ b/vba_code_kukan_detail_master.txt
@@ -229,8 +229,6 @@ Sub FillFromKukanMaster(ByVal ws As Worksheet, ByVal rowNum As Long, Optional By
     Dim lastRow As Long
     Dim i As Long
     Dim code As String
-    Dim deValue As String
-    Dim fgValue As String
     
     On Error Resume Next
     Set wsKukan = ThisWorkbook.Worksheets("区間メンテナンス")
@@ -241,38 +239,24 @@ Sub FillFromKukanMaster(ByVal ws As Worksheet, ByVal rowNum As Long, Optional By
     code = Trim(ws.Cells(rowNum, 3).Value)
     If code = "" Then Exit Sub
     
-    lastRow = wsKukan.Cells(wsKukan.Rows.Count, "C").End(xlUp).Row
-    
-    Dim found As Boolean
-    found = False
+    lastRow = wsKukan.Cells(wsKukan.Rows.Count, 3).End(xlUp).Row
     
     For i = 7 To lastRow
         If Trim(wsKukan.Cells(i, 3).Value) = code Then
-            deValue = Trim(wsKukan.Cells(i, 4).Value) & ": " & Trim(wsKukan.Cells(i, 5).Value)
-            ws.Cells(rowNum, 4).Value = deValue
-            
-            fgValue = Trim(wsKukan.Cells(i, 6).Value) & "~" & Trim(wsKukan.Cells(i, 7).Value)
-            ws.Cells(rowNum, 5).Value = fgValue
-            
+            ws.Cells(rowNum, 4).Value = Trim(wsKukan.Cells(i, 4).Value) & ": " & Trim(wsKukan.Cells(i, 5).Value)
+            ws.Cells(rowNum, 5).Value = Trim(wsKukan.Cells(i, 6).Value) & "~" & Trim(wsKukan.Cells(i, 7).Value)
             If setG Then
                 ws.Cells(rowNum, 7).Value = "1"
                 Call MakeFDropdownByG(ws, rowNum)
             End If
-            
-            found = True
-            Exit For
+            Exit Sub
         End If
     Next
     
-    If Not found Then
-        Call ClearRowData(ws, rowNum)
-        Exit Sub
-    End If
-    
-
-    
+    Call ClearRowData(ws, rowNum)
 End Sub
 
+
 Sub ClearRowData(ByVal ws As Worksheet, ByVal rowNum As Long)
     ' Clear from D column onwards
     ws.Range(ws.Cells(rowNum, 4), ws.Cells(rowNum, 15)).ClearContents