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

MS 2.3.0.4

Browse Source
This commit is contained in:
SchreiberM
2022-03-16 15:48:18 +01:00
parent 6c4fac05e8
commit 3ea6171c4f
28 changed files with 445 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/DD_PM_WINDREAM/frmMassValidator.vb
View File

@@ -61,7 +61,7 @@ Public Class frmMassValidator
Size = My.Settings.frmMassValidatorSize
End If
Try
DTCONTROLS = Database.GetDatatableECM($"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,{USER_LANGUAGE},CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG,* FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC") ', "MV_Load1")
DTCONTROLS = DatabaseFallback.GetDatatableECM($"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,{USER_LANGUAGE},CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG,* FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC") ', "MV_Load1")
LOGGER.Debug("Profile Data geladen")
Catch ex As Exception
LOGGER.Error(ex)
@@ -370,7 +370,7 @@ Public Class frmMassValidator
Case "TABLE"
LOGGER.Debug("Versuch Tabelle zu laden")
Dim oDTMyColumns As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")
Dim oDTMyColumns As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")
oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False)
End Select
@@ -420,7 +420,7 @@ Public Class frmMassValidator
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, True)
LOGGER.Debug(">>> sql after ReplaceAllValues: " & oSqlCommand)
_dependingControl_in_action = True
Dim oDTDEPENDING_RESULT As DataTable = Database.GetDatatableECM(oSqlCommand) ', "MV_OnLookUp1")
Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatableECM(oSqlCommand) ', "MV_OnLookUp1")
Try
Dim oDependingLookup As LookupControl3 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault()
For Each oControl As Control In pnldesigner.Controls
@@ -557,7 +557,7 @@ Public Class frmMassValidator
Select Case Typ
'Tabellendarstellung
Case "TABLE"
Dim dt As DataTable = Database.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues")
Dim dt As DataTable = DatabaseFallback.GetDatatableECM($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {CONTROL_ID} ORDER BY SEQUENCE") ', "MV_FillIndexValues")
Dim SpaltenWerte As String()
If dt.Rows.Count > 1 Then
For Each Zeile As Object In wertWD
@@ -894,7 +894,7 @@ Public Class frmMassValidator
LOGGER.Debug("Setting Values for Control [{0}]", displayboxname)
'Dim oResultTable As DataTable = ClassDatabase.Return_Datatable_ConId(sqlCommand, sqlConnection)
Dim oResultTable As DataTable = Database.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With {
Dim oResultTable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With {
.ConnectionId = sqlConnection
})
@@ -1024,7 +1024,7 @@ Public Class frmMassValidator
sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue)
Dim oConnectionId = ROW.Item(1)
'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1))
Dim resultDT As DataTable = Database.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With {
Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With {
.ConnectionId = oConnectionId
})
@@ -1068,7 +1068,7 @@ Public Class frmMassValidator
If TypeOf control Is Label Then Exit Sub
Dim sql As String = $"SELECT NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND SQL_UEBERPRUEFUNG NOT LIKE '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%'"
Dim dt As DataTable = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData")
Dim dt As DataTable = DatabaseFallback.GetDatatableECM(sql) ', "MV_LoadSimpleData")
If IsNothing(dt) Then Exit Sub
If dt.Rows.Count = 0 Then Exit Sub
@@ -1090,7 +1090,7 @@ Public Class frmMassValidator
sql = clsPatterns.ReplaceInternalValues(sql)
LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql)
'sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
dt = Database.GetDatatableECM(sql) ', "MV_LoadSimpleData1")
dt = DatabaseFallback.GetDatatableECM(sql) ', "MV_LoadSimpleData1")
If IsNothing(dt) Then
MsgBox($"SQL-Query for control {control.Name} is invalid.")
@@ -1186,7 +1186,7 @@ Public Class frmMassValidator
If CreateWMObject() = True Then
If ClassFinalizeDoc.Write_Final_Metadata(CURRENT_WMFILE) = True Then
Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", USER_USERNAME, CURRENT_DOC_GUID)
If Database.ExecuteNonQueryECM(sql) = True Then
If DatabaseFallback.ExecuteNonQueryECM(sql) = True Then
workedFiles += 1
End If
End If
@@ -1279,14 +1279,14 @@ Public Class frmMassValidator
WORK_HISTORY_ENTRY = ""
End If
Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY)
Database.ExecuteNonQueryECM(ins)
DatabaseFallback.ExecuteNonQueryECM(ins)
'####### ANNOTIEREN WENN KONFIGURIERT #######
If docrow.Item("FULL_PATH").ToString.ToLower.EndsWith(".pdf") Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
Dim DT_ENTRY As DataTable = Database.GetDatatableECM(Sql) ', "MV_Finish1")
Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish1")
If Not IsNothing(DT_ENTRY) Then
If DT_ENTRY.Rows.Count = 1 Then
Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
@@ -1297,7 +1297,7 @@ Public Class frmMassValidator
Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(value) = True Then
Dim Sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
Dim DT_ENTRIES As DataTable = Database.GetDatatableECM(Sql) ', "MV_Finish2")
Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(Sql) ', "MV_Finish2")
If Not IsNothing(DT_ENTRIES) Then
If DT_ENTRIES.Rows.Count > 0 Then
Dim AnnotationString As String = ""
@@ -1360,12 +1360,12 @@ Public Class frmMassValidator
Private Function GetWMDocPathWindows(_CheckStandard As Integer)
Dim oResult As String
Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
oResult = Database.GetScalarValueECM(oSQL)
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 0 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 = Database.GetScalarValueECM(oSQL)
oResult = DatabaseFallback.GetScalarValueECM(oSQL)
LOGGER.Debug($"Checking file 1 GDP [{oResult}] exists?...")
If File.Exists(oResult) = False Then
Return False