From b066eee7fe7f7d7be3485e73a02edff6921a3be7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 31 Oct 2023 17:10:15 +0100 Subject: [PATCH] =?UTF-8?q?Formulare=20Qualit=C3=A4tskontrolle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Formulare/KDFormulare/frmFormulare.vb | 6 +++--- .../KassenbuchSuche/usrCntlQualitaetskontrolle.vb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 6c91e10a..78ba1204 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4166,7 +4166,7 @@ Public Class FormularManagerNEU Shared Function Qualitaetskontrolle(usrCntl As usrCntlQualitaetskontrolle) As String Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager - 'Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem) @@ -4274,9 +4274,9 @@ Public Class FormularManagerNEU 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 188, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 188, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - fm.fillPDF("Qualitatskontrolle", Nothing, list, , , , , , ) + 'fm.fillPDF("Qualitatskontrolle", Nothing, list, , , , , , ) - 'Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Qualitatskontrolle", listTowrite) + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Qualitatskontrolle", listTowrite) Return "" diff --git a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb b/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb index 8ef83b69..225e81e4 100644 --- a/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb +++ b/SDL/kassenbuch/KassenbuchSuche/usrCntlQualitaetskontrolle.vb @@ -233,7 +233,8 @@ Public Class usrCntlQualitaetskontrolle ' Tabelle zsAnmGdsitem lesen. Dim DTzsAnmGdsitem As DataTable = KDSQL.loadDgvBySql("SELECT item.ItNr ,item.GdsDes, item.Net, pack.Kind, pack.Nr, item.Orig" & " FROM zsAnmGdsitem as item" & -" INNER JOIN zsAnmGdsItemPack as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID and item.VorgangID = pack.VorgangID and pack.AnmID = item.AnmID" & +" INNER JOIN +as pack ON item.LizenzNr = pack.LizenzNr And item.OperatorID = pack.OperatorID and item.VorgangID = pack.VorgangID and pack.AnmID = item.AnmID" & " WHERE (item.LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (item.OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (item.VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (item.AnmID = " & DR_zsAnmRefs.Item("AnmID") & " and item.GdsItemID = pack.GdsItemID)" & " ORDER BY item.GdsItemID", "EZOLL")