AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS12.11_2

Browse Source
This commit is contained in:
SchreiberM
2015-11-12 15:33:51 +01:00
parent 4b3c9b3aa5
commit 16a53fb312
6 changed files with 113 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/DD-Record-Organiser/XtraForm2.vb
View File

@@ -437,9 +437,15 @@ Public Class frmConstructor_Main
PARENT_RECORDID = EBENE1_RECID
CURRENT_PARENTID = EBENE1_RECID
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
If GRID_TYPE = GridType.Grid Then
Else
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
End If
End If
'tslblEntity3.Visible = False
Select Case CURRENT_FORM_TYPE
@@ -454,12 +460,18 @@ Public Class frmConstructor_Main
EBENE3_COLUMNNAME = ""
'Wenn bereits ein Record für Ebene 1 gewählt wurde dann einschränken
If EBENE1_RECID > 0 Then
'_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
_sql = _sql.Replace("@RecordID", EBENE1_RECID)
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
If GRID_TYPE = GridType.Grid Then
Else
'_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
_sql = _sql.Replace("@RecordID", EBENE1_RECID)
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
End If
Else
_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
End If
@@ -494,11 +506,18 @@ Public Class frmConstructor_Main
If EBENE2_RECID > 0 Then
Try
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
_sql = _sql.Replace("@RecordID", EBENE2_RECID)
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
If GRID_TYPE = GridType.Grid Then
Else
_sql = _sql.Replace("@RecordID", EBENE2_RECID)
_sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
_sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
_sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
End If
Catch ex As Exception