Update Iris_Forms_LSV und UVM

This commit is contained in:
shu committed 2021-11-20 22:15:09 +01:00
1 parent edeee4db13
commit bb166467bd
40 files changed
+74 -19

No files matched your search

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
<member name="M:EDKB08.clsIndexData.xmlinput">
<summary>XML-Datei als Datatable einlesen</summary>
<author>Stefan Hutter</author>
</member>
<member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
<summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten
+4
View File
@@ -35,6 +35,10 @@ Module Globals
Return True
Exit Function
End If
If Input = "IRIS_FORMS_UVM" Then
Return True
Exit Function
End If
Return False
End Function
+6 -1
View File
@@ -1072,7 +1072,12 @@ Public Class clsCheckandImport
'scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
'scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(17)))
scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Dokumenttypnr")))
Try
scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Dokumenttypnr")))
Catch
scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
End Try
scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Herkunftsapplikation")))
Try
+47 -18
View File
@@ -162,6 +162,7 @@ Public Class clsIndexData
End Sub
Private Sub map_iris_LSV(ByRef idxds As DataSet)
Dim tmpds As New DataSet
tmpds.ReadXml(System.AppDomain.CurrentDomain.BaseDirectory + "\edkb08struktur.xml")
tmpds.Tables(0).Columns.Add("DOKUMENTWERT21")
@@ -205,40 +206,68 @@ Public Class clsIndexData
idxds.Tables.Add(tmpds.Tables(0).Copy)
tmpds.Dispose()
End Sub
Private Function parsexml(ByVal istr As String) As String
istr = istr.Replace("&", "&amp;")
Return istr
End Function
'''<summary>XML-Datei als Datatable einlesen</summary>
'''<author>Stefan Hutter</author>
'''
Private Sub xmlinput()
Try
Dim idxds As New DataSet()
idxds.ReadXml(Me.IndexFileName)
Try
idxds.ReadXml(Me.IndexFileName)
Catch
FileOpen(21, Me.IndexFileName, OpenMode.Input)
FileOpen(22, Me.IndexFileName + ".tmp", OpenMode.Output)
Dim il As String
Dim ol As String
While Not EOF(21)
Input(21, il)
ol = parsexml(il)
PrintLine(22, ol)
End While
FileClose(21)
FileClose(22)
File.Delete(Me.IndexFileName)
Rename(Me.IndexFileName + ".tmp", Me.IndexFileName)
idxds.ReadXml(Me.IndexFileName)
End Try
Try
If Globals.Canon_Herkunft(idxds.Tables(0).Rows(0).Item("Herkunftsapplikation")) Then
If Globals.Canon_Herkunft(idxds.Tables(0).Rows(0).Item("Herkunftsapplikation")) Then
'20210816 - LSV
If idxds.Tables(0).Rows(0).Item("Herkunftsapplikation") = "IRIS_FORMS_LSV" Then
map_iris_lsv(idxds)
map_iris_LSV(idxds)
Else
map_iris_struktur(idxds)
End If
End If
End If
Catch ex As Exception
End Try 'canon-Mapping'
'Anpassungen EBES_LSV
Dim i As Integer
For i = 0 To idxds.Tables.Count - 1
'-- Canon von >20 auf > 5 geändert
If idxds.Tables(i).Columns.Count > 20 Then
Me.Indexdata = idxds.Tables(i)
Exit For
End If
Next
' Me.Indexdata = idxds.Tables(0)
Catch ex As Exception
End Try 'canon-Mapping'
'Anpassungen EBES_LSV
Dim i As Integer
For i = 0 To idxds.Tables.Count - 1
'-- Canon von >20 auf > 5 geändert
If idxds.Tables(i).Columns.Count > 20 Then
Me.Indexdata = idxds.Tables(i)
Exit For
End If
Next
' Me.Indexdata = idxds.Tables(0)
Catch ex As Exception
Journal.Insert_Journal("", "", "", Me.IndexFileName, 16, "Fehler beim einlesen der XML-Datei: " + ex.Message, "", "")
Journal.Insert_Journal("", "", "", Me.IndexFileName, 16, "Fehler beim einlesen der XML-Datei: " + ex.Message, "", "")
End Try
End Sub
Binary file not shown.
Binary file not shown.
+1
View File
@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
<member name="M:EDKB08.clsIndexData.xmlinput">
<summary>XML-Datei als Datatable einlesen</summary>
<author>Stefan Hutter</author>
</member>
<member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
<summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten
Binary file not shown.
+1
View File
@@ -440,6 +440,7 @@ Komma-getrennte Textdatei auslesen</summary>
<member name="M:EDKB08.clsIndexData.xmlinput">
<summary>XML-Datei als Datatable einlesen</summary>
<author>Stefan Hutter</author>
</member>
<member name="M:EDKB08.clsIndexData.Datentabelle_Erstellen">
<summary>Datentabelle "Indexdata" erstellen, damit die Komma-Getrennten