AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

Browse Source
This commit is contained in:
SchreiberM 2022-07-15 09:06:14 +02:00
commit 5540eef4ad
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/ClassSQLEditor.vb
View File

@ -19,9 +19,11 @@ Public Class ClassSQLEditor
'CURRENT_DESIGN_TYPE = "INPUT_INDEX" 'CURRENT_DESIGN_TYPE = "INPUT_INDEX"
Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
oForm.SQLCommand = SQLSTring oForm.SQLCommand = SQLSTring
If svc.ShowDialog(oForm) = DialogResult.OK Then If svc.ShowDialog(oForm) = DialogResult.OK Then
Dim sql As New SQLValue(oForm.SQLCommand) Dim sql As New SQLValue(oForm.SQLCommand)
CURRENT_SQL_CON = oForm.SQLConnection CURRENT_SQL_CON = oForm.SQLConnection
CURRENT_CONN_ID = oForm.SQLConnection
value = sql value = sql
End If End If
End Using End Using

4
app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
View File

@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("TaskFlow")> <Assembly: AssemblyProduct("TaskFlow")>
<Assembly: AssemblyCopyright("Copyright © Digital Data 2022")> <Assembly: AssemblyCopyright("Copyright © Digital Data 2022")>
<Assembly: AssemblyTrademark("2.3.7.5")> <Assembly: AssemblyTrademark("2.3.7.9")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.7.6")> <Assembly: AssemblyVersion("2.3.7.9")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

14
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -3978,12 +3978,7 @@ Public Class frmValidator
ItemWorked = False ItemWorked = False
End If End If
If Not IsNothing(oSQLCommand) Then If Not IsNothing(oSQLCommand) Then
Dim oDBResult = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID) Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID)
Dim oResultfromSQL As Object = ""
If oDBResult.OK Then
oResultfromSQL = oDBResult.Scalar
End If
If Not IsNothing(oResultfromSQL) Then If Not IsNothing(oResultfromSQL) Then
LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]") LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]")
If IsDBNull(oResultfromSQL) Then If IsDBNull(oResultfromSQL) Then
@ -4415,10 +4410,11 @@ Public Class frmValidator
Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG")) Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG"))
Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY")) Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY"))
If oIsReadOnly = True Then ' WARUM HABEN SIE GEMACHT????!!!!!!einself11
'If oIsReadOnly = True Then
' Continue For
'End If
Continue For
End If
Dim oControlType As String = oControlRow.Item("CTRL_TYPE") Dim oControlType As String = oControlRow.Item("CTRL_TYPE")
Dim oIDBTyp As Integer Dim oIDBTyp As Integer
If IDB_ACTIVE Then If IDB_ACTIVE Then