diff --git a/XVBA/新版着工要因閲覧シート/vba-files/Module/Module1.bas b/XVBA/新版着工要因閲覧シート/vba-files/Module/Module1.bas index fa464929..919de8e7 100644 --- a/XVBA/新版着工要因閲覧シート/vba-files/Module/Module1.bas +++ b/XVBA/新版着工要因閲覧シート/vba-files/Module/Module1.bas @@ -6,7 +6,6 @@ Public baseURL As String Public yearFilter As String Public tableId As String Public defaultSh As Worksheet -Public fetchMethod As String Function init() 'Pleasanter API KEY @@ -15,7 +14,6 @@ Function init() tableId = Range("HvID") Set defaultSh = ThisWorkbook.Sheets("{") - fetchMethod = defaultSh.Range("D7").Value End Function '****************************************************************************** @@ -32,13 +30,10 @@ Sub run() '------------------------------------------ Debug.Print "Jn" - Dim success As Boolean - Select Case fetchMethod - Case "Get" - success = runGetFlow() - Case Else - success = runExportFlow() - End Select + Dim exportSuccess As Boolean + Dim getSuccess As Boolean + exportSuccess = runExportFlow() + getSuccess = runGetFlow() Debug.Print "I" '------------------------------------------ @@ -52,7 +47,7 @@ Cleanup: If Err.Number <> 0 Then defaultSh.Range("D3").Value = "捞siG[j: " & Err.Description Err.Clear - ElseIf Not success Then + ElseIf Not (exportSuccess And getSuccess) Then defaultSh.Range("D3").Value = "捞sif[^擾G[j" Else defaultSh.Range("D3").Value = "捞" @@ -72,12 +67,7 @@ Function runExportFlow() As Boolean Debug.Print "f[^擾ł܂ł" runExportFlow = False Else - 'Gets̃wb_\cĂꍇɔAe[u폜Ă蒼 - On Error Resume Next - ThisWorkbook.Sheets(tableId).ListObjects(tableId).Delete - On Error GoTo 0 - - Call exportCSVDataToSheet(resData, tableId) + Call exportCSVDataToSheet(resData, tableId & "E") runExportFlow = True End If End Function @@ -98,7 +88,7 @@ Function runGetFlow() As Boolean Debug.Print "f[^擾ł܂ł" runGetFlow = False Else - Call getRecordsDataToSheet(records, tableId) + Call getRecordsDataToSheet(records, tableId & "G") runGetFlow = True End If End Function