diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb
index f23256b2..813d9583 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb
@@ -15,6 +15,7 @@ Public Class cAvisoAnhaenge
Property anh_markiert As Boolean = False
Property anh_size As Double
Property anh_cmrId As Integer
+ Property anh_MarkierungDruck As Boolean = False
Public hasEntry As Boolean = False
@@ -66,6 +67,7 @@ Public Class cAvisoAnhaenge
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_markiert", anh_markiert))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_size", anh_size))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_cmrId", anh_cmrId))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_MarkierungDruck", anh_MarkierungDruck))
Return list
End Function
@@ -191,4 +193,9 @@ Public Class cAvisoAnhaenge
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
+ Public Shared Function toggleMarkiereDruck(id As Integer) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+ Dim sqlstr = " UPDATE [tblAvisoAnhaenge] SET [anh_MarkierungDruck] = 1 - [anh_MarkierungDruck] WHERE anh_id=" & id
+ Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
+ End Function
+
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
index b557a9e2..15fe47bc 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
@@ -148,7 +148,7 @@ Public Class cUIDPruefung
End Function
- Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True) As DataTable
+ Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1000) As DataTable
Dim dt As DataTable = Nothing
If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1)
@@ -268,6 +268,9 @@ Public Class cUIDPruefung
FO.Call_Web_Service_MethodUID_Login_NEU2020()
End If
+ If veroegerungMs > 0 Then
+ Thread.Sleep(veroegerungMs) 'Bei Verögeung soll zwischen jeder Abfrage eine Pause gemacht werden! (Wegen Sperre bei zu vielen Abfragen)
+ End If
Next
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_KafkaDecs.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_KafkaDecs.vb
index e800ccc1..c085d2e4 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_KafkaDecs.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/GREENPULSE/cATEZ_Greenpulse_KafkaDecs.vb
@@ -7,6 +7,7 @@ Imports System.Data.SqlClient
Imports System.Threading
Imports System.Threading.Tasks
Imports Confluent.Kafka
+
Imports Newtonsoft.Json
@@ -22,6 +23,7 @@ Public Class cATEZ_Greenpulse_KafkaDecs
'========================
Public Shared BootstrapServers As String = "192.168.85.250:9092" 'http://192.168.85.250:8888
Public Shared TopicName As String = "greenpulse.declarationdata.v1"
+ 'Public Shared TopicName As String = "dev.greenpulse.declarationdata.v1"
' Falls SASL/TLS benötigt:
Public Shared UseSasl As Boolean = False
Public Shared SaslUsername As String = ""
@@ -274,6 +276,7 @@ Public Class cATEZ_Greenpulse_KafkaDecs
'========================
Public Shared Function InsertOrUpdateToKafkaSync(rec As cATEZ_Greenpulse_KafkaDecs, unique_KEY As String, Optional waitMs As Integer = 30000) As DeliveryResult(Of String, String)
+
Dim cfg As New ProducerConfig With {
.BootstrapServers = BootstrapServers,
.EnableIdempotence = True,
@@ -287,7 +290,7 @@ Public Class cATEZ_Greenpulse_KafkaDecs
Using producer = New ProducerBuilder(Of String, String)(cfg).Build()
Dim key = unique_KEY ' GetUniqueKey(rec)
- Dim msg = New Message(Of String, String) With {.Key = key, .Value = rec.ToJson(False)}
+ Dim msg = New Message(Of String, String) With {.key = key, .Value = rec.ToJson(False)}
Dim done As New Threading.ManualResetEventSlim(False)
Dim lastReport As DeliveryResult(Of String, String) = Nothing
@@ -332,8 +335,9 @@ End Class
Public Class cATEZ_Greenpulse_KafkaDecsBuilder_DAKOSY
- Public Shared Function BuildByMrn(mrn As String) As cATEZ_Greenpulse_KafkaDecs
+ Public Shared Function BuildByMrn_DAKOSY_Archiv(mrn As String) As cATEZ_Greenpulse_KafkaDecs
Using con As SqlConnection = SQL.GetNewOpenConnectionAVISO()
+
'con.Open()
' Alle Zeilen zur MRN laden (Kopf + Positionen). Kopfinfo ist je Zeile dupliziert.
@@ -450,10 +454,7 @@ Public Class cATEZ_Greenpulse_KafkaDecsBuilder_DAKOSY
End Using
End Function
- Public Shared Function BuildJsonByMrn(mrn As String, Optional pretty As Boolean = True) As String
- Dim o = BuildByMrn(mrn)
- Return o.ToJson(pretty)
- End Function
+
'---------------------------
' Helper
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index e84940cc..c59c1cdb 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -1425,6 +1425,9 @@
+
+ 2.11.1
+
3.8.0