Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client
This commit is contained in:
commit
6a4ed2cc1c
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.1.7.0")>
|
||||
<Assembly: AssemblyVersion("2.1.8.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
|
||||
@ -85,7 +85,19 @@ Public Class frmMain
|
||||
End Try
|
||||
Return oCHANGED
|
||||
End Function
|
||||
Private Function Free_File()
|
||||
Try
|
||||
Dim sql = $"UPDATE TBPM_PROFILE_FILES SET EDIT = 0, IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
|
||||
Return ClassDatabase.Execute_non_Query(sql)
|
||||
Catch ex As Exception
|
||||
allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}")
|
||||
LOGGER.Error(ex)
|
||||
Return False
|
||||
End Try
|
||||
End Function
|
||||
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||
Free_File()
|
||||
|
||||
Try
|
||||
FormOpenClose = True
|
||||
' Position und Größe speichern
|
||||
|
||||
@ -428,7 +428,6 @@ Public Class frmValidator
|
||||
Try
|
||||
DocumentViewerValidator.CloseDocument()
|
||||
DocumentViewerValidator.Done()
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}")
|
||||
End Try
|
||||
@ -2378,6 +2377,7 @@ Public Class frmValidator
|
||||
Private Function GetDocPathWindows(_CheckStandard As Integer)
|
||||
Try
|
||||
Dim oResult As String
|
||||
|
||||
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
|
||||
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows1")
|
||||
LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user