Update Test GitWechsel

This commit is contained in:
2021-08-26 12:09:36 +02:00
parent 57b42ea08a
commit edeee4db13
65 changed files with 200 additions and 2026 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -8,7 +8,7 @@ DeleteOriginalfiles =1
Mailadresse_OK =stefan.hutter@tkb.ch
Mailadresse_NOK =stefan.hutter@tkb.ch
GSF_ConfigFiles =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\gsf\
GSF_Timer in Minuten =1
GSF_Timer in Minuten =30
GSF_Conf_Dateiendung =xml
Directorytimer =10
Directorys =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\DirectoriesToScan.txt

View File

@@ -31,6 +31,10 @@ Module Globals
Return True
Exit Function
End If
If Input = "IRIS_FORMS_LSV" Then
Return True
Exit Function
End If
Return False
End Function

View File

@@ -1068,8 +1068,12 @@ Public Class clsCheckandImport
scmCmdToExecute.CommandText = "dbo.SP_Edoka_Import_Get_Herkunftsapplikation"
scmCmdToExecute.CommandType = CommandType.StoredProcedure
scmCmdToExecute.Connection = conn_edoka.scoDBConnection
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(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")))
scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Herkunftsapplikation")))
Try
sdaAdapter.Fill(dtToReturn)
@@ -1431,6 +1435,25 @@ Public Class clsCheckandImport
bez = dok.sBezeichnung.Value + " V" + IndexData.Rows(datarow).Item("KATASTER").ToString + " " + IndexData.Rows(datarow).Item("Ort").ToString
dok.sBezeichnung = New SqlString(CType(bez, String))
End If
'***************************************************************************************************************3
'LSV
'***************************************************************************************************************3
If Globals.Herkunftsapplikation.Rows(0).Item(1) = "IRIS_FORMS_LSV" Then
Dim lsvid As String = ""
For i As Integer = 10 To IndexData.Columns.Count - 1
If Left(IndexData.Rows(datarow).Item(IndexData.Columns(i).ColumnName), 6) = "LSV-ID" Then
lsvid = IndexData.Rows(datarow).Item(IndexData.Columns(i).ColumnName)
If Len(lsvid) > 7 Then lsvid = Right(lsvid, Len(lsvid) - 7)
End If
Next
Dim bez As String
bez = dok.sBezeichnung.Value + " " + lsvid
dok.sBezeichnung = New SqlString(CType(bez, String))
'Status_Bereit_Zur_Eingangsarchivierung = dok.sBezeichnung.Value + IndexData.Rows(datarow).Item("Dokumentwert")
End If
'***************************************************************************************************************3
'EDKB09
'***************************************************************************************************************3
@@ -2082,7 +2105,7 @@ Public Class clsCheckandImport
'Dokumentwert_Sichern("Formular-ID;" + Me.IndexData.Rows(datarow).Item(25), -90004)
Else
If Me.IndexData.Rows(datarow).Item(25) <> "" Then
If UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "INTRANET" Then
If UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "INTRANET" Or UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "IRIS_FORMS_LSV" Then
Startindex_Dokumentwerte = 25
Else
Dokumentwert_Sichern("Empfänger NL;" + Me.IndexData.Rows(datarow).Item(25), -90004)
@@ -3226,7 +3249,9 @@ Public Class clsCheckandImport
Dim cb As SqlCommandBuilder = New SqlCommandBuilder(DA)
Dim dsDATEN As New DataSet()
Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item(12), FileMode.Open, FileAccess.Read)
Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item("Dateiname"), FileMode.Open, FileAccess.Read)
'20210709 - LSV
'Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item(12), FileMode.Open, FileAccess.Read)
Dim mydata(fs.Length) As Byte
Try
fs.Read(mydata, 0, fs.Length)

View File

@@ -157,6 +157,51 @@ Public Class clsIndexData
tmpds.Tables(0).Rows.Add(dr)
idxds.Tables.Clear()
idxds.Tables.Add(tmpds.Tables(0).Copy)
tmpds.Dispose()
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")
tmpds.Tables(0).Columns.Add("DOKUMENTWERT22")
tmpds.Tables(0).Columns.Add("DOKUMENTWERT23")
tmpds.Tables(0).Columns.Add("DOKUMENTWERT24")
tmpds.Tables(0).Columns.Add("DOKUMENTWERT25")
tmpds.Tables(0).Columns.Add("Stapelkennung")
Dim dr As DataRow = tmpds.Tables(0).NewRow
For Each col As DataColumn In tmpds.Tables(0).Columns
dr.Item(col.ColumnName) = ""
Next
For Each col As DataColumn In idxds.Tables(0).Columns
Try
dr.Item(col.ColumnName) = idxds.Tables(0).Rows(0).Item(col.ColumnName)
Catch
End Try
Next
dr.Item("ersteller") = idxds.Tables(0).Rows(0).Item("Benutzer")
'dr.Item("DOKUMENTTYPNR") = idxds.Tables(0).Rows(0).Item("Dokumenttyp")
'//dr.Item("DOKUMENTWERT1") = "Scandatum;" + idxds.Tables(0).Rows(0).Item("Scandatum")
'dr.Item("DOKUMENTWERT2") = "Paginatornummer;" + idxds.Tables(0).Rows(0).Item("Paginatornummer")
'dr.Item("DOKUMENTWERT3") = "Status;" + idxds.Tables(0).Rows(0).Item("Status")
'dr.Item("DOKUMENTWERT4") = "IBAN;" + idxds.Tables(0).Rows(0).Item("IBAN")
For i As Integer = 11 To 33
dr.Item("DOKUMENTWERT" + (i - 10).ToString) = idxds.Tables(0).Columns(i).ColumnName + ";" + idxds.Tables(0).Rows(0).Item(i).ToString
Next
tmpds.Tables(0).Rows.Clear()
tmpds.Tables(0).Rows.Add(dr)
idxds.Tables.Clear()
idxds.Tables.Add(tmpds.Tables(0).Copy)
tmpds.Dispose()
End Sub
@@ -169,8 +214,14 @@ Public Class clsIndexData
Try
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)
Else
map_iris_struktur(idxds)
End If
map_iris_struktur(idxds)
End If
Catch ex As Exception

Binary file not shown.

Binary file not shown.

View File

@@ -27,3 +27,4 @@ E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.xml
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.pdb
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CopyComplete
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CoreCompileInputs.cache
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.AssemblyReference.cache

Binary file not shown.

Binary file not shown.

View File

@@ -14,7 +14,7 @@
<value>data source=shu00;initial catalog=edoka;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
</setting>
<setting name="ConnProd" serializeAs="String">
<value>data source=shu00;initial catalog=edoka;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
<value>data source=shu00;initial catalog=edoka_test;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
</setting>
<setting name="Vorlagenverzeichnis" serializeAs="String">
<value>k:\edoka\edkb18</value>

View File

@@ -26,7 +26,7 @@
<value>20000</value>
</setting>
<setting name="Debug" serializeAs="String">
<value>False</value>
<value>True</value>
</setting>
</EDKB18.My.MySettings>
</userSettings>

View File

@@ -13,7 +13,34 @@ Public Class clsdb
Connection_Int = New SqlConnection(conn_int)
Connection_Prod = New SqlConnection(conn_prod)
End Sub
Function update_version(ByVal officevorlagenr As String, ByVal version As String)
Dim i As Integer
Dim scmCmdToExecute As SqlCommand = New SqlCommand()
Dim dtToReturn As DataTable = New DataTable()
Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute)
Try
scmCmdToExecute.CommandText = "dbo.sp_vorlagenuebernahme"
scmCmdToExecute.CommandType = CommandType.StoredProcedure
scmCmdToExecute.Connection = Connection_Prod
scmCmdToExecute.Parameters.Add(New SqlParameter("@Fnkt", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, 21))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param1", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, officevorlagenr))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param2", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, version))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param3", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param4", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
scmCmdToExecute.Parameters.Add(New SqlParameter("@result", SqlDbType.VarChar, 255, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, ""))
Connection_Prod.Open()
sdaAdapter.Fill(dtToReturn)
Connection_Prod.Close()
Return dtToReturn
Catch ex As Exception
MsgBox(ex.Message)
Finally
' DivFnkt.SpaltenTitel_Aktualisieren(Me.DomainList, dtToReturn, "OfficeVorlageDatei")
scmCmdToExecute.Dispose()
sdaAdapter.Dispose()
End Try
End Function
Public Function Get_Vorlagen() As DataTable
Dim i As Integer
Dim scmCmdToExecute As SqlCommand = New SqlCommand()

View File

@@ -50,7 +50,7 @@ Public Class clsdms
Globals.conn.OpenConnection()
If My.Settings.Debug = "False" Then ovd.Update()
Globals.conn.CloseConnection(True)
s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr
s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr + "|" + r.Item("DokVersion").ToString
PrintLine(1, Trim(Str(r("nr")) + "|" + s))
End If
Next
@@ -198,6 +198,7 @@ Public Class clsdms
ovd.Insert()
Globals.conn.CloseConnection(True)
Else
ovd.bAktiv = New SqlBoolean(CType(True, Boolean))
ovd.bFreigegeben = New SqlBoolean(CType(True, Boolean))
ovd.daFragabe_am = New SqlDateTime(CType(splitter(1), DateTime))
@@ -214,6 +215,13 @@ Public Class clsdms
End Try
Globals.conn.OpenConnection()
ovd.Update()
Try
If splitter(7) <> "" Then
Dim clsdb As New clsdb(conn_int, conn_prod)
clsdb.update_version(ovd.iOffice_vorlagenr.ToString, splitter(7))
End If
Catch
End Try
Globals.conn.CloseConnection(True)
End If
End If

View File

@@ -0,0 +1,7 @@
' <autogenerated/>
Option Strict Off
Option Explicit On
Imports System
Imports System.Reflection
<Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName:=".NET Framework 4.5")>

View File

@@ -1 +1 @@
ff327e975066bc497b66b0574ecd4f992965e82e
bcaff02c75702405e685b6f9b12d2d098c188c51

View File

@@ -0,0 +1,7 @@
' <autogenerated/>
Option Strict Off
Option Explicit On
Imports System
Imports System.Reflection
<Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName:=".NET Framework 4.5")>

View File

@@ -1 +1 @@
ff327e975066bc497b66b0574ecd4f992965e82e
5d899d99ee0eed6d725ea390a5897c624f4aa812

View File

@@ -8,4 +8,4 @@ E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.v
E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.exe
E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.xml
E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.pdb
E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.vbprojAssemblyReference.cache
E:\Software-Projekte\EDOKA\batch\EDKB18\Batch\EDKB18\EDKB18\obj\Release\EDKB18.vbproj.AssemblyReference.cache

View File

@@ -25,6 +25,7 @@ Public Class EDKB18
End Sub
Private Sub CheckTimer_Elapsed(sender As Object, e As ElapsedEventArgs) Handles CheckTimer.Elapsed
CheckTimer.Enabled = False
Verarbeiten("")
End Sub

Binary file not shown.

View File

@@ -23,7 +23,7 @@
<value>data source=shu00;initial catalog=edoka_Journale;integrated security=SSPI;persist security info=false;workstation id=;packet size=4096;user id=sa;password=*shu29</value>
</setting>
<setting name="Check_Timerintervall" serializeAs="String">
<value>20000</value>
<value>100</value>
</setting>
<setting name="Debug" serializeAs="String">
<value>False</value>

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -14,6 +14,37 @@ Public Class clsdb
Connection_Prod = New SqlConnection(conn_prod)
End Sub
Function update_version(ByVal officevorlagenr As String, ByVal version As String)
Dim i As Integer
Dim scmCmdToExecute As SqlCommand = New SqlCommand()
Dim dtToReturn As DataTable = New DataTable()
Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute)
Try
scmCmdToExecute.CommandText = "dbo.sp_vorlagenuebernahme"
scmCmdToExecute.CommandType = CommandType.StoredProcedure
scmCmdToExecute.Connection = Connection_Prod
scmCmdToExecute.Parameters.Add(New SqlParameter("@Fnkt", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, 21))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param1", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, officevorlagenr))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param2", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, version))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param3", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
scmCmdToExecute.Parameters.Add(New SqlParameter("@param4", SqlDbType.VarChar, 8000, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, ""))
scmCmdToExecute.Parameters.Add(New SqlParameter("@result", SqlDbType.VarChar, 255, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, ""))
Connection_Prod.Open()
sdaAdapter.Fill(dtToReturn)
Connection_Prod.Close()
Return dtToReturn
Catch ex As Exception
MsgBox(ex.Message)
Finally
' DivFnkt.SpaltenTitel_Aktualisieren(Me.DomainList, dtToReturn, "OfficeVorlageDatei")
scmCmdToExecute.Dispose()
sdaAdapter.Dispose()
End Try
End Function
Public Function Get_Vorlagen() As DataTable
Dim i As Integer
Dim scmCmdToExecute As SqlCommand = New SqlCommand()

View File

@@ -50,7 +50,7 @@ Public Class clsdms
Globals.conn.OpenConnection()
If My.Settings.Debug = "False" Then ovd.Update()
Globals.conn.CloseConnection(True)
s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr
s = ovd.daFragabe_am.ToString + "|" + ovd.iFreigabe_durch.ToString + "|" + ovd.iMutierer.ToString + "|" + ovd.daMutiert_am.ToString + "|" + s + "|" + anr + "|" + r.Item("DokVersion").ToString
PrintLine(1, Trim(Str(r("nr")) + "|" + s))
End If
Next
@@ -214,6 +214,14 @@ Public Class clsdms
End Try
Globals.conn.OpenConnection()
ovd.Update()
Try
If splitter(7) <> "" Then
Dim clsdb As New clsdb(conn_int, conn_prod)
clsdb.update_version(ovd.iOffice_vorlagenr.ToString, splitter(7))
End If
Catch
End Try
Globals.conn.CloseConnection(True)
End If
End If

View File

@@ -0,0 +1,7 @@
' <autogenerated/>
Option Strict Off
Option Explicit On
Imports System
Imports System.Reflection
<Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
aefe5ebd5c793d4546fe24933577c46859620cf6
13194e8d0bc733cc63592cb09cd0390c510987e6

View File

@@ -8,9 +8,6 @@ E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\EDKB18.xml
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.exe
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.xml
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.pdb
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\System.Net.Http.dll
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\bin\Debug\System.Net.Http.xml
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.ProjectInstaller.resources
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbprojResolveAssemblyReference.cache
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.CoreCompileInputs.cache
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.CopyComplete
E:\Software-Projekte\EDOKA\batch\EDKB18\EDKB18\obj\Debug\EDKB18.vbproj.AssemblyReference.cache

View File

@@ -0,0 +1,7 @@
' <autogenerated/>
Option Strict Off
Option Explicit On
Imports System
Imports System.Reflection
<Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName:=".NET Framework 4")>