Merge branch '2.6.1-Bugfix-Massenbearbeitung' into 2.7.0-Release

This commit is contained in:
Developer01 2025-10-22 08:37:12 +02:00
commit 5b001aee03
3 changed files with 10 additions and 9 deletions

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.0.0")>
<Assembly: AssemblyVersion("2.6.1.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")>

View File

@ -456,7 +456,9 @@
<Compile Include="ClassAnnotation.vb" />
<Compile Include="ClassConfig.vb" />
<Compile Include="ClassConstants.vb" />
<Compile Include="ClassControlCreator.vb" />
<Compile Include="\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\SchreiberM\Downloads\taskFlow\ClassControlCreator.vb">
<Link>ClassControlCreator.vb</Link>
</Compile>
<Compile Include="ClassDragDrop.vb" />
<Compile Include="ClassFinalIndex.vb" />
<Compile Include="ClassFinalizeDoc.vb" />

View File

@ -1339,15 +1339,14 @@ Public Class frmMassValidator
Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 0 GDP [{oResult}] exists?...")
LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
If File.Exists(oResult) = False Then
LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...")
oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)"
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
If File.Exists(oResult) = False Then
Return False
End If
Return False
End If
WMDocPathWindows = oResult
CURRENT_DOC_PATH = WMDocPathWindows