From 40482b9841598086291b49ec09e738befa612919 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 22 Apr 2025 16:49:17 +0200 Subject: [PATCH] cbam --- SDL/kunden/usrCntlCBAM.vb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 0ec8a373..4b1a9042 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -502,24 +502,24 @@ SQLWhereMRN &= " AND BelegNr not in (" & MRNNr & ")" - Dim sqlNew = "select * from Speditionsbuch + Dim sqlNew = "select Speditionsbuch.[FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum],[Bar],[Fakturiert],[BelegNr],[ErfassungsNr],[LKW Kennzeichen],[AbsenderKundenNr],[Absender],[AbsenderOffertenNr],[EmpfängerKundenNr],[Empfänger],[EmpfängerOffertenNr],[VermittlerKundenNr],[Vermittler],[VermittlerOffertenNr],[FrachtführerKundenNr],[Frachtführer],[AnzahlZA],[AnzahlZAFremd],[AnzahlZnV],[AnzahlZnVFremd],[AnzahlT1],[AnzahlT2],[AnzahlAE] from Speditionsbuch inner join Kunden on Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr]= Kunden.KundenNr OR Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr] = Kunden.KundenNr - where 1 = 1 AND Kunden.EORITIN = '" & EORI & "' AND BelegNr <> '' AND (Speditionsbuch.[Abfertigungsdatum] BETWEEN '" & txtVon._value & "' and '" & txtBis._value & "' )" & SQLWhereMRN + where 1 = 1 AND Kunden.EORITIN = '" & EORI & "' AND BelegNr <> '' AND (Speditionsbuch.[Abfertigungsdatum] BETWEEN '" & txtVon._value & "' and '" & txtBis._value & "' )" & IIf(MRNNr <> "", SQLWhereMRN, "") ' MsgBox(SQLSTR) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DAKOSY_Deteil.Tag = path - btnCBAM_DS_DAKOSY_Deteil.Enabled = True - btnCBAM_DS_DAKOSY_Copy.Enabled = True + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) + btnCBAM_DS_DAKOSY_Deteil.Tag = path + btnCBAM_DS_DAKOSY_Deteil.Enabled = True + btnCBAM_DS_DAKOSY_Copy.Enabled = True - End If + End If - Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) - If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then - If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) + Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) + If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then + If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) btnCBAM_DS_DAKOSY_Spedb.Enabled = True btnCBAM_DS_DAKOSY_Spedb.Tag = path Me.Cursor = Cursors.Default