From 3c85713ff01c6764d4f6aef49d6c22fa41fd474f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 13 Mar 2024 15:57:48 +0100 Subject: [PATCH] =?UTF-8?q?Sendungsanh=C3=A4nge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/Anhänge/frmSendungAnhangImport.vb | 79 ++++++++++--------- .../frmSendungAnhangUmbenennenUmkateg.vb | 78 +++++++++--------- 2 files changed, 85 insertions(+), 72 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index f944db2..05c4487 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1061,47 +1061,54 @@ Public Class frmSendungAnhangImport flpnlSendungen.Controls.Clear() cboArt.Items.Clear() - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ursprungszeugnis", "CoO")) - If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) - End If + Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)" + SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "", " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "") + SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "", " OR aa_filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "") + SQLString &= ")" + cboArt.fillWithSQL(SQLString, False, "AVISO", True) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) + 'cboArt.Items.Clear() + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ursprungszeugnis", "CoO")) + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88")) + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2")) + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) + 'End If + + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) - End If + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) + 'End If - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) diff --git a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb index eadb4eb..60c07de 100644 --- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb +++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb @@ -13,45 +13,51 @@ Private Sub frmSendungAnhangImport_Load(sender As Object, e As EventArgs) Handles Me.Load cboArt.Items.Clear() - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein")) - If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) - End If + Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)" + SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.ToString, " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "") + SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE, " OR filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "") + SQLString &= ")" + cboArt.fillWithSQL(SQLString, False, "AVISO", True) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EUR1", "EUR1")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorkasse", "Vorkasse")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Überweisungsbeleg", "Überweisungsbeleg")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vollmacht", "Vollmacht")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UID-Prüfung", "UID")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Prüfung", "EORI")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", "EORI_ANTRAG")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Lieferschein", "Lieferschein")) + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE = 7001 Then + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - C88", "C88")) + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - E2", "E2")) + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB - Atanak Rechnung", "Atanak_RG")) + 'End If + + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-D", "GGED_D")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-PP", "GGED_PP")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-P", "GGED_P")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GGED-A", "GED_A")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Phytosanitary Certificate", "PHYTO")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Konformitätserklärung", "CONFORM")) - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) - End If - cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + ' cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EXPORT_DOCS", "EXPORT_DOCS")) + 'End If + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) txtBezeichnung.Text = nameOLD cboArt.changeItem(artOLD) End Sub