From db0bb54790fbc28e6184c72a858513eb2cf15c23 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 12 Mar 2021 10:26:49 +0100 Subject: [PATCH] MS --- app/DD_PM_WINDREAM/frmValidator.resx | 2 +- app/DD_PM_WINDREAM/frmValidator.vb | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 366de36..3e6b2b7 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -319,7 +319,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.4.2.1, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.4.4.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 91df43f..ae0e6d9 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2303,7 +2303,7 @@ Public Class frmValidator Function Get_Next_GUID() As Integer Try LOGGER.Debug("Get_Next_GUID...") - Dim newGUID As Integer + Dim oNewGUID As Integer LOGGER.Debug("Old Document_Path: " & OLD_Document_Path) Dim oBIT As Integer = 0 @@ -2314,27 +2314,27 @@ Public Class frmValidator Dim oDT As DataTable = ClassDatabase.Return_Datatable(oSQL, "Get_Next_GUID") If oDT.Rows.Count > 0 Then - newGUID = oDT.Rows(0).Item(0) + oNewGUID = oDT.Rows(0).Item(0) CURRENT_DOC_ID = oDT.Rows(0).Item(1) Else LOGGER.Info(" >> Attention: in GetNextGUID - Could not get a GUID(1)") - newGUID = 0 - Return newGUID + oNewGUID = 0 + Return oNewGUID End If 'newGUID = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, True) WMDocPathWindows = "" CURRENT_DOC_PATH = "" CURRENT_WMFILE = Nothing - If newGUID > 0 Then - LOGGER.Debug("newGUID: " & newGUID.ToString) + If oNewGUID > 0 Then + LOGGER.Debug("newGUID: " & oNewGUID.ToString) - ElseIf newGUID <> 0 Then + ElseIf oNewGUID <> 0 Then LOGGER.Info(" >> Attention: in GetNextGUID - Could not get a GUID(2)") - newGUID = 0 + oNewGUID = 0 End If - Return newGUID + Return oNewGUID Catch ex As Exception LOGGER.Error(ex) oErrMsgMissingInput = "Unexpected error in Get_Next_GUID: " & ex.Message @@ -3687,7 +3687,7 @@ Public Class frmValidator Next - Return + 'Return Finish_WFStep() btnSave.Enabled = True