diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 1864b9a6..33a831c9 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -316,7 +316,14 @@ Public Class cFakturierung Select Case RECHNUNG.[BelegartenNr] Case 70 'RECHNUNG - If Not RECHNUNG.Vorkasse Then + Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr) + Dim VK_Tmp = False + + If RECHNUNG.[Vorkasse] Then + VK_Tmp = (VK IsNot Nothing) + End If + + If Not VK_Tmp Then If RECHNUNG.Lastschrift Then Select Case RECHNUNG.RechnungSprache Case "EN" : strText = strText & "The invoice amount was collected by direct debit order." & vbCrLf @@ -367,7 +374,6 @@ Public Class cFakturierung End If Else - Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr) If VK IsNot Nothing AndAlso CDbl(VK.vk_Betrag) > 0 Then If VK.vk_GeldEingetroffen Then ' Wenn 0 dann Fehler If CDbl(VK.vk_Betrag) = CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) Then @@ -433,15 +439,13 @@ Public Class cFakturierung Select Case RECHNUNG.[BelegartenNr] Case 70 'RECHNUNG - If Not RECHNUNG.Vorkasse Then - ' Text bei Zoll oder EUSt drucken - If checkIfcheckIfZollbelege(RECHNUNG) Then - Select Case RECHNUNG.RechnungSprache - Case "EN" : strText = strText & "Please check all customs documents immediately for correctness, as objections are only possible 1 month after the date of the customs notification." & vbCrLf - Case Else : strText = strText & "Alle Zollbelege bitte sofort auf Richtigkeit prüfen da Einspruch gemäß § 355 AO nur 1 Monat nach Datum des Zollbescheides möglich." & vbCrLf - End Select - End If + ' Text bei Zoll oder EUSt drucken + If checkIfcheckIfZollbelege(RECHNUNG) Then + Select Case RECHNUNG.RechnungSprache + Case "EN" : strText = strText & "Please check all customs documents immediately for correctness, as objections are only possible 1 month after the date of the customs notification." & vbCrLf + Case Else : strText = strText & "Alle Zollbelege bitte sofort auf Richtigkeit prüfen da Einspruch gemäß § 355 AO nur 1 Monat nach Datum des Zollbescheides möglich." & vbCrLf + End Select End If End Select @@ -2232,7 +2236,8 @@ Public Class cFakturierung ElseIf Rechnugnsdruck = 3 Then 'Process.Start(Path) .Visible = True - + Else + Datei.close End If End With diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 5dcdb9a6..554ac0e6 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -354,7 +354,7 @@ Public Class frmFaktEmail 'Process.Start(a) End Try - Else + Else 'ER If RECHNUNG.FakturierungsGruppe <> "" Then additionalLine = "Abrechnungsstelle: " & RECHNUNG.FakturierungsGruppe.Replace("WAI", "Waidhaus") diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index a7cc209e..3ce3a6ed 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -778,8 +778,9 @@ Public Class frmRechnungenSuche inner join Leistungen on Leistungen.LeistungsNr = RechnungsausgangPositionen.LeistungsNr where /*RechnungsDatum BETWEEN '01.01.2021' and '31.12.2021'*/ FilialenNr=" & cboFiliale._value & " - and Rechnungsausgang.SteuerpflichtigerGesamtbetrag<>0 - and Leistungen.Steuerpflichtig=1 + /*and Rechnungsausgang.SteuerpflichtigerGesamtbetrag<>0*/ + /*and Leistungen.Steuerpflichtig=1*/ + and (Leistungen.Abfertigungskosten=1 or Leistungen.LeistungsNr IN (656,425)) and RechnungsausgangPositionen.LeistungsNr NOT IN (700,710,750,751) and Firma_ID=26 " diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 2ebe394b..58c13fe8 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1594,6 +1594,8 @@ Public Class usrCntlFaktAbrechnung If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "Zollbelege" Case "5", "6" If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "" + Case "7" + If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "" Case "19" If If(RECHNUNG.Anlage_1, String.Empty) = String.Empty Then RECHNUNG.Anlage_1 = "" Case "9" 'Leihgeld @@ -2215,128 +2217,6 @@ Public Class usrCntlFaktAbrechnung End Function - Private Sub przRechnungstextTTTTTTEST() - - Dim strSQL As String - Dim strZahlbar As String - Dim strText As String - Dim varPos As Object - - Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(RECHNUNG.RechnungsKundenNr) - - Select Case RECHNUNG.[BelegartenNr] - Case 70 'RECHNUNG - If Not RECHNUNG.[Vorkasse] Then - If RECHNUNG.[Lastschrift] Then - strText &= "Der Rechnungsbetrag wurde durch erteilten Abbuchungsauftrag eingezogen." & vbCrLf - Else - 'Zahlungsziel ermitteln. - 'Set qryRAPos = dbs.QueryDefs("qryReErfSchKA") ' - 'qryRAPos.Parameters("[prmRK_ID]") = Me![RK_ID] - 'Set rstRAPos = qryRAPos.OpenRecordset(dbOpenSnapshot) - - Dim Find = RECHNUNG.POSITIONEN.Find(Function(x) x.LeistungsNr = 750) 'And x.BerechnungsartNr = 9) - If Find IsNot Nothing Then - strZahlbar = "Zahlbar innerhalb 10 Tagen abzüglich Pos. 750; ab 10 Tagen netto fällig." - Else - 'Zahlungsziel allgemein. - strZahlbar = "Zahlbar innerhalb 10 Tagen ab Rechnungsdatum." - End If - - 'Zahlungsziel bei Maut/Diesel. - If RECHNUNG.[OffertenNr] IsNot Nothing And RECHNUNG.RechnungsKundenNr > 0 And RECHNUNG.RechnungsLandKz IsNot Nothing Then - - Dim Zahlungsziel = SQL.DLookup("[Zahlungsziel]", "Offertenstamm", "[OffertenNr] = " & RECHNUNG.[OffertenNr] & " AND Zahlungsziel Is Not Null", "FMZOLL") - - If Zahlungsziel IsNot DBNull.Value Then - - Dim ZahlungszielKd = SQL.DLookup("[Zahlungsziel]", "Kunden", "[KundenNr] = " & RECHNUNG.[RechnungsKundenNr] & " AND Zahlungsziel Is Not Null", "FMZOLL") - Dim ZahlungszielTxt = SQL.DLookup("[Text]", "tblZahlungszieltexte", "[LandKz] = " & RECHNUNG.[RechnungsLandKz] & " AND Text Is Not Null", "FMZOLL") - - If ZahlungszielTxt IsNot DBNull.Value Then - - If ZahlungszielKd IsNot DBNull.Value Then 'Zahlungsziel für Kunde verwenden - RECHNUNG.Nettozahlungsziel = ZahlungszielKd - strZahlbar = ZahlungszielTxt & " " & DateAdd("d", ZahlungszielKd, Now) & "!" - Else 'Zahlungsziel für Offerte verwenden - RECHNUNG.Nettozahlungsziel = Zahlungsziel - strZahlbar = ZahlungszielTxt & " " & DateAdd("d", Zahlungsziel, Now) & "!" - End If - Else - If ZahlungszielKd IsNot DBNull.Value Then 'Zahlungsziel für Kunde verwenden - RECHNUNG.Nettozahlungsziel = ZahlungszielKd - strZahlbar = "Rechnung zahlbar spätestens bis " & DateAdd("d", ZahlungszielKd, Now) & "!" - Else 'Zahlungsziel für Offerte verwenden - RECHNUNG.Nettozahlungsziel = Zahlungsziel - strZahlbar = "Rechnung zahlbar spätestens bis " & DateAdd("d", Zahlungsziel, Now) & "!" - End If - End If - End If - End If - If strZahlbar <> "" Then 'Zahlungstext anfügen. - strText &= strZahlbar & vbCrLf - End If - End If - End If - - Dim FindPos = RECHNUNG.POSITIONEN.Find(Function(x) x.LeistungsNr = 10 Or x.LeistungsNr = 60 Or x.LeistungsNr = 70) - If FindPos IsNot Nothing Then - strText &= "Alle Zollbelege bitte sofort auf Richtigkeit prüfen da Einspruch gemäß § 355 AO nur 1 Monat nach Datum des Zollbescheides möglich." & vbCrLf - End If - - Case 71 'GUTSCHRIFT - If RECHNUNG.[Lastschrift] Then - strText &= "Der Gutschriftsbetrag wurde mit erteilten Abbuchungsauftrag verrechnet." & vbCrLf - End If - End Select - - - 'oder die Funktion getRechnungsText ??? Zu unterschiedlichen Zeiten progrmamiert - Dim sqlStr = "SELECT Textschlüssel, Firma_ID, LandKz, OffertenNr, Text, EMailRechnung, DrucksteuerungsKz" - sqlStr &= " FROM Rechnungstexte " - sqlStr &= " WHERE Text Is Not Null " - If RECHNUNG.Firma_ID > 0 Then sqlStr &= " AND Firma_ID=" & RECHNUNG.Firma_ID - If RECHNUNG.RechnungsLandKz IsNot Nothing Then sqlStr &= " AND LandKz=" & RECHNUNG.RechnungsLandKz - If RECHNUNG.OffertenNr IsNot Nothing Then sqlStr &= " AND OffertenNr=" & RECHNUNG.OffertenNr - If If(AD.Rechnungsdruck, "") = "2" And If(AD.E_Mail, "") <> "" Then sqlStr &= " AND EMailRechnung=1 " - - Dim dt As DataTable = SQL.loadDgvBySql(sqlStr, "FMZOLL") - If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - Select Case RECHNUNG.BelegartenNr - Case 70 'RECHNUNG - If dt.Rows(0)("DrucksteuerungsKz") = "R" _ - Or dt.Rows(0)("DrucksteuerungsKz") = " " Then - strText &= dt.Rows(0)("Text") & vbCrLf - End If - Case 71 'GUTSCHRIFT - If dt.Rows(0)("DrucksteuerungsKz") = "G" _ - Or dt.Rows(0)("DrucksteuerungsKz") = " " Then - strText &= dt.Rows(0)("Text") & vbCrLf - End If - End Select - End If - - ' Text in Rechnungskopfsatz übernehmen. - If strText = "" Then - RECHNUNG.[Text] = Nothing - Else - strText.Replace("", If(AD.E_Mail, " - ")) - - 'varPos = InStr(1, strText, "") - ' If varPos > 0 And Not AD Is Nothing And AD.E_Mail IsNot Nothing Then - 'If Len(strText) > (varPos - 1 + Len("")) Then - ' strText = Left(strText, varPos - 1) & rstAdr![E-Mail] & Right(strText, Len(strText) - (varPos - 1 + Len(""))) - ' Else - ' strText = Left(strText, varPos - 1) & rstAdr![E-Mail] - ' End If - ' End If - RECHNUNG.[Text] = strText - End If - - - - End Sub - Private Sub przBerechneWert() Try diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 09a5be44..ce70a5dc 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1044,7 +1044,7 @@ Public Class frmFormulare End Try ElseIf sender Is btnPrint Then 'VERAG_PROG_ALLGEMEIN.cFormularManager.PrintFile(dest_path, "") - If dest_path.EndsWith("PDF") Then + If dest_path.ToUpper.EndsWith("PDF") Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({dest_path}, cboPrinter.SelectedItem.ToString) Else VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(dest_path, cboPrinter.SelectedItem.ToString) @@ -1107,23 +1107,34 @@ Public Class frmFormulare Next + + If sPrinters.Count > 0 Then cboPrinter.SelectedIndex = 0 If srch <> "" Then For Each i In cboPrinter.Items - If i.ToString.ToUpper.Contains(srch.ToUpper) Then + If i.ToString.ToLower.Contains(srch.ToLower) Then cboPrinter.SelectedItem = i Exit Sub End If Next Else + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then + For Each i In cboPrinter.Items + If i.ToString.ToLower = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD.ToLower Then + cboPrinter.SelectedItem = i + Exit Sub + End If + Next + End If For Each i In cboPrinter.Items - If i.ToString = oPS.PrinterName Then - cboPrinter.SelectedItem = i - Exit Sub - End If - Next - End If + If i.ToString = oPS.PrinterName Then + cboPrinter.SelectedItem = i + Exit Sub + End If + Next + + End If End If End Sub diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 230be48f..8753b7fb 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb index ee3e8559..4d4ab215 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb @@ -90,7 +90,7 @@ Public Class rptKontrolleLKW_NCTSTR ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" sqlStr &= " group by cast(ncts_Eroeffnung as date),ncts_Befoerderungsmittel_KennzeichenAbgang" & If(Not groupKz, ", ncts_id ", "") '--> wenn nciht nach Kennezcihen groupioert werden kann, einfach die ID hinzufügen--> nur mehr einzelene Zeilen möglich sqlStr &= " order by cast(ncts_Eroeffnung as date)" - + ' MsgBox(sqlStr) Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "FMZOLL", 1000) diff --git a/SDL/SMS/frmSendSMS.Designer.vb b/SDL/SMS/frmSendSMS.Designer.vb index f2d5bf43..a1b348c4 100644 --- a/SDL/SMS/frmSendSMS.Designer.vb +++ b/SDL/SMS/frmSendSMS.Designer.vb @@ -90,6 +90,7 @@ Partial Class frmSendSMS Me.txtHandyNummer._DateTimeOnly = False Me.txtHandyNummer._numbersOnly = False Me.txtHandyNummer._numbersOnlyKommastellen = "" + Me.txtHandyNummer._numbersOnlyTrennzeichen = True Me.txtHandyNummer._Prozent = False Me.txtHandyNummer._ShortDateNew = False Me.txtHandyNummer._ShortDateOnly = False @@ -115,7 +116,7 @@ Partial Class frmSendSMS Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Label1.Location = New System.Drawing.Point(12, 37) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(275, 17) + Me.Label1.Size = New System.Drawing.Size(381, 25) Me.Label1.TabIndex = 1 Me.Label1.Text = "Handynummer (immer mit Ländervorwahl):" ' @@ -129,7 +130,7 @@ Partial Class frmSendSMS Me.cboLandVorwahl.FormattingEnabled = True Me.cboLandVorwahl.Location = New System.Drawing.Point(370, 232) Me.cboLandVorwahl.Name = "cboLandVorwahl" - Me.cboLandVorwahl.Size = New System.Drawing.Size(64, 28) + Me.cboLandVorwahl.Size = New System.Drawing.Size(64, 37) Me.cboLandVorwahl.TabIndex = 7 Me.cboLandVorwahl.Visible = False ' @@ -167,7 +168,7 @@ Partial Class frmSendSMS Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Label2.Location = New System.Drawing.Point(12, 209) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(72, 17) + Me.Label2.Size = New System.Drawing.Size(100, 25) Me.Label2.TabIndex = 3 Me.Label2.Text = "Nachricht:" ' @@ -310,7 +311,7 @@ Partial Class frmSendSMS Me.cbxLKWOK.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxLKWOK.Location = New System.Drawing.Point(329, 122) Me.cbxLKWOK.Name = "cbxLKWOK" - Me.cbxLKWOK.Size = New System.Drawing.Size(120, 17) + Me.cbxLKWOK.Size = New System.Drawing.Size(127, 21) Me.cbxLKWOK.TabIndex = 18 Me.cbxLKWOK.Text = "LKW auf OK setzen" Me.cbxLKWOK.UseVisualStyleBackColor = True @@ -325,7 +326,7 @@ Partial Class frmSendSMS Me.cboFirma.FormattingEnabled = True Me.cboFirma.Location = New System.Drawing.Point(329, 57) Me.cboFirma.Name = "cboFirma" - Me.cboFirma.Size = New System.Drawing.Size(128, 28) + Me.cboFirma.Size = New System.Drawing.Size(128, 37) Me.cboFirma.TabIndex = 5 ' 'Label3 @@ -334,7 +335,7 @@ Partial Class frmSendSMS Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Label3.Location = New System.Drawing.Point(326, 37) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(47, 17) + Me.Label3.Size = New System.Drawing.Size(67, 25) Me.Label3.TabIndex = 4 Me.Label3.Text = "Firma:" ' @@ -540,7 +541,7 @@ Partial Class frmSendSMS Me.lblInfoWhatsApp.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.lblInfoWhatsApp.Location = New System.Drawing.Point(197, 209) Me.lblInfoWhatsApp.Name = "lblInfoWhatsApp" - Me.lblInfoWhatsApp.Size = New System.Drawing.Size(260, 13) + Me.lblInfoWhatsApp.Size = New System.Drawing.Size(381, 20) Me.lblInfoWhatsApp.TabIndex = 40 Me.lblInfoWhatsApp.Text = "Der Text kann bei WhatsApp nicht verändert werden!" ' @@ -550,7 +551,7 @@ Partial Class frmSendSMS Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Label4.Location = New System.Drawing.Point(52, 102) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(77, 17) + Me.Label4.Size = New System.Drawing.Size(111, 25) Me.Label4.TabIndex = 42 Me.Label4.Text = "WhatsApp:" ' @@ -560,7 +561,7 @@ Partial Class frmSendSMS Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Label5.Location = New System.Drawing.Point(223, 102) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(41, 17) + Me.Label5.Size = New System.Drawing.Size(63, 25) Me.Label5.TabIndex = 44 Me.Label5.Text = "SMS:" ' @@ -583,7 +584,7 @@ Partial Class frmSendSMS Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.Label6.Location = New System.Drawing.Point(12, 12) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(190, 13) + Me.Label6.Size = New System.Drawing.Size(285, 20) Me.Label6.TabIndex = 48 Me.Label6.Text = "WhatsApp: Bitte zu VERAG kommen..." ' diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.Designer.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.Designer.vb index 5749a590..567f142a 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.Designer.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmNacherfassungVorkosten Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,17 +20,26 @@ Partial Class frmNacherfassungVorkosten 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNacherfassungVorkosten)) + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.dgvVorkosten = New System.Windows.Forms.DataGridView() Me.Label35 = New System.Windows.Forms.Label() Me.btnOK = New System.Windows.Forms.Button() - Me.lblError = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.txtLeistungsbezeichnung = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.txtPreis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label24 = New System.Windows.Forms.Label() + Me.Label23 = New System.Windows.Forms.Label() + Me.lklBearbeitungAbbrechenPK = New System.Windows.Forms.LinkLabel() + Me.Label1 = New System.Windows.Forms.Label() + Me.cboLeistungs = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.LeistungsNr = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Leistungsbez = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Preis = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -39,6 +48,7 @@ Partial Class frmNacherfassungVorkosten ' 'dgvVorkosten ' + Me.dgvVorkosten.AllowUserToAddRows = False Me.dgvVorkosten.AllowUserToOrderColumns = True Me.dgvVorkosten.AllowUserToResizeColumns = False Me.dgvVorkosten.AllowUserToResizeRows = False @@ -48,8 +58,11 @@ Partial Class frmNacherfassungVorkosten Me.dgvVorkosten.GridColor = System.Drawing.Color.DarkGray Me.dgvVorkosten.Location = New System.Drawing.Point(15, 25) Me.dgvVorkosten.Name = "dgvVorkosten" + Me.dgvVorkosten.ReadOnly = True + Me.dgvVorkosten.RowHeadersVisible = False + Me.dgvVorkosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvVorkosten.Size = New System.Drawing.Size(758, 224) - Me.dgvVorkosten.TabIndex = 92 + Me.dgvVorkosten.TabIndex = 1 ' 'Label35 ' @@ -58,7 +71,7 @@ Partial Class frmNacherfassungVorkosten Me.Label35.Location = New System.Drawing.Point(12, 9) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(64, 13) - Me.Label35.TabIndex = 91 + Me.Label35.TabIndex = 0 Me.Label35.Text = "Vorkosten" Me.Label35.Visible = False ' @@ -67,34 +80,22 @@ Partial Class frmNacherfassungVorkosten Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.btnOK.Location = New System.Drawing.Point(597, 255) + Me.btnOK.Location = New System.Drawing.Point(597, 300) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(176, 41) - Me.btnOK.TabIndex = 93 + Me.btnOK.TabIndex = 13 Me.btnOK.Text = "OK" Me.btnOK.UseVisualStyleBackColor = True ' - 'lblError - ' - Me.lblError.AutoSize = True - Me.lblError.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblError.ForeColor = System.Drawing.Color.Red - Me.lblError.Location = New System.Drawing.Point(12, 255) - Me.lblError.Name = "lblError" - Me.lblError.Size = New System.Drawing.Size(158, 13) - Me.lblError.TabIndex = 94 - Me.lblError.Text = "Bitte prüfen Sie die Daten!" - Me.lblError.Visible = False - ' 'Button1 ' Me.Button1.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.Button1.Location = New System.Drawing.Point(469, 255) + Me.Button1.Location = New System.Drawing.Point(469, 300) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(122, 41) - Me.Button1.TabIndex = 95 + Me.Button1.TabIndex = 12 Me.Button1.Text = "Abbrechen" Me.Button1.UseVisualStyleBackColor = True ' @@ -116,35 +117,174 @@ Partial Class frmNacherfassungVorkosten Me.DataGridViewTextBoxColumn3.HeaderText = "Preis" Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" ' + 'txtLeistungsbezeichnung + ' + Me.txtLeistungsbezeichnung._allowFreitext = False + Me.txtLeistungsbezeichnung._AllowSetValue = False + Me.txtLeistungsbezeichnung._allowSpaceAsSplitter = False + Me.txtLeistungsbezeichnung._autoSizeGross = False + Me.txtLeistungsbezeichnung._hideIfListEmpty = True + Me.txtLeistungsbezeichnung._value = Nothing + Me.txtLeistungsbezeichnung.conn_art = "FMZOLL" + Me.txtLeistungsbezeichnung.dgvpos = "LEFT" + Me.txtLeistungsbezeichnung.DISPLAY_PARAM = Nothing + Me.txtLeistungsbezeichnung.INVISIBLE_COLUMNS = Nothing + Me.txtLeistungsbezeichnung.key_visible = False + Me.txtLeistungsbezeichnung.KEYPARAM = Nothing + Me.txtLeistungsbezeichnung.Location = New System.Drawing.Point(166, 255) + Me.txtLeistungsbezeichnung.Name = "txtLeistungsbezeichnung" + Me.txtLeistungsbezeichnung.searchActive = True + Me.txtLeistungsbezeichnung.Size = New System.Drawing.Size(505, 20) + Me.txtLeistungsbezeichnung.SQL_ORDER_BY = Nothing + Me.txtLeistungsbezeichnung.SQL_SELECT = Nothing + Me.txtLeistungsbezeichnung.SQL_WHERE = Nothing + Me.txtLeistungsbezeichnung.SQL_WhereParamList = Nothing + Me.txtLeistungsbezeichnung.TabIndex = 4 + Me.txtLeistungsbezeichnung.usrcntl = Nothing + ' + 'Button2 + ' + Me.Button2.BackgroundImage = CType(resources.GetObject("Button2.BackgroundImage"), System.Drawing.Image) + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(775, 25) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(30, 20) + Me.Button2.TabIndex = 2 + Me.Button2.TabStop = False + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.Location = New System.Drawing.Point(775, 255) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(30, 20) + Me.Button3.TabIndex = 6 + Me.Button3.TabStop = False + Me.Button3.UseVisualStyleBackColor = True + ' + 'txtPreis + ' + Me.txtPreis._DateTimeOnly = False + Me.txtPreis._numbersOnly = False + Me.txtPreis._numbersOnlyKommastellen = "" + Me.txtPreis._Prozent = False + Me.txtPreis._ShortDateNew = False + Me.txtPreis._ShortDateOnly = False + Me.txtPreis._TimeOnly = False + Me.txtPreis._TimeOnly_Seconds = False + Me.txtPreis._value = "" + Me.txtPreis._Waehrung = True + Me.txtPreis._WaehrungZeichen = True + Me.txtPreis.ForeColor = System.Drawing.Color.Black + Me.txtPreis.Location = New System.Drawing.Point(670, 255) + Me.txtPreis.MaxLength = 42 + Me.txtPreis.MaxLineLength = -1 + Me.txtPreis.MaxLines_Warning = "" + Me.txtPreis.MaxLines_Warning_Label = Nothing + Me.txtPreis.Name = "txtPreis" + Me.txtPreis.Size = New System.Drawing.Size(103, 20) + Me.txtPreis.TabIndex = 5 + ' + 'Label24 + ' + Me.Label24.ForeColor = System.Drawing.Color.Red + Me.Label24.Location = New System.Drawing.Point(168, 276) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(233, 13) + Me.Label24.TabIndex = 8 + Me.Label24.Text = "Bitte angeben!" + Me.Label24.Visible = False + ' + 'Label23 + ' + Me.Label23.ForeColor = System.Drawing.Color.Red + Me.Label23.Location = New System.Drawing.Point(12, 276) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(153, 13) + Me.Label23.TabIndex = 7 + Me.Label23.Text = "Bitte angeben!" + Me.Label23.Visible = False + ' + 'lklBearbeitungAbbrechenPK + ' + Me.lklBearbeitungAbbrechenPK.AutoSize = True + Me.lklBearbeitungAbbrechenPK.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.lklBearbeitungAbbrechenPK.Location = New System.Drawing.Point(543, 278) + Me.lklBearbeitungAbbrechenPK.Name = "lklBearbeitungAbbrechenPK" + Me.lklBearbeitungAbbrechenPK.Size = New System.Drawing.Size(118, 13) + Me.lklBearbeitungAbbrechenPK.TabIndex = 9 + Me.lklBearbeitungAbbrechenPK.TabStop = True + Me.lklBearbeitungAbbrechenPK.Text = "Bearbeitung abbrechen" + Me.lklBearbeitungAbbrechenPK.Visible = False + ' + 'Label1 + ' + Me.Label1.ForeColor = System.Drawing.Color.Red + Me.Label1.Location = New System.Drawing.Point(667, 278) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(106, 13) + Me.Label1.TabIndex = 10 + Me.Label1.Text = "Bitte angeben!" + Me.Label1.Visible = False + ' + 'cboLeistungs + ' + Me.cboLeistungs._allowedValuesFreiText = Nothing + Me.cboLeistungs._allowFreiText = False + Me.cboLeistungs._value = "" + Me.cboLeistungs.FormattingEnabled = True + Me.cboLeistungs.Location = New System.Drawing.Point(15, 254) + Me.cboLeistungs.Name = "cboLeistungs" + Me.cboLeistungs.Size = New System.Drawing.Size(152, 21) + Me.cboLeistungs.TabIndex = 3 + ' 'LeistungsNr ' Me.LeistungsNr.FillWeight = 80.0! Me.LeistungsNr.HeaderText = "LeistungsNr" Me.LeistungsNr.Name = "LeistungsNr" - Me.LeistungsNr.Width = 70 + Me.LeistungsNr.ReadOnly = True + Me.LeistungsNr.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.LeistungsNr.Width = 150 ' 'Leistungsbez ' Me.Leistungsbez.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill Me.Leistungsbez.HeaderText = "Leistungsbez" Me.Leistungsbez.Name = "Leistungsbez" + Me.Leistungsbez.ReadOnly = True ' 'Preis ' + DataGridViewCellStyle1.Format = "C2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle1 Me.Preis.HeaderText = "Preis" Me.Preis.Name = "Preis" + Me.Preis.ReadOnly = True ' 'frmNacherfassungVorkosten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(780, 309) + Me.ClientSize = New System.Drawing.Size(814, 355) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.txtLeistungsbezeichnung) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.Button3) + Me.Controls.Add(Me.txtPreis) + Me.Controls.Add(Me.Label24) + Me.Controls.Add(Me.Label23) + Me.Controls.Add(Me.lklBearbeitungAbbrechenPK) Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.lblError) Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.dgvVorkosten) Me.Controls.Add(Me.Label35) + Me.Controls.Add(Me.cboLeistungs) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmNacherfassungVorkosten" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent @@ -157,12 +297,20 @@ Partial Class frmNacherfassungVorkosten Friend WithEvents dgvVorkosten As System.Windows.Forms.DataGridView Friend WithEvents Label35 As System.Windows.Forms.Label Friend WithEvents btnOK As System.Windows.Forms.Button - Friend WithEvents lblError As System.Windows.Forms.Label Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents DataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents LeistungsNr As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents Leistungsbez As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents Preis As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn2 As System.Windows.Forms.DataGridViewTextBoxColumn + Friend WithEvents txtLeistungsbezeichnung As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button + Friend WithEvents txtPreis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label24 As Label + Friend WithEvents Label23 As Label + Friend WithEvents lklBearbeitungAbbrechenPK As LinkLabel + Friend WithEvents Label1 As Label + Friend WithEvents cboLeistungs As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents LeistungsNr As DataGridViewTextBoxColumn + Friend WithEvents Leistungsbez As DataGridViewTextBoxColumn + Friend WithEvents Preis As DataGridViewTextBoxColumn End Class diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.resx b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.resx index 2120acbe..6f0443df 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.resx +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.resx @@ -127,6 +127,20 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHaSURBVEhLvdW7SlhBFIVh701EGyGKpEjAywv4Aham + iIXaio1dELXwFVRs7ARBQbHSwi5lijTBWhAvfSKExJBKEEWP/8iM7JmzziWKFh/k7Fl7FhgZG7Ise1Vy + 6JwPvG9S8+eSQ4fCTrxVZ88hhxQNYgvHdUvJNfq9bXUe5AYs9OEbMq9WKZkmbPidHZVxog+Cb7COa79Y + q5SzHizjD8KOLI0+CJ2ZhZQsZdaLXZ9J5UqjDwLhR1IkV8r3Ii79ufLF5h//ERBYSRZSD6VwvyB7uIXK + OXe4sPdHZQGhOqVryUz5iwl7d1RkEawqdZepefADs+iw90YlKcJVpUVO8VHdmRukWHxK6Qwa1X25gcLy + vrmszFd8QuE7LIcpLljwF1aZV/uWHAZc0I9N/PMXVvmJ0mdQDh0W2+DK1MVlSp9BOWShC0uwb+P/KCzN + DQi+g3tB1EXWoZhZsjT6cAit4sovlZlGnRep294flTnJgnKEKbT7fFXpub0/KnMITCYL1m+MiZ2iUvd3 + 9cBmo8WA0LhZCn5hDtHbaHZU6QmGbC5asgjaUvd/MaJyFplQegP36gyjxWaihRThUPpZnStkXel3fFDn + uUGKxTG0qrMi5EfRrM5yg5cmhy8na7gHtvbLF9T64qAAAAAASUVORK5CYII= + + AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb index f69424d6..be8c56b6 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb @@ -4,29 +4,24 @@ Public AbfertigungsNr As Integer = -1 Public UnterNr As Integer = -1 - + + Dim FUNC As New cProgramFunctions Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click Try - ' MsgBox(CStr(r.Cells("LeistungsNr").Value)) - ' MsgBox(CStr(r.Cells("Leistungsbez").Value)) - ' MsgBox(CStr(r.Cells("Preis").Value)) - 'CStr(r.Cells("Leistungsbez").Value) - - - For i = 0 To dgvVorkosten.RowCount - 2 - Dim r As DataGridViewRow = dgvVorkosten.Rows(i) - If CStr(r.Cells("LeistungsNr").Value) = "" Or CStr(r.Cells("Leistungsbez").Value) = "" Or CStr(r.Cells("Preis").Value) = "" Or Not IsNumeric(r.Cells("Preis").Value) Then - lblError.Show() - Me.DialogResult = Windows.Forms.DialogResult.None - Exit Sub - End If - Next + 'For i = 0 To dgvVorkosten.RowCount - 1 + ' Dim r As DataGridViewRow = dgvVorkosten.Rows(i) + ' If CStr(r.Cells("LeistungsNr").Value) = "" Or CStr(r.Cells("Leistungsbez").Value) = "" Or CStr(r.Cells("Preis").Value) = "" Or Not IsNumeric(r.Cells("Preis").Value) Then + ' lblError.Show() + ' Me.DialogResult = Windows.Forms.DialogResult.None + ' Exit Sub + ' End If + 'Next VORKOSTEN.Clear() - For i = 0 To dgvVorkosten.RowCount - 2 + For i = 0 To dgvVorkosten.RowCount - 1 Dim r As DataGridViewRow = dgvVorkosten.Rows(i) If Not IsNumeric(r.Cells("LeistungsNr").Value) Then MsgBox("Leistungsnummer muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub If Not IsNumeric(r.Cells("Preis").Value) Then MsgBox("Preis muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub @@ -41,9 +36,146 @@ End Sub Private Sub frmNacherfassungVorkosten_Load(sender As Object, e As EventArgs) Handles Me.Load + + cboLeistungs.fillWithSQL(" SELECT [LeistungsNr], LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", True, "FMZOLL", True) + + dgvVorkosten.Rows.Clear() + If VORKOSTEN IsNot Nothing Then + For Each VK In VORKOSTEN + dgvVorkosten.Rows.Add(VK.LeistungsNr, VK.LeistungsBez, VK.Preis) + Next + End If + dgvVorkosten.ClearSelection() + End Sub + + Private Sub dgvVorkosten_DataError(sender As Object, anError As DataGridViewDataErrorEventArgs) Handles dgvVorkosten.DataError + + MessageBox.Show("Error happened " & anError.Context.ToString()) + + If anError.Context = DataGridViewDataErrorContexts.Commit Then + MessageBox.Show("Commit error") + End If + + If anError.Context = DataGridViewDataErrorContexts.CurrentCellChange Then + MessageBox.Show("Cell change") + End If + + If anError.Context = DataGridViewDataErrorContexts.Parsing Then + MessageBox.Show("parsing error") + End If + + If anError.Context = DataGridViewDataErrorContexts.LeaveControl Then + MessageBox.Show("leave control error") + End If + + If TypeOf (anError.Exception) Is ConstraintException Then + Dim view As DataGridView = CType(sender, DataGridView) + view.Rows(anError.RowIndex).ErrorText = "an error" + view.Rows(anError.RowIndex).Cells(anError.ColumnIndex).ErrorText = "an error" + anError.ThrowException = False + End If + + End Sub + + + Private Sub frmNacherfassungVorkosten_Shown(sender As Object, e As EventArgs) Handles Me.Shown + cboLeistungs.Focus() + 'Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + 'With DirectCast(dgvVorkosten.Columns("LeistungsNr"), DataGridViewComboBoxColumn) + + ' .DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL") + ' ' .DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr], [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL") + + ' .ValueMember = "LeistungsNr" '.DataSource.Columns(0).ColumnName + ' .DisplayMember = "LeistungsBez" '.DataSource.Columns(1).ColumnName + ' .DataPropertyName = "LeistungsNr" + ' .DropDownWidth = 350 + 'End With + + End Sub + + Private Sub btn_Click(sender As Object, e As EventArgs) For Each v In VORKOSTEN + 'Dim rowId = dgvVorkosten.Rows.Add() + + 'dgvVorkosten.Rows(rowId).Cells("LeistungsNr").Value = v.LeistungsNr + 'dgvVorkosten.Rows(rowId).Cells("LeistungsBez").Value = v.LeistungsBez + 'dgvVorkosten.Rows(rowId).Cells("Preis").Value = v.Preis + + 'MsgBox(v.LeistungsNr & "-" & v.LeistungsBez & "-" & v.Preis) dgvVorkosten.Rows.Add(v.LeistungsNr, v.LeistungsBez, v.Preis) Next dgvVorkosten.Columns("Preis").DefaultCellStyle.Format = "C2" + End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + addVorkosten() + End Sub + + + Dim VK_EDIT = -1 + Sub addVorkosten() + Label23.Visible = False + Label24.Visible = False + If cboLeistungs._value = "" Then Label23.Visible = True : cboLeistungs.Focus() : Exit Sub + If txtLeistungsbezeichnung.Text = "" Then Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub + If txtPreis._value = "" Then Label1.Visible = True : txtPreis.Focus() : Exit Sub + + If VK_EDIT >= 0 Then + dgvVorkosten.Rows.RemoveAt(VK_EDIT) + dgvVorkosten.Rows.Insert(VK_EDIT, cboLeistungs._value, txtLeistungsbezeichnung.Text, txtPreis._value) + VK_EDIT = -1 + Button3.BackgroundImage = My.Resources.plus + lklBearbeitungAbbrechenPK.Visible = False + Else + dgvVorkosten.Rows.Add(cboLeistungs._value, txtLeistungsbezeichnung.Text, txtPreis._value) + End If + cboLeistungs.changeItem("") : txtLeistungsbezeichnung.Text = "" : txtPreis.Text = "" + dgvVorkosten.FirstDisplayedScrollingRowIndex = dgvVorkosten.RowCount - 1 + dgvVorkosten.ClearSelection() + cboLeistungs.Focus() + End Sub + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + If dgvVorkosten.SelectedRows.Count > 0 Then + If MsgBox("Möchten Sie den Eintrag in 'Vorkosten' wirklich löschen?", vbYesNoCancel) = vbYes Then + dgvVorkosten.Rows.Remove(dgvVorkosten.SelectedRows(0)) + End If + End If + dgvVorkosten.ClearSelection() + End Sub + + Private Sub lklBearbeitungAbbrechenPK_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lklBearbeitungAbbrechenPK.LinkClicked + VK_EDIT = -1 + cboLeistungs.changeItem("") + txtLeistungsbezeichnung.Text = "" + txtPreis.Text = "" + + Button3.BackgroundImage = My.Resources.plus + lklBearbeitungAbbrechenPK.Visible = False + End Sub + + + Private Sub dgvPackstuecke_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVorkosten.CellDoubleClick + If e.RowIndex < 0 Then Exit Sub + editableRowPK(e.RowIndex) + End Sub + + Private Sub PackstueckeKeyDown(sender As Object, e As KeyEventArgs) Handles txtLeistungsbezeichnung.KeyDown, txtPreis.KeyDown + If e.KeyCode = Keys.Return Then addVorkosten() + e.Handled = True + End Sub + + Sub editableRowPK(index As Integer) + cboLeistungs.changeItem(dgvVorkosten.Rows(index).Cells("LeistungsNr").Value) + txtLeistungsbezeichnung.Text = dgvVorkosten.Rows(index).Cells("LeistungsBez").Value + txtPreis._value = dgvVorkosten.Rows(index).Cells("Preis").Value + VK_EDIT = index + Button3.BackgroundImage = My.Resources.stift + lklBearbeitungAbbrechenPK.Visible = True + End Sub + Private Sub dgvPackstuecke_CellContentClick(sender As Object, e As EventArgs) Handles dgvVorkosten.LostFocus + ' dgvVorkosten.ClearSelection() + End Sub + End Class \ No newline at end of file diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index e197f2d0..a218d361 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -23,6 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Me.TabPage1 = New System.Windows.Forms.TabPage() Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -57,6 +63,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlOpt = New System.Windows.Forms.Panel() Me.pnlBerichte = New System.Windows.Forms.Panel() + Me.Button23 = New System.Windows.Forms.Button() Me.Button22 = New System.Windows.Forms.Button() Me.Button21 = New System.Windows.Forms.Button() Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button() @@ -186,7 +193,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() - Me.Button23 = New System.Windows.Forms.Button() + Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -637,11 +644,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DataGridView.AllowUserToDeleteRows = False Me.DataGridView.AllowUserToOrderColumns = True Me.DataGridView.AllowUserToResizeRows = False + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2 Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Location = New System.Drawing.Point(450, 0) Me.DataGridView.Name = "DataGridView" + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.DataGridView.Size = New System.Drawing.Size(770, 227) Me.DataGridView.TabIndex = 0 ' @@ -668,11 +699,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW.AllowUserToOrderColumns = True Me.dgvLKW.AllowUserToResizeRows = False Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left Me.dgvLKW.Location = New System.Drawing.Point(0, 0) Me.dgvLKW.Name = "dgvLKW" + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvLKW.Size = New System.Drawing.Size(450, 227) Me.dgvLKW.TabIndex = 35 Me.dgvLKW.Visible = False @@ -731,6 +786,20 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' + 'Button23 + ' + Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button23.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button23.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button23.Location = New System.Drawing.Point(788, 81) + Me.Button23.Margin = New System.Windows.Forms.Padding(0) + Me.Button23.Name = "Button23" + Me.Button23.Size = New System.Drawing.Size(83, 28) + Me.Button23.TabIndex = 93 + Me.Button23.Text = "Erhalten " + Me.Button23.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button23.UseVisualStyleBackColor = True + ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -1789,6 +1858,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'SplitContainer1.Panel2 ' + Me.SplitContainer1.Panel2.Controls.Add(Me.txtBestimmungszollstelle) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxEIDR) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxCMR) Me.SplitContainer1.Panel2.Controls.Add(Me.Label41) @@ -2103,7 +2173,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxEIDR.BackColor = System.Drawing.Color.White Me.cbxEIDR.Checked = True Me.cbxEIDR.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxEIDR.Location = New System.Drawing.Point(511, 197) + Me.cbxEIDR.Location = New System.Drawing.Point(873, 3) Me.cbxEIDR.Name = "cbxEIDR" Me.cbxEIDR.Size = New System.Drawing.Size(106, 17) Me.cbxEIDR.TabIndex = 54 @@ -2117,7 +2187,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxCMR.BackColor = System.Drawing.Color.White Me.cbxCMR.Checked = True Me.cbxCMR.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxCMR.Location = New System.Drawing.Point(627, 195) + Me.cbxCMR.Location = New System.Drawing.Point(511, 198) Me.cbxCMR.Name = "cbxCMR" Me.cbxCMR.Size = New System.Drawing.Size(50, 17) Me.cbxCMR.TabIndex = 49 @@ -2586,19 +2656,32 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' - 'Button23 + 'txtBestimmungszollstelle ' - Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button23.Image = Global.SDL.My.Resources.Resources.statistik_small - Me.Button23.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button23.Location = New System.Drawing.Point(788, 81) - Me.Button23.Margin = New System.Windows.Forms.Padding(0) - Me.Button23.Name = "Button23" - Me.Button23.Size = New System.Drawing.Size(83, 28) - Me.Button23.TabIndex = 93 - Me.Button23.Text = "Erhalten " - Me.Button23.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button23.UseVisualStyleBackColor = True + Me.txtBestimmungszollstelle._allowFreitext = False + Me.txtBestimmungszollstelle._AllowSetValue = False + Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtBestimmungszollstelle._autoSizeGross = False + Me.txtBestimmungszollstelle._hideIfListEmpty = True + Me.txtBestimmungszollstelle._value = Nothing + Me.txtBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtBestimmungszollstelle.dgvpos = "LEFT" + Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtBestimmungszollstelle.key_visible = False + Me.txtBestimmungszollstelle.KEYPARAM = Nothing + Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(627, 192) + Me.txtBestimmungszollstelle.MaxLength = 50 + Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" + Me.txtBestimmungszollstelle.searchActive = True + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(106, 20) + Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtBestimmungszollstelle.TabIndex = 55 + Me.txtBestimmungszollstelle.usrcntl = Nothing + Me.txtBestimmungszollstelle.Visible = False ' 'usrCntlSpeditionsBuchSuche ' @@ -2807,4 +2890,5 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button21 As Button Friend WithEvents Button22 As Button Friend WithEvents Button23 As Button + Friend WithEvents txtBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index 4628b82c..83802881 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -126,6 +126,9 @@ 431, 17 + + 431, 17 + @@ -174,7 +177,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDQAACw0B7QfALAAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index d8a40152..5b692edd 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -278,6 +278,9 @@ Public Class usrCntlSpeditionsBuchSuche If cbxEIDR.CheckState = CheckState.Unchecked Then sqlstr &= " AND UK_EIDR_ausstehend=0 " End If + If txtBestimmungszollstelle.Visible And txtBestimmungszollstelle._value <> "" Then + sqlstr &= " AND Bestimmungszollstelle='" & txtBestimmungszollstelle._value & "' " + End If If cboSachbearbeiter._value <> "" Then sqlstr &= " AND Speditionsbuch.[Personalnummer] = @Personalnummer " If cboSB_Qs._value <> "" Then sqlstr &= " AND Speditionsbuch.[PersonalnummerQS] = @PersonalnummerQS " @@ -374,6 +377,7 @@ Public Class usrCntlSpeditionsBuchSuche cboSachbearbeiter.fillWithSQL("SELECT ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & sbWhere & " ORDER BY Name ", False, "FMZOLL", True) cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) ' cboFilialeHandling.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) + txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) cboHandlingssatz.fillWithSQL("SELECT [hs_Bezeichnung] FROM [tblHandlingssaetzeIntern] group by [hs_Bezeichnung] ", False, "FMZOLL", True) @@ -2249,4 +2253,13 @@ Public Class usrCntlSpeditionsBuchSuche End If End If End Sub + + Private Sub lstGrenze_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lstGrenze.SelectedIndexChanged + txtBestimmungszollstelle.Visible = False + + For Each l In lstGrenze.SelectedItems + If l.text <> "???" Then Exit Sub + Next + txtBestimmungszollstelle.Visible = True + End Sub End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb index 7d524402..ea0d17ee 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb @@ -355,6 +355,11 @@ Public Class usrCntlATLAS_AES AES.aes_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB DAKOSY_Interface_SEND.loadInClass_VersandanmeldungAES(AES, Me, DY_ANM) + Select Case FIRMA_DY + Case "AMBAR" + AES.aes_BezugsnummerVorblendung = "AA_EXPORT_AMBAR_" + End Select + If Not AES.SAVE_ALL() Then Exit Sub Dim saveFile = "" diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.Designer.vb index 85c51d48..9f19056c 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.Designer.vb @@ -24,8 +24,13 @@ Partial Class usrCntlATLAS_AES_Position Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlATLAS_AES_Position)) - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() + Me.Label8 = New System.Windows.Forms.Label() + Me.usrcntlSumAEmpfaenger = New SDL.usrCntlAdresse() + Me.usrcntlSumAVersedner = New SDL.usrCntlAdresse() + Me.usrcntlEmpfaenger = New SDL.usrCntlAdresse() + Me.usrcntlVersedner = New SDL.usrCntlAdresse() Me.Label7 = New System.Windows.Forms.Label() Me.sbExportAusLand = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.cbxVermerk10600 = New System.Windows.Forms.CheckBox() @@ -106,11 +111,6 @@ Partial Class usrCntlATLAS_AES_Position Me.Label5 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.lklBearbeitungAbbrechenPK = New System.Windows.Forms.LinkLabel() - Me.Label8 = New System.Windows.Forms.Label() - Me.usrcntlSumAEmpfaenger = New SDL.usrCntlAdresse() - Me.usrcntlSumAVersedner = New SDL.usrCntlAdresse() - Me.usrcntlEmpfaenger = New SDL.usrCntlAdresse() - Me.usrcntlVersedner = New SDL.usrCntlAdresse() Me.pnl.SuspendLayout() CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUnterlage, System.ComponentModel.ISupportInitialize).BeginInit() @@ -202,6 +202,59 @@ Partial Class usrCntlATLAS_AES_Position Me.pnl.Size = New System.Drawing.Size(730, 1100) Me.pnl.TabIndex = 0 ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(4, 773) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(285, 13) + Me.Label8.TabIndex = 93 + Me.Label8.Text = "Nur auszufüllen, wenn mehrere Warenpositionen:" + Me.Label8.Visible = False + ' + 'usrcntlSumAEmpfaenger + ' + Me.usrcntlSumAEmpfaenger._Titel = "SumA Empfänger:" + Me.usrcntlSumAEmpfaenger.BackColor = System.Drawing.Color.White + Me.usrcntlSumAEmpfaenger.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrcntlSumAEmpfaenger.Enabled = False + Me.usrcntlSumAEmpfaenger.Location = New System.Drawing.Point(354, 943) + Me.usrcntlSumAEmpfaenger.Name = "usrcntlSumAEmpfaenger" + Me.usrcntlSumAEmpfaenger.Size = New System.Drawing.Size(345, 133) + Me.usrcntlSumAEmpfaenger.TabIndex = 92 + ' + 'usrcntlSumAVersedner + ' + Me.usrcntlSumAVersedner._Titel = "SumA Versender:" + Me.usrcntlSumAVersedner.BackColor = System.Drawing.Color.White + Me.usrcntlSumAVersedner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrcntlSumAVersedner.Enabled = False + Me.usrcntlSumAVersedner.Location = New System.Drawing.Point(7, 943) + Me.usrcntlSumAVersedner.Name = "usrcntlSumAVersedner" + Me.usrcntlSumAVersedner.Size = New System.Drawing.Size(345, 133) + Me.usrcntlSumAVersedner.TabIndex = 91 + ' + 'usrcntlEmpfaenger + ' + Me.usrcntlEmpfaenger._Titel = "Empfänger:" + Me.usrcntlEmpfaenger.BackColor = System.Drawing.Color.White + Me.usrcntlEmpfaenger.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrcntlEmpfaenger.Location = New System.Drawing.Point(354, 789) + Me.usrcntlEmpfaenger.Name = "usrcntlEmpfaenger" + Me.usrcntlEmpfaenger.Size = New System.Drawing.Size(345, 133) + Me.usrcntlEmpfaenger.TabIndex = 90 + ' + 'usrcntlVersedner + ' + Me.usrcntlVersedner._Titel = "Versender:" + Me.usrcntlVersedner.BackColor = System.Drawing.Color.White + Me.usrcntlVersedner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.usrcntlVersedner.Location = New System.Drawing.Point(7, 789) + Me.usrcntlVersedner.Name = "usrcntlVersedner" + Me.usrcntlVersedner.Size = New System.Drawing.Size(345, 133) + Me.usrcntlVersedner.TabIndex = 89 + ' 'Label7 ' Me.Label7.ForeColor = System.Drawing.Color.Red @@ -216,6 +269,7 @@ Partial Class usrCntlATLAS_AES_Position ' Me.sbExportAusLand._allowFreitext = False Me.sbExportAusLand._AllowSetValue = False + Me.sbExportAusLand._allowSpaceAsSplitter = False Me.sbExportAusLand._autoSizeGross = False Me.sbExportAusLand._hideIfListEmpty = True Me.sbExportAusLand._value = Nothing @@ -258,14 +312,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'cbxVermerk ' + Me.cbxVermerk._DateTimeOnly = False Me.cbxVermerk._numbersOnly = False Me.cbxVermerk._numbersOnlyKommastellen = "" + Me.cbxVermerk._numbersOnlyTrennzeichen = True Me.cbxVermerk._Prozent = False Me.cbxVermerk._ShortDateNew = False Me.cbxVermerk._ShortDateOnly = False Me.cbxVermerk._TimeOnly = False + Me.cbxVermerk._TimeOnly_Seconds = False Me.cbxVermerk._value = Nothing Me.cbxVermerk._Waehrung = False + Me.cbxVermerk._WaehrungZeichen = True Me.cbxVermerk.ForeColor = System.Drawing.Color.Black Me.cbxVermerk.Location = New System.Drawing.Point(271, 659) Me.cbxVermerk.MaxLength = 280 @@ -392,14 +450,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtVpReferenz ' + Me.txtVpReferenz._DateTimeOnly = False Me.txtVpReferenz._numbersOnly = False Me.txtVpReferenz._numbersOnlyKommastellen = "" + Me.txtVpReferenz._numbersOnlyTrennzeichen = True Me.txtVpReferenz._Prozent = False Me.txtVpReferenz._ShortDateNew = False Me.txtVpReferenz._ShortDateOnly = False Me.txtVpReferenz._TimeOnly = False + Me.txtVpReferenz._TimeOnly_Seconds = False Me.txtVpReferenz._value = Nothing Me.txtVpReferenz._Waehrung = False + Me.txtVpReferenz._WaehrungZeichen = True Me.txtVpReferenz.ForeColor = System.Drawing.Color.Black Me.txtVpReferenz.Location = New System.Drawing.Point(136, 592) Me.txtVpReferenz.MaxLength = 35 @@ -424,7 +486,7 @@ Partial Class usrCntlATLAS_AES_Position ' 'Button5 ' - Me.Button5.BackgroundImage = Global.SDL.My.Resources.plus + Me.Button5.BackgroundImage = Global.SDL.My.Resources.Resources.plus Me.Button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button5.Location = New System.Drawing.Point(671, 592) @@ -436,14 +498,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtVpZusatz ' + Me.txtVpZusatz._DateTimeOnly = False Me.txtVpZusatz._numbersOnly = False Me.txtVpZusatz._numbersOnlyKommastellen = "" + Me.txtVpZusatz._numbersOnlyTrennzeichen = True Me.txtVpZusatz._Prozent = False Me.txtVpZusatz._ShortDateNew = False Me.txtVpZusatz._ShortDateOnly = False Me.txtVpZusatz._TimeOnly = False + Me.txtVpZusatz._TimeOnly_Seconds = False Me.txtVpZusatz._value = Nothing Me.txtVpZusatz._Waehrung = False + Me.txtVpZusatz._WaehrungZeichen = True Me.txtVpZusatz.ForeColor = System.Drawing.Color.Black Me.txtVpZusatz.Location = New System.Drawing.Point(335, 592) Me.txtVpZusatz.MaxLength = 26 @@ -557,14 +623,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWarennummer ' - Me.txtWarennummer._numbersOnly = False + Me.txtWarennummer._DateTimeOnly = False + Me.txtWarennummer._numbersOnly = True Me.txtWarennummer._numbersOnlyKommastellen = "" + Me.txtWarennummer._numbersOnlyTrennzeichen = False Me.txtWarennummer._Prozent = False Me.txtWarennummer._ShortDateNew = False Me.txtWarennummer._ShortDateOnly = False Me.txtWarennummer._TimeOnly = False + Me.txtWarennummer._TimeOnly_Seconds = False Me.txtWarennummer._value = Nothing Me.txtWarennummer._Waehrung = False + Me.txtWarennummer._WaehrungZeichen = True Me.txtWarennummer.ForeColor = System.Drawing.Color.Black Me.txtWarennummer.Location = New System.Drawing.Point(136, 130) Me.txtWarennummer.MaxLength = 10 @@ -577,14 +647,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWTNat ' + Me.txtWTNat._DateTimeOnly = False Me.txtWTNat._numbersOnly = False Me.txtWTNat._numbersOnlyKommastellen = "" + Me.txtWTNat._numbersOnlyTrennzeichen = True Me.txtWTNat._Prozent = False Me.txtWTNat._ShortDateNew = False Me.txtWTNat._ShortDateOnly = False Me.txtWTNat._TimeOnly = False + Me.txtWTNat._TimeOnly_Seconds = False Me.txtWTNat._value = Nothing Me.txtWTNat._Waehrung = False + Me.txtWTNat._WaehrungZeichen = True Me.txtWTNat.Enabled = False Me.txtWTNat.ForeColor = System.Drawing.Color.Black Me.txtWTNat.Location = New System.Drawing.Point(335, 130) @@ -597,14 +671,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWTZ2 ' + Me.txtWTZ2._DateTimeOnly = False Me.txtWTZ2._numbersOnly = False Me.txtWTZ2._numbersOnlyKommastellen = "" + Me.txtWTZ2._numbersOnlyTrennzeichen = True Me.txtWTZ2._Prozent = False Me.txtWTZ2._ShortDateNew = False Me.txtWTZ2._ShortDateOnly = False Me.txtWTZ2._TimeOnly = False + Me.txtWTZ2._TimeOnly_Seconds = False Me.txtWTZ2._value = Nothing Me.txtWTZ2._Waehrung = False + Me.txtWTZ2._WaehrungZeichen = True Me.txtWTZ2.Enabled = False Me.txtWTZ2.ForeColor = System.Drawing.Color.Black Me.txtWTZ2.Location = New System.Drawing.Point(302, 130) @@ -617,14 +695,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWTZ1 ' + Me.txtWTZ1._DateTimeOnly = False Me.txtWTZ1._numbersOnly = False Me.txtWTZ1._numbersOnlyKommastellen = "" + Me.txtWTZ1._numbersOnlyTrennzeichen = True Me.txtWTZ1._Prozent = False Me.txtWTZ1._ShortDateNew = False Me.txtWTZ1._ShortDateOnly = False Me.txtWTZ1._TimeOnly = False + Me.txtWTZ1._TimeOnly_Seconds = False Me.txtWTZ1._value = Nothing Me.txtWTZ1._Waehrung = False + Me.txtWTZ1._WaehrungZeichen = True Me.txtWTZ1.Enabled = False Me.txtWTZ1.ForeColor = System.Drawing.Color.Black Me.txtWTZ1.Location = New System.Drawing.Point(269, 130) @@ -637,14 +719,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWTTaric ' + Me.txtWTTaric._DateTimeOnly = False Me.txtWTTaric._numbersOnly = False Me.txtWTTaric._numbersOnlyKommastellen = "" + Me.txtWTTaric._numbersOnlyTrennzeichen = True Me.txtWTTaric._Prozent = False Me.txtWTTaric._ShortDateNew = False Me.txtWTTaric._ShortDateOnly = False Me.txtWTTaric._TimeOnly = False + Me.txtWTTaric._TimeOnly_Seconds = False Me.txtWTTaric._value = Nothing Me.txtWTTaric._Waehrung = False + Me.txtWTTaric._WaehrungZeichen = True Me.txtWTTaric.Enabled = False Me.txtWTTaric.ForeColor = System.Drawing.Color.Black Me.txtWTTaric.Location = New System.Drawing.Point(236, 130) @@ -686,6 +772,7 @@ Partial Class usrCntlATLAS_AES_Position ' Me.MySearchBox1._allowFreitext = False Me.MySearchBox1._AllowSetValue = False + Me.MySearchBox1._allowSpaceAsSplitter = False Me.MySearchBox1._autoSizeGross = False Me.MySearchBox1._hideIfListEmpty = True Me.MySearchBox1._value = Nothing @@ -708,14 +795,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtEigenmasse ' + Me.txtEigenmasse._DateTimeOnly = False Me.txtEigenmasse._numbersOnly = True Me.txtEigenmasse._numbersOnlyKommastellen = "2" + Me.txtEigenmasse._numbersOnlyTrennzeichen = True Me.txtEigenmasse._Prozent = False Me.txtEigenmasse._ShortDateNew = False Me.txtEigenmasse._ShortDateOnly = False Me.txtEigenmasse._TimeOnly = False + Me.txtEigenmasse._TimeOnly_Seconds = False Me.txtEigenmasse._value = "0" Me.txtEigenmasse._Waehrung = False + Me.txtEigenmasse._WaehrungZeichen = True Me.txtEigenmasse.ForeColor = System.Drawing.Color.Black Me.txtEigenmasse.Location = New System.Drawing.Point(436, 157) Me.txtEigenmasse.MaxLength = 18 @@ -729,14 +820,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtRohmasse ' + Me.txtRohmasse._DateTimeOnly = False Me.txtRohmasse._numbersOnly = True Me.txtRohmasse._numbersOnlyKommastellen = "2" + Me.txtRohmasse._numbersOnlyTrennzeichen = True Me.txtRohmasse._Prozent = False Me.txtRohmasse._ShortDateNew = False Me.txtRohmasse._ShortDateOnly = False Me.txtRohmasse._TimeOnly = False + Me.txtRohmasse._TimeOnly_Seconds = False Me.txtRohmasse._value = "0" Me.txtRohmasse._Waehrung = False + Me.txtRohmasse._WaehrungZeichen = True Me.txtRohmasse.ForeColor = System.Drawing.Color.Black Me.txtRohmasse.Location = New System.Drawing.Point(552, 157) Me.txtRohmasse.MaxLength = 18 @@ -770,6 +865,7 @@ Partial Class usrCntlATLAS_AES_Position ' Me.sbUlArten._allowFreitext = False Me.sbUlArten._AllowSetValue = False + Me.sbUlArten._allowSpaceAsSplitter = False Me.sbUlArten._autoSizeGross = False Me.sbUlArten._hideIfListEmpty = True Me.sbUlArten._value = Nothing @@ -794,6 +890,7 @@ Partial Class usrCntlATLAS_AES_Position ' Me.sbPkTyp._allowFreitext = False Me.sbPkTyp._AllowSetValue = False + Me.sbPkTyp._allowSpaceAsSplitter = False Me.sbPkTyp._autoSizeGross = False Me.sbPkTyp._hideIfListEmpty = True Me.sbPkTyp._value = Nothing @@ -852,7 +949,7 @@ Partial Class usrCntlATLAS_AES_Position ' 'Button1 ' - Me.Button1.BackgroundImage = Global.SDL.My.Resources.plus + Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.plus Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Location = New System.Drawing.Point(671, 459) @@ -864,14 +961,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtUlZusatz ' + Me.txtUlZusatz._DateTimeOnly = False Me.txtUlZusatz._numbersOnly = False Me.txtUlZusatz._numbersOnlyKommastellen = "" + Me.txtUlZusatz._numbersOnlyTrennzeichen = True Me.txtUlZusatz._Prozent = False Me.txtUlZusatz._ShortDateNew = False Me.txtUlZusatz._ShortDateOnly = False Me.txtUlZusatz._TimeOnly = False + Me.txtUlZusatz._TimeOnly_Seconds = False Me.txtUlZusatz._value = Nothing Me.txtUlZusatz._Waehrung = False + Me.txtUlZusatz._WaehrungZeichen = True Me.txtUlZusatz.ForeColor = System.Drawing.Color.Black Me.txtUlZusatz.Location = New System.Drawing.Point(519, 459) Me.txtUlZusatz.MaxLength = 26 @@ -884,14 +985,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtUlReferenz ' + Me.txtUlReferenz._DateTimeOnly = False Me.txtUlReferenz._numbersOnly = False Me.txtUlReferenz._numbersOnlyKommastellen = "" + Me.txtUlReferenz._numbersOnlyTrennzeichen = True Me.txtUlReferenz._Prozent = False Me.txtUlReferenz._ShortDateNew = False Me.txtUlReferenz._ShortDateOnly = False Me.txtUlReferenz._TimeOnly = False + Me.txtUlReferenz._TimeOnly_Seconds = False Me.txtUlReferenz._value = Nothing Me.txtUlReferenz._Waehrung = False + Me.txtUlReferenz._WaehrungZeichen = True Me.txtUlReferenz.ForeColor = System.Drawing.Color.Black Me.txtUlReferenz.Location = New System.Drawing.Point(370, 459) Me.txtUlReferenz.MaxLength = 35 @@ -904,7 +1009,7 @@ Partial Class usrCntlATLAS_AES_Position ' 'btn ' - Me.btn.BackgroundImage = Global.SDL.My.Resources.plus + Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.plus Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Location = New System.Drawing.Point(671, 329) @@ -916,14 +1021,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtPkMarke ' + Me.txtPkMarke._DateTimeOnly = False Me.txtPkMarke._numbersOnly = False Me.txtPkMarke._numbersOnlyKommastellen = "" + Me.txtPkMarke._numbersOnlyTrennzeichen = True Me.txtPkMarke._Prozent = False Me.txtPkMarke._ShortDateNew = False Me.txtPkMarke._ShortDateOnly = False Me.txtPkMarke._TimeOnly = False + Me.txtPkMarke._TimeOnly_Seconds = False Me.txtPkMarke._value = "ohne" Me.txtPkMarke._Waehrung = False + Me.txtPkMarke._WaehrungZeichen = True Me.txtPkMarke.ForeColor = System.Drawing.Color.Black Me.txtPkMarke.Location = New System.Drawing.Point(412, 329) Me.txtPkMarke.MaxLength = 42 @@ -937,14 +1046,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtPkAnzahl ' + Me.txtPkAnzahl._DateTimeOnly = False Me.txtPkAnzahl._numbersOnly = True Me.txtPkAnzahl._numbersOnlyKommastellen = "" + Me.txtPkAnzahl._numbersOnlyTrennzeichen = True Me.txtPkAnzahl._Prozent = False Me.txtPkAnzahl._ShortDateNew = False Me.txtPkAnzahl._ShortDateOnly = False Me.txtPkAnzahl._TimeOnly = False - Me.txtPkAnzahl._value = Nothing + Me.txtPkAnzahl._TimeOnly_Seconds = False + Me.txtPkAnzahl._value = "" Me.txtPkAnzahl._Waehrung = False + Me.txtPkAnzahl._WaehrungZeichen = True Me.txtPkAnzahl.ForeColor = System.Drawing.Color.Black Me.txtPkAnzahl.Location = New System.Drawing.Point(136, 329) Me.txtPkAnzahl.MaxLength = 5 @@ -1057,8 +1170,8 @@ Partial Class usrCntlATLAS_AES_Position ' 'Anzahl ' - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle1 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.Name = "Anzahl" Me.Anzahl.ReadOnly = True @@ -1121,14 +1234,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWarenwert ' + Me.txtWarenwert._DateTimeOnly = False Me.txtWarenwert._numbersOnly = False Me.txtWarenwert._numbersOnlyKommastellen = "" + Me.txtWarenwert._numbersOnlyTrennzeichen = True Me.txtWarenwert._Prozent = False Me.txtWarenwert._ShortDateNew = False Me.txtWarenwert._ShortDateOnly = False Me.txtWarenwert._TimeOnly = False + Me.txtWarenwert._TimeOnly_Seconds = False Me.txtWarenwert._value = "" Me.txtWarenwert._Waehrung = True + Me.txtWarenwert._WaehrungZeichen = True Me.txtWarenwert.ForeColor = System.Drawing.Color.Black Me.txtWarenwert.Location = New System.Drawing.Point(136, 157) Me.txtWarenwert.MaxLineLength = -1 @@ -1149,14 +1266,18 @@ Partial Class usrCntlATLAS_AES_Position ' 'txtWarenbezeichnung ' + Me.txtWarenbezeichnung._DateTimeOnly = False Me.txtWarenbezeichnung._numbersOnly = False Me.txtWarenbezeichnung._numbersOnlyKommastellen = "" + Me.txtWarenbezeichnung._numbersOnlyTrennzeichen = True Me.txtWarenbezeichnung._Prozent = False Me.txtWarenbezeichnung._ShortDateNew = False Me.txtWarenbezeichnung._ShortDateOnly = False Me.txtWarenbezeichnung._TimeOnly = False + Me.txtWarenbezeichnung._TimeOnly_Seconds = False Me.txtWarenbezeichnung._value = Nothing Me.txtWarenbezeichnung._Waehrung = False + Me.txtWarenbezeichnung._WaehrungZeichen = True Me.txtWarenbezeichnung.ForeColor = System.Drawing.Color.Black Me.txtWarenbezeichnung.Location = New System.Drawing.Point(136, 41) Me.txtWarenbezeichnung.MaxLength = 280 @@ -1249,67 +1370,14 @@ Partial Class usrCntlATLAS_AES_Position Me.lklBearbeitungAbbrechenPK.Text = "Bearbeitung abbrechen" Me.lklBearbeitungAbbrechenPK.Visible = False ' - 'Label8 - ' - Me.Label8.AutoSize = True - Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(4, 773) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(285, 13) - Me.Label8.TabIndex = 93 - Me.Label8.Text = "Nur auszufüllen, wenn mehrere Warenpositionen:" - Me.Label8.Visible = False - ' - 'usrcntlSumAEmpfaenger - ' - Me.usrcntlSumAEmpfaenger._Titel = "SumA Empfänger:" - Me.usrcntlSumAEmpfaenger.BackColor = System.Drawing.Color.White - Me.usrcntlSumAEmpfaenger.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrcntlSumAEmpfaenger.Enabled = False - Me.usrcntlSumAEmpfaenger.Location = New System.Drawing.Point(354, 943) - Me.usrcntlSumAEmpfaenger.Name = "usrcntlSumAEmpfaenger" - Me.usrcntlSumAEmpfaenger.Size = New System.Drawing.Size(345, 133) - Me.usrcntlSumAEmpfaenger.TabIndex = 92 - ' - 'usrcntlSumAVersedner - ' - Me.usrcntlSumAVersedner._Titel = "SumA Versender:" - Me.usrcntlSumAVersedner.BackColor = System.Drawing.Color.White - Me.usrcntlSumAVersedner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrcntlSumAVersedner.Enabled = False - Me.usrcntlSumAVersedner.Location = New System.Drawing.Point(7, 943) - Me.usrcntlSumAVersedner.Name = "usrcntlSumAVersedner" - Me.usrcntlSumAVersedner.Size = New System.Drawing.Size(345, 133) - Me.usrcntlSumAVersedner.TabIndex = 91 - ' - 'usrcntlEmpfaenger - ' - Me.usrcntlEmpfaenger._Titel = "Empfänger:" - Me.usrcntlEmpfaenger.BackColor = System.Drawing.Color.White - Me.usrcntlEmpfaenger.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrcntlEmpfaenger.Location = New System.Drawing.Point(354, 789) - Me.usrcntlEmpfaenger.Name = "usrcntlEmpfaenger" - Me.usrcntlEmpfaenger.Size = New System.Drawing.Size(345, 133) - Me.usrcntlEmpfaenger.TabIndex = 90 - ' - 'usrcntlVersedner - ' - Me.usrcntlVersedner._Titel = "Versender:" - Me.usrcntlVersedner.BackColor = System.Drawing.Color.White - Me.usrcntlVersedner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.usrcntlVersedner.Location = New System.Drawing.Point(7, 789) - Me.usrcntlVersedner.Name = "usrcntlVersedner" - Me.usrcntlVersedner.Size = New System.Drawing.Size(345, 133) - Me.usrcntlVersedner.TabIndex = 89 - ' - 'usrCntlATLAS_NCTS_Position + 'usrCntlATLAS_AES_Position ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White Me.Controls.Add(Me.pnl) - Me.Name = "usrCntlATLAS_NCTS_Position" + Me.Name = "usrCntlATLAS_AES_Position" Me.Size = New System.Drawing.Size(730, 1100) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.resx b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.resx index 378c2e01..39b0f7f9 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.resx +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES_Position.resx @@ -190,34 +190,4 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb index 3fbe1d11..ddd601d1 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA_Position.Designer.vb @@ -25,6 +25,7 @@ Partial Class usrCntlATLAS_EZA_Position Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlATLAS_EZA_Position)) Me.pnl = New System.Windows.Forms.Panel() + Me.txtArtikelpreisWaehrung = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.sbAHStatMasseinheit = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label12 = New System.Windows.Forms.Label() Me.txtAHStatMenge = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -84,7 +85,6 @@ Partial Class usrCntlATLAS_EZA_Position Me.Label2 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Label11 = New System.Windows.Forms.Label() - Me.txtArtikelpreisWaehrung = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.pnl.SuspendLayout() CType(Me.dgvUnterlage, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -154,6 +154,31 @@ Partial Class usrCntlATLAS_EZA_Position Me.pnl.Size = New System.Drawing.Size(730, 573) Me.pnl.TabIndex = 0 ' + 'txtArtikelpreisWaehrung + ' + Me.txtArtikelpreisWaehrung._allowFreitext = False + Me.txtArtikelpreisWaehrung._AllowSetValue = False + Me.txtArtikelpreisWaehrung._allowSpaceAsSplitter = False + Me.txtArtikelpreisWaehrung._autoSizeGross = False + Me.txtArtikelpreisWaehrung._hideIfListEmpty = True + Me.txtArtikelpreisWaehrung._value = "" + Me.txtArtikelpreisWaehrung.conn_art = "FMZOLL" + Me.txtArtikelpreisWaehrung.dgvpos = "LEFT" + Me.txtArtikelpreisWaehrung.DISPLAY_PARAM = Nothing + Me.txtArtikelpreisWaehrung.INVISIBLE_COLUMNS = Nothing + Me.txtArtikelpreisWaehrung.key_visible = False + Me.txtArtikelpreisWaehrung.KEYPARAM = Nothing + Me.txtArtikelpreisWaehrung.Location = New System.Drawing.Point(281, 214) + Me.txtArtikelpreisWaehrung.Name = "txtArtikelpreisWaehrung" + Me.txtArtikelpreisWaehrung.searchActive = True + Me.txtArtikelpreisWaehrung.Size = New System.Drawing.Size(67, 20) + Me.txtArtikelpreisWaehrung.SQL_ORDER_BY = Nothing + Me.txtArtikelpreisWaehrung.SQL_SELECT = Nothing + Me.txtArtikelpreisWaehrung.SQL_WHERE = Nothing + Me.txtArtikelpreisWaehrung.SQL_WhereParamList = Nothing + Me.txtArtikelpreisWaehrung.TabIndex = 60 + Me.txtArtikelpreisWaehrung.usrcntl = Nothing + ' 'sbAHStatMasseinheit ' Me.sbAHStatMasseinheit._allowFreitext = False @@ -193,10 +218,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtAHStatMenge._DateTimeOnly = False Me.txtAHStatMenge._numbersOnly = True Me.txtAHStatMenge._numbersOnlyKommastellen = "0" + Me.txtAHStatMenge._numbersOnlyTrennzeichen = True Me.txtAHStatMenge._Prozent = False Me.txtAHStatMenge._ShortDateNew = False Me.txtAHStatMenge._ShortDateOnly = False Me.txtAHStatMenge._TimeOnly = False + Me.txtAHStatMenge._TimeOnly_Seconds = False Me.txtAHStatMenge._value = "" Me.txtAHStatMenge._Waehrung = False Me.txtAHStatMenge._WaehrungZeichen = False @@ -429,10 +456,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtPositionszusatz._DateTimeOnly = False Me.txtPositionszusatz._numbersOnly = False Me.txtPositionszusatz._numbersOnlyKommastellen = "" + Me.txtPositionszusatz._numbersOnlyTrennzeichen = True Me.txtPositionszusatz._Prozent = False Me.txtPositionszusatz._ShortDateNew = False Me.txtPositionszusatz._ShortDateOnly = False Me.txtPositionszusatz._TimeOnly = False + Me.txtPositionszusatz._TimeOnly_Seconds = False Me.txtPositionszusatz._value = Nothing Me.txtPositionszusatz._Waehrung = False Me.txtPositionszusatz._WaehrungZeichen = True @@ -472,12 +501,14 @@ Partial Class usrCntlATLAS_EZA_Position 'txtWarennummer ' Me.txtWarennummer._DateTimeOnly = False - Me.txtWarennummer._numbersOnly = False + Me.txtWarennummer._numbersOnly = True Me.txtWarennummer._numbersOnlyKommastellen = "" + Me.txtWarennummer._numbersOnlyTrennzeichen = False Me.txtWarennummer._Prozent = False Me.txtWarennummer._ShortDateNew = False Me.txtWarennummer._ShortDateOnly = False Me.txtWarennummer._TimeOnly = False + Me.txtWarennummer._TimeOnly_Seconds = False Me.txtWarennummer._value = Nothing Me.txtWarennummer._Waehrung = False Me.txtWarennummer._WaehrungZeichen = True @@ -496,10 +527,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtWTZ2._DateTimeOnly = False Me.txtWTZ2._numbersOnly = False Me.txtWTZ2._numbersOnlyKommastellen = "" + Me.txtWTZ2._numbersOnlyTrennzeichen = True Me.txtWTZ2._Prozent = False Me.txtWTZ2._ShortDateNew = False Me.txtWTZ2._ShortDateOnly = False Me.txtWTZ2._TimeOnly = False + Me.txtWTZ2._TimeOnly_Seconds = False Me.txtWTZ2._value = Nothing Me.txtWTZ2._Waehrung = False Me.txtWTZ2._WaehrungZeichen = True @@ -518,10 +551,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtWTZ1._DateTimeOnly = False Me.txtWTZ1._numbersOnly = False Me.txtWTZ1._numbersOnlyKommastellen = "" + Me.txtWTZ1._numbersOnlyTrennzeichen = True Me.txtWTZ1._Prozent = False Me.txtWTZ1._ShortDateNew = False Me.txtWTZ1._ShortDateOnly = False Me.txtWTZ1._TimeOnly = False + Me.txtWTZ1._TimeOnly_Seconds = False Me.txtWTZ1._value = Nothing Me.txtWTZ1._Waehrung = False Me.txtWTZ1._WaehrungZeichen = True @@ -574,10 +609,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtEigenmasse._DateTimeOnly = False Me.txtEigenmasse._numbersOnly = True Me.txtEigenmasse._numbersOnlyKommastellen = "2" + Me.txtEigenmasse._numbersOnlyTrennzeichen = True Me.txtEigenmasse._Prozent = False Me.txtEigenmasse._ShortDateNew = False Me.txtEigenmasse._ShortDateOnly = False Me.txtEigenmasse._TimeOnly = False + Me.txtEigenmasse._TimeOnly_Seconds = False Me.txtEigenmasse._value = "0" Me.txtEigenmasse._Waehrung = False Me.txtEigenmasse._WaehrungZeichen = True @@ -597,10 +634,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtRohmasse._DateTimeOnly = False Me.txtRohmasse._numbersOnly = True Me.txtRohmasse._numbersOnlyKommastellen = "2" + Me.txtRohmasse._numbersOnlyTrennzeichen = True Me.txtRohmasse._Prozent = False Me.txtRohmasse._ShortDateNew = False Me.txtRohmasse._ShortDateOnly = False Me.txtRohmasse._TimeOnly = False + Me.txtRohmasse._TimeOnly_Seconds = False Me.txtRohmasse._value = "0" Me.txtRohmasse._Waehrung = False Me.txtRohmasse._WaehrungZeichen = True @@ -724,10 +763,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtUlAusstellDat._DateTimeOnly = False Me.txtUlAusstellDat._numbersOnly = False Me.txtUlAusstellDat._numbersOnlyKommastellen = "" + Me.txtUlAusstellDat._numbersOnlyTrennzeichen = True Me.txtUlAusstellDat._Prozent = False Me.txtUlAusstellDat._ShortDateNew = True Me.txtUlAusstellDat._ShortDateOnly = False Me.txtUlAusstellDat._TimeOnly = False + Me.txtUlAusstellDat._TimeOnly_Seconds = False Me.txtUlAusstellDat._value = "" Me.txtUlAusstellDat._Waehrung = False Me.txtUlAusstellDat._WaehrungZeichen = True @@ -746,10 +787,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtUlNummer._DateTimeOnly = False Me.txtUlNummer._numbersOnly = False Me.txtUlNummer._numbersOnlyKommastellen = "" + Me.txtUlNummer._numbersOnlyTrennzeichen = True Me.txtUlNummer._Prozent = False Me.txtUlNummer._ShortDateNew = False Me.txtUlNummer._ShortDateOnly = False Me.txtUlNummer._TimeOnly = False + Me.txtUlNummer._TimeOnly_Seconds = False Me.txtUlNummer._value = Nothing Me.txtUlNummer._Waehrung = False Me.txtUlNummer._WaehrungZeichen = True @@ -768,10 +811,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtPkMarke._DateTimeOnly = False Me.txtPkMarke._numbersOnly = False Me.txtPkMarke._numbersOnlyKommastellen = "" + Me.txtPkMarke._numbersOnlyTrennzeichen = True Me.txtPkMarke._Prozent = False Me.txtPkMarke._ShortDateNew = False Me.txtPkMarke._ShortDateOnly = False Me.txtPkMarke._TimeOnly = False + Me.txtPkMarke._TimeOnly_Seconds = False Me.txtPkMarke._value = "" Me.txtPkMarke._Waehrung = False Me.txtPkMarke._WaehrungZeichen = True @@ -790,10 +835,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtPkAnzahl._DateTimeOnly = False Me.txtPkAnzahl._numbersOnly = True Me.txtPkAnzahl._numbersOnlyKommastellen = "" + Me.txtPkAnzahl._numbersOnlyTrennzeichen = True Me.txtPkAnzahl._Prozent = False Me.txtPkAnzahl._ShortDateNew = False Me.txtPkAnzahl._ShortDateOnly = False Me.txtPkAnzahl._TimeOnly = False + Me.txtPkAnzahl._TimeOnly_Seconds = False Me.txtPkAnzahl._value = "" Me.txtPkAnzahl._Waehrung = False Me.txtPkAnzahl._WaehrungZeichen = True @@ -900,10 +947,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtWarenwert._DateTimeOnly = False Me.txtWarenwert._numbersOnly = False Me.txtWarenwert._numbersOnlyKommastellen = "" + Me.txtWarenwert._numbersOnlyTrennzeichen = True Me.txtWarenwert._Prozent = False Me.txtWarenwert._ShortDateNew = False Me.txtWarenwert._ShortDateOnly = False Me.txtWarenwert._TimeOnly = False + Me.txtWarenwert._TimeOnly_Seconds = False Me.txtWarenwert._value = "" Me.txtWarenwert._Waehrung = True Me.txtWarenwert._WaehrungZeichen = True @@ -930,10 +979,12 @@ Partial Class usrCntlATLAS_EZA_Position Me.txtWarenbezeichnung._DateTimeOnly = False Me.txtWarenbezeichnung._numbersOnly = False Me.txtWarenbezeichnung._numbersOnlyKommastellen = "" + Me.txtWarenbezeichnung._numbersOnlyTrennzeichen = True Me.txtWarenbezeichnung._Prozent = False Me.txtWarenbezeichnung._ShortDateNew = False Me.txtWarenbezeichnung._ShortDateOnly = False Me.txtWarenbezeichnung._TimeOnly = False + Me.txtWarenbezeichnung._TimeOnly_Seconds = False Me.txtWarenbezeichnung._value = Nothing Me.txtWarenbezeichnung._Waehrung = False Me.txtWarenbezeichnung._WaehrungZeichen = True @@ -986,31 +1037,6 @@ Partial Class usrCntlATLAS_EZA_Position Me.Label11.Text = "Ursprungsland:" Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'txtArtikelpreisWaehrung - ' - Me.txtArtikelpreisWaehrung._allowFreitext = False - Me.txtArtikelpreisWaehrung._AllowSetValue = False - Me.txtArtikelpreisWaehrung._allowSpaceAsSplitter = False - Me.txtArtikelpreisWaehrung._autoSizeGross = False - Me.txtArtikelpreisWaehrung._hideIfListEmpty = True - Me.txtArtikelpreisWaehrung._value = "" - Me.txtArtikelpreisWaehrung.conn_art = "FMZOLL" - Me.txtArtikelpreisWaehrung.dgvpos = "LEFT" - Me.txtArtikelpreisWaehrung.DISPLAY_PARAM = Nothing - Me.txtArtikelpreisWaehrung.INVISIBLE_COLUMNS = Nothing - Me.txtArtikelpreisWaehrung.key_visible = False - Me.txtArtikelpreisWaehrung.KEYPARAM = Nothing - Me.txtArtikelpreisWaehrung.Location = New System.Drawing.Point(281, 214) - Me.txtArtikelpreisWaehrung.Name = "txtArtikelpreisWaehrung" - Me.txtArtikelpreisWaehrung.searchActive = True - Me.txtArtikelpreisWaehrung.Size = New System.Drawing.Size(67, 20) - Me.txtArtikelpreisWaehrung.SQL_ORDER_BY = Nothing - Me.txtArtikelpreisWaehrung.SQL_SELECT = Nothing - Me.txtArtikelpreisWaehrung.SQL_WHERE = Nothing - Me.txtArtikelpreisWaehrung.SQL_WhereParamList = Nothing - Me.txtArtikelpreisWaehrung.TabIndex = 60 - Me.txtArtikelpreisWaehrung.usrcntl = Nothing - ' 'usrCntlATLAS_EZA_Position ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.Designer.vb index 78b07d15..0e8ed3b7 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.Designer.vb @@ -24,26 +24,31 @@ Partial Class frmRoutenauswahl Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRoutenauswahl)) Me.pnl = New System.Windows.Forms.Panel() - Me.lblBitteWahlenSieEineRoute = New System.Windows.Forms.Label() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnRoute1 = New System.Windows.Forms.Button() Me.btnRoute5 = New System.Windows.Forms.Button() Me.btnRoute2 = New System.Windows.Forms.Button() Me.btnRoute3 = New System.Windows.Forms.Button() Me.btnRoute4 = New System.Windows.Forms.Button() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.Panel2 = New System.Windows.Forms.Panel() - Me.pic = New System.Windows.Forms.PictureBox() Me.Panel3 = New System.Windows.Forms.Panel() + Me.lblBitteWahlenSieEineRoute = New System.Windows.Forms.Label() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnBestimmungsland = New System.Windows.Forms.Button() + Me.pic = New System.Windows.Forms.PictureBox() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Button4 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() - Me.btnTR = New System.Windows.Forms.Button() Me.btnIR = New System.Windows.Forms.Button() + Me.btnTR = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() - Me.Panel1.SuspendLayout() - Me.Panel2.SuspendLayout() - CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel3.SuspendLayout() + Me.Panel1.SuspendLayout() + CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel2.SuspendLayout() Me.SuspendLayout() ' 'pnl @@ -57,15 +62,6 @@ Partial Class frmRoutenauswahl Me.pnl.Size = New System.Drawing.Size(312, 546) Me.pnl.TabIndex = 1 ' - 'lblBitteWahlenSieEineRoute - ' - Me.lblBitteWahlenSieEineRoute.AutoSize = True - Me.lblBitteWahlenSieEineRoute.Location = New System.Drawing.Point(3, 15) - Me.lblBitteWahlenSieEineRoute.Name = "lblBitteWahlenSieEineRoute" - Me.lblBitteWahlenSieEineRoute.Size = New System.Drawing.Size(141, 13) - Me.lblBitteWahlenSieEineRoute.TabIndex = 1 - Me.lblBitteWahlenSieEineRoute.Text = "Bitte wählen Sie eine Route:" - ' 'FlowLayoutPanel ' Me.FlowLayoutPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -89,7 +85,7 @@ Partial Class frmRoutenauswahl Me.btnRoute1.Name = "btnRoute1" Me.btnRoute1.Size = New System.Drawing.Size(297, 72) Me.btnRoute1.TabIndex = 0 - Me.btnRoute1.Text = "Deutschland -> Österreich -> Slowenien " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Kroatien -> Serbien -> Bulgarien" & _ + Me.btnRoute1.Text = "Deutschland -> Österreich -> Slowenien " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Kroatien -> Serbien -> Bulgarien" & " -> Türkei" Me.btnRoute1.UseVisualStyleBackColor = True ' @@ -141,9 +137,28 @@ Partial Class frmRoutenauswahl Me.btnRoute4.Text = "Deutschland -> Österreich -> " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Italien -> Türkei" Me.btnRoute4.UseVisualStyleBackColor = True ' + 'Panel3 + ' + Me.Panel3.Controls.Add(Me.lblBitteWahlenSieEineRoute) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel3.Location = New System.Drawing.Point(0, 0) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(312, 43) + Me.Panel3.TabIndex = 4 + ' + 'lblBitteWahlenSieEineRoute + ' + Me.lblBitteWahlenSieEineRoute.AutoSize = True + Me.lblBitteWahlenSieEineRoute.Location = New System.Drawing.Point(3, 15) + Me.lblBitteWahlenSieEineRoute.Name = "lblBitteWahlenSieEineRoute" + Me.lblBitteWahlenSieEineRoute.Size = New System.Drawing.Size(141, 13) + Me.lblBitteWahlenSieEineRoute.TabIndex = 1 + Me.lblBitteWahlenSieEineRoute.Text = "Bitte wählen Sie eine Route:" + ' 'Panel1 ' Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.btnBestimmungsland) Me.Panel1.Controls.Add(Me.pic) Me.Panel1.Controls.Add(Me.Panel2) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill @@ -152,21 +167,24 @@ Partial Class frmRoutenauswahl Me.Panel1.Size = New System.Drawing.Size(754, 546) Me.Panel1.TabIndex = 2 ' - 'Panel2 + 'btnBestimmungsland ' - Me.Panel2.BackColor = System.Drawing.Color.White - Me.Panel2.Controls.Add(Me.Label1) - Me.Panel2.Controls.Add(Me.btnIR) - Me.Panel2.Controls.Add(Me.btnTR) - Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel2.Location = New System.Drawing.Point(0, 0) - Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(752, 42) - Me.Panel2.TabIndex = 3 + Me.btnBestimmungsland.BackColor = System.Drawing.Color.Orange + Me.btnBestimmungsland.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnBestimmungsland.Enabled = False + Me.btnBestimmungsland.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBestimmungsland.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnBestimmungsland.Location = New System.Drawing.Point(640, 446) + Me.btnBestimmungsland.Name = "btnBestimmungsland" + Me.btnBestimmungsland.Size = New System.Drawing.Size(112, 61) + Me.btnBestimmungsland.TabIndex = 9 + Me.btnBestimmungsland.Text = "Irak" + Me.btnBestimmungsland.UseVisualStyleBackColor = False + Me.btnBestimmungsland.Visible = False ' 'pic ' - Me.pic.BackgroundImage = Global.SDL.My.Resources.Route1 + Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.Route1 Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.pic.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pic.Dock = System.Windows.Forms.DockStyle.Fill @@ -176,14 +194,73 @@ Partial Class frmRoutenauswahl Me.pic.TabIndex = 4 Me.pic.TabStop = False ' - 'Panel3 + 'Panel2 ' - Me.Panel3.Controls.Add(Me.lblBitteWahlenSieEineRoute) - Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel3.Location = New System.Drawing.Point(0, 0) - Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(312, 43) - Me.Panel3.TabIndex = 4 + Me.Panel2.BackColor = System.Drawing.Color.White + Me.Panel2.Controls.Add(Me.Button4) + Me.Panel2.Controls.Add(Me.Button3) + Me.Panel2.Controls.Add(Me.Button2) + Me.Panel2.Controls.Add(Me.Button1) + Me.Panel2.Controls.Add(Me.Label1) + Me.Panel2.Controls.Add(Me.btnIR) + Me.Panel2.Controls.Add(Me.btnTR) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(752, 42) + Me.Panel2.TabIndex = 3 + ' + 'Button4 + ' + Me.Button4.Cursor = System.Windows.Forms.Cursors.Hand + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.Button4.Location = New System.Drawing.Point(533, 3) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(156, 33) + Me.Button4.TabIndex = 9 + Me.Button4.Tag = "AZ" + Me.Button4.Text = "Armenien/Aserbaidschan" + Me.Button4.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.Cursor = System.Windows.Forms.Cursors.Hand + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.Button3.Location = New System.Drawing.Point(447, 3) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(80, 33) + Me.Button3.TabIndex = 8 + Me.Button3.Tag = "GE" + Me.Button3.Text = "Georgien" + Me.Button3.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.Cursor = System.Windows.Forms.Cursors.Hand + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.Button2.Location = New System.Drawing.Point(361, 3) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(80, 33) + Me.Button2.TabIndex = 7 + Me.Button2.Tag = "AM" + Me.Button2.Text = "Armenien" + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button1 + ' + Me.Button1.Cursor = System.Windows.Forms.Cursors.Hand + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.Button1.Location = New System.Drawing.Point(275, 3) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(80, 33) + Me.Button1.TabIndex = 6 + Me.Button1.Tag = "IQ" + Me.Button1.Text = "Irak" + Me.Button1.UseVisualStyleBackColor = True ' 'Label1 ' @@ -194,6 +271,19 @@ Partial Class frmRoutenauswahl Me.Label1.TabIndex = 2 Me.Label1.Text = "Bestimmungsland:" ' + 'btnIR + ' + Me.btnIR.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnIR.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnIR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnIR.Location = New System.Drawing.Point(189, 3) + Me.btnIR.Name = "btnIR" + Me.btnIR.Size = New System.Drawing.Size(80, 33) + Me.btnIR.TabIndex = 5 + Me.btnIR.Tag = "IR" + Me.btnIR.Text = "Iran" + Me.btnIR.UseVisualStyleBackColor = True + ' 'btnTR ' Me.btnTR.BackColor = System.Drawing.Color.DarkOrange @@ -202,23 +292,12 @@ Partial Class frmRoutenauswahl Me.btnTR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnTR.Location = New System.Drawing.Point(103, 3) Me.btnTR.Name = "btnTR" - Me.btnTR.Size = New System.Drawing.Size(106, 33) + Me.btnTR.Size = New System.Drawing.Size(80, 33) Me.btnTR.TabIndex = 5 + Me.btnTR.Tag = "TR" Me.btnTR.Text = "Türkei" Me.btnTR.UseVisualStyleBackColor = False ' - 'btnIR - ' - Me.btnIR.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnIR.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnIR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.btnIR.Location = New System.Drawing.Point(215, 3) - Me.btnIR.Name = "btnIR" - Me.btnIR.Size = New System.Drawing.Size(106, 33) - Me.btnIR.TabIndex = 5 - Me.btnIR.Text = "Iran" - Me.btnIR.UseVisualStyleBackColor = True - ' 'frmRoutenauswahl ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -232,12 +311,12 @@ Partial Class frmRoutenauswahl Me.Text = "Routenauswahl" Me.pnl.ResumeLayout(False) Me.FlowLayoutPanel.ResumeLayout(False) - Me.Panel1.ResumeLayout(False) - Me.Panel2.ResumeLayout(False) - Me.Panel2.PerformLayout() - CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() + Me.Panel1.ResumeLayout(False) + CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() Me.ResumeLayout(False) End Sub @@ -256,4 +335,9 @@ Partial Class frmRoutenauswahl Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents btnIR As System.Windows.Forms.Button Friend WithEvents btnTR As System.Windows.Forms.Button + Friend WithEvents Button3 As Button + Friend WithEvents Button2 As Button + Friend WithEvents Button1 As Button + Friend WithEvents btnBestimmungsland As Button + Friend WithEvents Button4 As Button End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.vb index b7c02baa..d3d5b7cc 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/frmRoutenauswahl.vb @@ -10,18 +10,32 @@ initRouteBG() End Sub - Sub initRouteBG() - If btnTMP Is btnRoute1 Then - pic.BackgroundImage = If(BESTIMMUNGSLAND = "TR", My.Resources.Route1, My.Resources.Route1_IR) - ElseIf btnTMP Is btnRoute2 Then - pic.BackgroundImage = If(BESTIMMUNGSLAND = "TR", My.Resources.Route2, My.Resources.Route2_IR) - ElseIf btnTMP Is btnRoute3 Then - pic.BackgroundImage = If(BESTIMMUNGSLAND = "TR", My.Resources.Route3, My.Resources.Route3_IR) - ElseIf btnTMP Is btnRoute4 Then - pic.BackgroundImage = If(BESTIMMUNGSLAND = "TR", My.Resources.Route4, My.Resources.Route4_IR) - ElseIf btnTMP Is btnRoute5 Then - pic.BackgroundImage = If(BESTIMMUNGSLAND = "TR", My.Resources.Route5, My.Resources.Route5_IR) + Sub initRouteBG(Optional BstText = "") + If BstText <> "" Then + btnBestimmungsland.Text = BstText + For Each btn In Panel2.Controls + If btn.GetType Is GetType(Button) Then + btn.BackColor = Color.White + End If + Next End If + + If btnTMP Is btnRoute1 Then + pic.BackgroundImage = If(BESTIMMUNGSLAND = "IR", My.Resources.Route1_IR, My.Resources.Route1) + ElseIf btnTMP Is btnRoute2 Then + pic.BackgroundImage = If(BESTIMMUNGSLAND = "IR", My.Resources.Route2_IR, My.Resources.Route2) + ElseIf btnTMP Is btnRoute3 Then + pic.BackgroundImage = If(BESTIMMUNGSLAND = "IR", My.Resources.Route3_IR, My.Resources.Route3) + ElseIf btnTMP Is btnRoute4 Then + pic.BackgroundImage = If(BESTIMMUNGSLAND = "IR", My.Resources.Route4_IR, My.Resources.Route4) + ElseIf btnTMP Is btnRoute5 Then + pic.BackgroundImage = If(BESTIMMUNGSLAND = "IR", My.Resources.Route5_IR, My.Resources.Route5) + End If + + Select Case BESTIMMUNGSLAND + Case "IQ", "AZ", "GE", "AM" : btnBestimmungsland.Visible = True + Case Else : btnBestimmungsland.Visible = False + End Select End Sub Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnRoute1.Click, btnRoute2.Click, btnRoute3.Click, btnRoute4.Click, btnRoute5.Click @@ -49,42 +63,77 @@ End If End If + + Dim ROUTEList As New List(Of String) + If sender Is btnRoute1 Then - ROUTE = {"DE", "AT", "SI", "HR", "RS", "BG", "TR", If(BESTIMMUNGSLAND = "IR", "IR", "")} + ROUTEList.Add("DE") + ROUTEList.Add("AT") + ROUTEList.Add("SI") + ROUTEList.Add("HR") + ROUTEList.Add("RS") + ROUTEList.Add("BG") + ROUTEList.Add("TR") ZOLLAEMTER = {"RS021091", "BG005804", DZATR, If(BESTIMMUNGSLAND = "IR", Dncts_IRAN, "")} ElseIf sender Is btnRoute2 Then - ROUTE = {"DE", "AT", "HU", "RS", "BG", "TR", If(BESTIMMUNGSLAND = "IR", "IR", "")} + ROUTEList.Add("DE") + ROUTEList.Add("AT") + ROUTEList.Add("HU") + ROUTEList.Add("RS") + ROUTEList.Add("BG") + ROUTEList.Add("TR") ZOLLAEMTER = {DZATR, If(BESTIMMUNGSLAND = "IR", Dncts_IRAN, "")} ElseIf sender Is btnRoute3 Then - ROUTE = {"DE", "AT", "IT", "TR", If(BESTIMMUNGSLAND = "IR", "IR", "")} + ROUTEList.Add("DE") + ROUTEList.Add("AT") + ROUTEList.Add("IT") + ROUTEList.Add("TR") ZOLLAEMTER = {"TR351000", If(BESTIMMUNGSLAND = "IR", Dncts_IRAN, "")} ElseIf sender Is btnRoute4 Then - ROUTE = {"DE", "AT", "IT", "TR", If(BESTIMMUNGSLAND = "IR", "IR", "")} + ROUTEList.Add("DE") + ROUTEList.Add("AT") + ROUTEList.Add("IT") + ROUTEList.Add("TR") ZOLLAEMTER = {"TR343400", If(BESTIMMUNGSLAND = "IR", Dncts_IRAN, "")} ElseIf sender Is btnRoute5 Then - ROUTE = {"DE", "AT", "HU", "RO", "BG", "TR", If(BESTIMMUNGSLAND = "IR", "IR", "")} + ROUTEList.Add("DE") + ROUTEList.Add("AT") + ROUTEList.Add("HU") + ROUTEList.Add("RO") + ROUTEList.Add("BG") + ROUTEList.Add("TR") ZOLLAEMTER = {DZATR, If(BESTIMMUNGSLAND = "IR", Dncts_IRAN, "")} End If + + + Select Case BESTIMMUNGSLAND + Case "IR" : ROUTEList.Add("IR") + Case "IQ" : ROUTEList.Add("IQ") + Case "AZ" + ROUTEList.Add("AM") + ROUTEList.Add("AZ") + Case "GE" : ROUTEList.Add("GE") + Case "AM" : ROUTEList.Add("AM") + End Select + + ROUTE = ROUTEList.ToArray + Me.DialogResult = Windows.Forms.DialogResult.OK Me.Close() End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnTR.Click - BESTIMMUNGSLAND = "TR" - btnIR.BackColor = Color.White - btnTR.BackColor = Color.DarkOrange - initRouteBG() - End Sub - Private Sub btnIR_Click(sender As Object, e As EventArgs) Handles btnIR.Click - BESTIMMUNGSLAND = "IR" - btnIR.BackColor = Color.DarkOrange - btnTR.BackColor = Color.White - initRouteBG() + + Private Sub btnIR_Click(sender As Object, e As EventArgs) Handles btnIR.Click, btnTR.Click, Button1.Click, Button2.Click, Button3.Click, Button4.Click + BESTIMMUNGSLAND = sender.tag + initRouteBG(sender.text) + sender.BackColor = Color.DarkOrange End Sub Private Sub frmRoutenauswahl_Load(sender As Object, e As EventArgs) Handles Me.Load btnTMP = btnRoute1 End Sub + + End Class \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb index 7a1038d4..19f3e37e 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb @@ -563,7 +563,6 @@ Public Class usrCntlATLAS_NCTS ncts_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB ncts_OUT.ncts_firma = Me.FIRMA_DY DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_003(ncts_OUT, Me, DY_ANM, Me.FIRMA_DY) - If Not ncts_OUT.SAVE_ALL() Then Exit Sub Dim saveFile = "" diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.Designer.vb index 2bff79c6..71e0da3b 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Position.Designer.vb @@ -26,6 +26,13 @@ Partial Class usrCntlATLAS_NCTS_Position Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlATLAS_NCTS_Position)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() + Me.Label13 = New System.Windows.Forms.Label() + Me.cboArtAnmeldung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.sbVersendungsLand = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.sbBestimmungsland = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label12 = New System.Windows.Forms.Label() Me.txtKdRefNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboWaehrung = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.txtSiBetragProzent = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -113,13 +120,6 @@ Partial Class usrCntlATLAS_NCTS_Position Me.Label5 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.lklBearbeitungAbbrechenPK = New System.Windows.Forms.LinkLabel() - Me.sbBestimmungsland = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.Label12 = New System.Windows.Forms.Label() - Me.sbVersendungsLand = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.Label10 = New System.Windows.Forms.Label() - Me.cboArtAnmeldung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label13 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.dgvVorpapier, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUnterlage, System.ComponentModel.ISupportInitialize).BeginInit() @@ -220,15 +220,113 @@ Partial Class usrCntlATLAS_NCTS_Position Me.pnl.Size = New System.Drawing.Size(730, 1100) Me.pnl.TabIndex = 0 ' + 'Label13 + ' + Me.Label13.Location = New System.Drawing.Point(370, 118) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(64, 13) + Me.Label13.TabIndex = 83 + Me.Label13.Text = "Warenfluss:" + Me.Label13.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'cboArtAnmeldung + ' + Me.cboArtAnmeldung._allowedValuesFreiText = Nothing + Me.cboArtAnmeldung._allowFreiText = False + Me.cboArtAnmeldung._value = "" + Me.cboArtAnmeldung.DropDownWidth = 300 + Me.cboArtAnmeldung.FormattingEnabled = True + Me.cboArtAnmeldung.Location = New System.Drawing.Point(136, 203) + Me.cboArtAnmeldung.Name = "cboArtAnmeldung" + Me.cboArtAnmeldung.Size = New System.Drawing.Size(233, 21) + Me.cboArtAnmeldung.TabIndex = 35 + ' + 'Label10 + ' + Me.Label10.Location = New System.Drawing.Point(19, 206) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(111, 13) + Me.Label10.TabIndex = 34 + Me.Label10.Text = "Art der Anmeldung:" + Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'sbVersendungsLand + ' + Me.sbVersendungsLand._allowFreitext = False + Me.sbVersendungsLand._AllowSetValue = False + Me.sbVersendungsLand._allowSpaceAsSplitter = False + Me.sbVersendungsLand._autoSizeGross = False + Me.sbVersendungsLand._hideIfListEmpty = True + Me.sbVersendungsLand._value = "" + Me.sbVersendungsLand.conn_art = "FMZOLL" + Me.sbVersendungsLand.dgvpos = "LEFT" + Me.sbVersendungsLand.DISPLAY_PARAM = Nothing + Me.sbVersendungsLand.INVISIBLE_COLUMNS = Nothing + Me.sbVersendungsLand.key_visible = False + Me.sbVersendungsLand.KEYPARAM = Nothing + Me.sbVersendungsLand.Location = New System.Drawing.Point(436, 115) + Me.sbVersendungsLand.Name = "sbVersendungsLand" + Me.sbVersendungsLand.searchActive = True + Me.sbVersendungsLand.Size = New System.Drawing.Size(117, 20) + Me.sbVersendungsLand.SQL_ORDER_BY = Nothing + Me.sbVersendungsLand.SQL_SELECT = Nothing + Me.sbVersendungsLand.SQL_WHERE = Nothing + Me.sbVersendungsLand.SQL_WhereParamList = Nothing + Me.sbVersendungsLand.TabIndex = 20 + Me.sbVersendungsLand.usrcntl = Nothing + ' + 'sbBestimmungsland + ' + Me.sbBestimmungsland._allowFreitext = False + Me.sbBestimmungsland._AllowSetValue = False + Me.sbBestimmungsland._allowSpaceAsSplitter = False + Me.sbBestimmungsland._autoSizeGross = False + Me.sbBestimmungsland._hideIfListEmpty = True + Me.sbBestimmungsland._value = "" + Me.sbBestimmungsland.conn_art = "FMZOLL" + Me.sbBestimmungsland.dgvpos = "RIGHT" + Me.sbBestimmungsland.DISPLAY_PARAM = Nothing + Me.sbBestimmungsland.INVISIBLE_COLUMNS = Nothing + Me.sbBestimmungsland.key_visible = False + Me.sbBestimmungsland.KEYPARAM = Nothing + Me.sbBestimmungsland.Location = New System.Drawing.Point(552, 115) + Me.sbBestimmungsland.Name = "sbBestimmungsland" + Me.sbBestimmungsland.searchActive = True + Me.sbBestimmungsland.Size = New System.Drawing.Size(117, 20) + Me.sbBestimmungsland.SQL_ORDER_BY = Nothing + Me.sbBestimmungsland.SQL_SELECT = Nothing + Me.sbBestimmungsland.SQL_WHERE = Nothing + Me.sbBestimmungsland.SQL_WhereParamList = Nothing + Me.sbBestimmungsland.TabIndex = 21 + Me.sbBestimmungsland.usrcntl = Nothing + ' + 'Label11 + ' + Me.Label11.Location = New System.Drawing.Point(551, 99) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(116, 13) + Me.Label11.TabIndex = 13 + Me.Label11.Text = "Bestimmungs-Land:" + ' + 'Label12 + ' + Me.Label12.Location = New System.Drawing.Point(433, 99) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(135, 13) + Me.Label12.TabIndex = 12 + Me.Label12.Text = "Versendungs-Land:" + ' 'txtKdRefNr ' Me.txtKdRefNr._DateTimeOnly = False Me.txtKdRefNr._numbersOnly = False Me.txtKdRefNr._numbersOnlyKommastellen = "" + Me.txtKdRefNr._numbersOnlyTrennzeichen = True Me.txtKdRefNr._Prozent = False Me.txtKdRefNr._ShortDateNew = False Me.txtKdRefNr._ShortDateOnly = False Me.txtKdRefNr._TimeOnly = False + Me.txtKdRefNr._TimeOnly_Seconds = False Me.txtKdRefNr._value = "-" Me.txtKdRefNr._Waehrung = False Me.txtKdRefNr._WaehrungZeichen = True @@ -274,10 +372,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtSiBetragProzent._DateTimeOnly = False Me.txtSiBetragProzent._numbersOnly = False Me.txtSiBetragProzent._numbersOnlyKommastellen = "" + Me.txtSiBetragProzent._numbersOnlyTrennzeichen = True Me.txtSiBetragProzent._Prozent = True Me.txtSiBetragProzent._ShortDateNew = False Me.txtSiBetragProzent._ShortDateOnly = False Me.txtSiBetragProzent._TimeOnly = False + Me.txtSiBetragProzent._TimeOnly_Seconds = False Me.txtSiBetragProzent._value = "0,25" Me.txtSiBetragProzent._Waehrung = False Me.txtSiBetragProzent._WaehrungZeichen = True @@ -405,10 +505,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.cbxVermerk._DateTimeOnly = False Me.cbxVermerk._numbersOnly = False Me.cbxVermerk._numbersOnlyKommastellen = "" + Me.cbxVermerk._numbersOnlyTrennzeichen = True Me.cbxVermerk._Prozent = False Me.cbxVermerk._ShortDateNew = False Me.cbxVermerk._ShortDateOnly = False Me.cbxVermerk._TimeOnly = False + Me.cbxVermerk._TimeOnly_Seconds = False Me.cbxVermerk._value = Nothing Me.cbxVermerk._Waehrung = False Me.cbxVermerk._WaehrungZeichen = True @@ -526,10 +628,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtVpReferenz._DateTimeOnly = False Me.txtVpReferenz._numbersOnly = False Me.txtVpReferenz._numbersOnlyKommastellen = "" + Me.txtVpReferenz._numbersOnlyTrennzeichen = True Me.txtVpReferenz._Prozent = False Me.txtVpReferenz._ShortDateNew = False Me.txtVpReferenz._ShortDateOnly = False Me.txtVpReferenz._TimeOnly = False + Me.txtVpReferenz._TimeOnly_Seconds = False Me.txtVpReferenz._value = Nothing Me.txtVpReferenz._Waehrung = False Me.txtVpReferenz._WaehrungZeichen = True @@ -572,10 +676,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtVpZusatz._DateTimeOnly = False Me.txtVpZusatz._numbersOnly = False Me.txtVpZusatz._numbersOnlyKommastellen = "" + Me.txtVpZusatz._numbersOnlyTrennzeichen = True Me.txtVpZusatz._Prozent = False Me.txtVpZusatz._ShortDateNew = False Me.txtVpZusatz._ShortDateOnly = False Me.txtVpZusatz._TimeOnly = False + Me.txtVpZusatz._TimeOnly_Seconds = False Me.txtVpZusatz._value = Nothing Me.txtVpZusatz._Waehrung = False Me.txtVpZusatz._WaehrungZeichen = True @@ -693,13 +799,15 @@ Partial Class usrCntlATLAS_NCTS_Position 'txtWarennummer ' Me.txtWarennummer._DateTimeOnly = False - Me.txtWarennummer._numbersOnly = False - Me.txtWarennummer._numbersOnlyKommastellen = "" + Me.txtWarennummer._numbersOnly = True + Me.txtWarennummer._numbersOnlyKommastellen = "0" + Me.txtWarennummer._numbersOnlyTrennzeichen = False Me.txtWarennummer._Prozent = False Me.txtWarennummer._ShortDateNew = False Me.txtWarennummer._ShortDateOnly = False Me.txtWarennummer._TimeOnly = False - Me.txtWarennummer._value = Nothing + Me.txtWarennummer._TimeOnly_Seconds = False + Me.txtWarennummer._value = "" Me.txtWarennummer._Waehrung = False Me.txtWarennummer._WaehrungZeichen = True Me.txtWarennummer.ForeColor = System.Drawing.Color.Black @@ -717,10 +825,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWTNat._DateTimeOnly = False Me.txtWTNat._numbersOnly = False Me.txtWTNat._numbersOnlyKommastellen = "" + Me.txtWTNat._numbersOnlyTrennzeichen = True Me.txtWTNat._Prozent = False Me.txtWTNat._ShortDateNew = False Me.txtWTNat._ShortDateOnly = False Me.txtWTNat._TimeOnly = False + Me.txtWTNat._TimeOnly_Seconds = False Me.txtWTNat._value = Nothing Me.txtWTNat._Waehrung = False Me.txtWTNat._WaehrungZeichen = True @@ -739,10 +849,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWTZ2._DateTimeOnly = False Me.txtWTZ2._numbersOnly = False Me.txtWTZ2._numbersOnlyKommastellen = "" + Me.txtWTZ2._numbersOnlyTrennzeichen = True Me.txtWTZ2._Prozent = False Me.txtWTZ2._ShortDateNew = False Me.txtWTZ2._ShortDateOnly = False Me.txtWTZ2._TimeOnly = False + Me.txtWTZ2._TimeOnly_Seconds = False Me.txtWTZ2._value = Nothing Me.txtWTZ2._Waehrung = False Me.txtWTZ2._WaehrungZeichen = True @@ -761,10 +873,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWTZ1._DateTimeOnly = False Me.txtWTZ1._numbersOnly = False Me.txtWTZ1._numbersOnlyKommastellen = "" + Me.txtWTZ1._numbersOnlyTrennzeichen = True Me.txtWTZ1._Prozent = False Me.txtWTZ1._ShortDateNew = False Me.txtWTZ1._ShortDateOnly = False Me.txtWTZ1._TimeOnly = False + Me.txtWTZ1._TimeOnly_Seconds = False Me.txtWTZ1._value = Nothing Me.txtWTZ1._Waehrung = False Me.txtWTZ1._WaehrungZeichen = True @@ -783,10 +897,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWTTaric._DateTimeOnly = False Me.txtWTTaric._numbersOnly = False Me.txtWTTaric._numbersOnlyKommastellen = "" + Me.txtWTTaric._numbersOnlyTrennzeichen = True Me.txtWTTaric._Prozent = False Me.txtWTTaric._ShortDateNew = False Me.txtWTTaric._ShortDateOnly = False Me.txtWTTaric._TimeOnly = False + Me.txtWTTaric._TimeOnly_Seconds = False Me.txtWTTaric._value = Nothing Me.txtWTTaric._Waehrung = False Me.txtWTTaric._WaehrungZeichen = True @@ -857,10 +973,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtEigenmasse._DateTimeOnly = False Me.txtEigenmasse._numbersOnly = True Me.txtEigenmasse._numbersOnlyKommastellen = "2" + Me.txtEigenmasse._numbersOnlyTrennzeichen = True Me.txtEigenmasse._Prozent = False Me.txtEigenmasse._ShortDateNew = False Me.txtEigenmasse._ShortDateOnly = False Me.txtEigenmasse._TimeOnly = False + Me.txtEigenmasse._TimeOnly_Seconds = False Me.txtEigenmasse._value = "0" Me.txtEigenmasse._Waehrung = False Me.txtEigenmasse._WaehrungZeichen = True @@ -880,10 +998,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtRohmasse._DateTimeOnly = False Me.txtRohmasse._numbersOnly = True Me.txtRohmasse._numbersOnlyKommastellen = "2" + Me.txtRohmasse._numbersOnlyTrennzeichen = True Me.txtRohmasse._Prozent = False Me.txtRohmasse._ShortDateNew = False Me.txtRohmasse._ShortDateOnly = False Me.txtRohmasse._TimeOnly = False + Me.txtRohmasse._TimeOnly_Seconds = False Me.txtRohmasse._value = "0" Me.txtRohmasse._Waehrung = False Me.txtRohmasse._WaehrungZeichen = True @@ -1019,10 +1139,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtUlZusatz._DateTimeOnly = False Me.txtUlZusatz._numbersOnly = False Me.txtUlZusatz._numbersOnlyKommastellen = "" + Me.txtUlZusatz._numbersOnlyTrennzeichen = True Me.txtUlZusatz._Prozent = False Me.txtUlZusatz._ShortDateNew = False Me.txtUlZusatz._ShortDateOnly = False Me.txtUlZusatz._TimeOnly = False + Me.txtUlZusatz._TimeOnly_Seconds = False Me.txtUlZusatz._value = Nothing Me.txtUlZusatz._Waehrung = False Me.txtUlZusatz._WaehrungZeichen = True @@ -1041,10 +1163,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtUlReferenz._DateTimeOnly = False Me.txtUlReferenz._numbersOnly = False Me.txtUlReferenz._numbersOnlyKommastellen = "" + Me.txtUlReferenz._numbersOnlyTrennzeichen = True Me.txtUlReferenz._Prozent = False Me.txtUlReferenz._ShortDateNew = False Me.txtUlReferenz._ShortDateOnly = False Me.txtUlReferenz._TimeOnly = False + Me.txtUlReferenz._TimeOnly_Seconds = False Me.txtUlReferenz._value = Nothing Me.txtUlReferenz._Waehrung = False Me.txtUlReferenz._WaehrungZeichen = True @@ -1075,10 +1199,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtPkMarke._DateTimeOnly = False Me.txtPkMarke._numbersOnly = False Me.txtPkMarke._numbersOnlyKommastellen = "" + Me.txtPkMarke._numbersOnlyTrennzeichen = True Me.txtPkMarke._Prozent = False Me.txtPkMarke._ShortDateNew = False Me.txtPkMarke._ShortDateOnly = False Me.txtPkMarke._TimeOnly = False + Me.txtPkMarke._TimeOnly_Seconds = False Me.txtPkMarke._value = "ohne" Me.txtPkMarke._Waehrung = False Me.txtPkMarke._WaehrungZeichen = True @@ -1098,10 +1224,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtPkAnzahl._DateTimeOnly = False Me.txtPkAnzahl._numbersOnly = True Me.txtPkAnzahl._numbersOnlyKommastellen = "" + Me.txtPkAnzahl._numbersOnlyTrennzeichen = True Me.txtPkAnzahl._Prozent = False Me.txtPkAnzahl._ShortDateNew = False Me.txtPkAnzahl._ShortDateOnly = False Me.txtPkAnzahl._TimeOnly = False + Me.txtPkAnzahl._TimeOnly_Seconds = False Me.txtPkAnzahl._value = "" Me.txtPkAnzahl._Waehrung = False Me.txtPkAnzahl._WaehrungZeichen = True @@ -1284,10 +1412,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWarenwert._DateTimeOnly = False Me.txtWarenwert._numbersOnly = True Me.txtWarenwert._numbersOnlyKommastellen = "2" + Me.txtWarenwert._numbersOnlyTrennzeichen = True Me.txtWarenwert._Prozent = False Me.txtWarenwert._ShortDateNew = False Me.txtWarenwert._ShortDateOnly = False Me.txtWarenwert._TimeOnly = False + Me.txtWarenwert._TimeOnly_Seconds = False Me.txtWarenwert._value = "" Me.txtWarenwert._Waehrung = False Me.txtWarenwert._WaehrungZeichen = True @@ -1315,10 +1445,12 @@ Partial Class usrCntlATLAS_NCTS_Position Me.txtWarenbezeichnung._DateTimeOnly = False Me.txtWarenbezeichnung._numbersOnly = False Me.txtWarenbezeichnung._numbersOnlyKommastellen = "" + Me.txtWarenbezeichnung._numbersOnlyTrennzeichen = True Me.txtWarenbezeichnung._Prozent = False Me.txtWarenbezeichnung._ShortDateNew = False Me.txtWarenbezeichnung._ShortDateOnly = False Me.txtWarenbezeichnung._TimeOnly = False + Me.txtWarenbezeichnung._TimeOnly_Seconds = False Me.txtWarenbezeichnung._value = Nothing Me.txtWarenbezeichnung._Waehrung = False Me.txtWarenbezeichnung._WaehrungZeichen = True @@ -1414,102 +1546,6 @@ Partial Class usrCntlATLAS_NCTS_Position Me.lklBearbeitungAbbrechenPK.Text = "Bearbeitung abbrechen" Me.lklBearbeitungAbbrechenPK.Visible = False ' - 'sbBestimmungsland - ' - Me.sbBestimmungsland._allowFreitext = False - Me.sbBestimmungsland._AllowSetValue = False - Me.sbBestimmungsland._allowSpaceAsSplitter = False - Me.sbBestimmungsland._autoSizeGross = False - Me.sbBestimmungsland._hideIfListEmpty = True - Me.sbBestimmungsland._value = "" - Me.sbBestimmungsland.conn_art = "FMZOLL" - Me.sbBestimmungsland.dgvpos = "RIGHT" - Me.sbBestimmungsland.DISPLAY_PARAM = Nothing - Me.sbBestimmungsland.INVISIBLE_COLUMNS = Nothing - Me.sbBestimmungsland.key_visible = False - Me.sbBestimmungsland.KEYPARAM = Nothing - Me.sbBestimmungsland.Location = New System.Drawing.Point(552, 115) - Me.sbBestimmungsland.Name = "sbBestimmungsland" - Me.sbBestimmungsland.searchActive = True - Me.sbBestimmungsland.Size = New System.Drawing.Size(117, 20) - Me.sbBestimmungsland.SQL_ORDER_BY = Nothing - Me.sbBestimmungsland.SQL_SELECT = Nothing - Me.sbBestimmungsland.SQL_WHERE = Nothing - Me.sbBestimmungsland.SQL_WhereParamList = Nothing - Me.sbBestimmungsland.TabIndex = 21 - Me.sbBestimmungsland.usrcntl = Nothing - ' - 'Label11 - ' - Me.Label11.Location = New System.Drawing.Point(551, 99) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(116, 13) - Me.Label11.TabIndex = 13 - Me.Label11.Text = "Bestimmungs-Land:" - ' - 'Label12 - ' - Me.Label12.Location = New System.Drawing.Point(433, 99) - Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(135, 13) - Me.Label12.TabIndex = 12 - Me.Label12.Text = "Versendungs-Land:" - ' - 'sbVersendungsLand - ' - Me.sbVersendungsLand._allowFreitext = False - Me.sbVersendungsLand._AllowSetValue = False - Me.sbVersendungsLand._allowSpaceAsSplitter = False - Me.sbVersendungsLand._autoSizeGross = False - Me.sbVersendungsLand._hideIfListEmpty = True - Me.sbVersendungsLand._value = "" - Me.sbVersendungsLand.conn_art = "FMZOLL" - Me.sbVersendungsLand.dgvpos = "LEFT" - Me.sbVersendungsLand.DISPLAY_PARAM = Nothing - Me.sbVersendungsLand.INVISIBLE_COLUMNS = Nothing - Me.sbVersendungsLand.key_visible = False - Me.sbVersendungsLand.KEYPARAM = Nothing - Me.sbVersendungsLand.Location = New System.Drawing.Point(436, 115) - Me.sbVersendungsLand.Name = "sbVersendungsLand" - Me.sbVersendungsLand.searchActive = True - Me.sbVersendungsLand.Size = New System.Drawing.Size(117, 20) - Me.sbVersendungsLand.SQL_ORDER_BY = Nothing - Me.sbVersendungsLand.SQL_SELECT = Nothing - Me.sbVersendungsLand.SQL_WHERE = Nothing - Me.sbVersendungsLand.SQL_WhereParamList = Nothing - Me.sbVersendungsLand.TabIndex = 20 - Me.sbVersendungsLand.usrcntl = Nothing - ' - 'Label10 - ' - Me.Label10.Location = New System.Drawing.Point(19, 206) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(111, 13) - Me.Label10.TabIndex = 34 - Me.Label10.Text = "Art der Anmeldung:" - Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'cboArtAnmeldung - ' - Me.cboArtAnmeldung._allowedValuesFreiText = Nothing - Me.cboArtAnmeldung._allowFreiText = False - Me.cboArtAnmeldung._value = "" - Me.cboArtAnmeldung.DropDownWidth = 300 - Me.cboArtAnmeldung.FormattingEnabled = True - Me.cboArtAnmeldung.Location = New System.Drawing.Point(136, 203) - Me.cboArtAnmeldung.Name = "cboArtAnmeldung" - Me.cboArtAnmeldung.Size = New System.Drawing.Size(233, 21) - Me.cboArtAnmeldung.TabIndex = 35 - ' - 'Label13 - ' - Me.Label13.Location = New System.Drawing.Point(370, 118) - Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(64, 13) - Me.Label13.TabIndex = 83 - Me.Label13.Text = "Warenfluss:" - Me.Label13.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'usrCntlATLAS_NCTS_Position ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Positionen.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Positionen.vb index ad85498e..f24637e8 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Positionen.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Positionen.vb @@ -320,7 +320,7 @@ 'POSITION.nctsWP_Id As Integer ' POSITION.nctsWP_NctsId = NCTS.ncts_Id POSITION.nctsWP_PositionsNummer = cnt - POSITION.nctsWP_Warennummer = cProgramFunctions.isLeerNothingDbl(P.txtWarennummer.Text) + POSITION.nctsWP_Warennummer = cProgramFunctions.isLeerNothing(P.txtWarennummer.Text) POSITION.nctsWP_ArtAnmeldungPositionCode = cProgramFunctions.isLeerNothing(P.cboArtAnmeldung._value) POSITION.nctsWP_Warenbezeichnung = P.txtWarenbezeichnung.Text POSITION.nctsWP_Warenwert = cProgramFunctions.isLeerNothingDbl(P.txtWarenwert._value) @@ -489,7 +489,7 @@ 'POSITION.nctsWP_Id As Integer ' POSITION.nctsWP_NctsId = NCTS.ncts_Id POSITION.nctsWP_PositionsNummer = cnt - POSITION.nctsWP_Warennummer = cProgramFunctions.isLeerNothingDbl(P.txtWarennummer.Text) + POSITION.nctsWP_Warennummer = cProgramFunctions.isLeerNothing(P.txtWarennummer.Text) POSITION.nctsWP_ArtAnmeldungPositionCode = cProgramFunctions.isLeerNothing(P.cboArtAnmeldung._value) POSITION.nctsWP_Warenbezeichnung = P.txtWarenbezeichnung.Text POSITION.nctsWP_Warenwert = cProgramFunctions.isLeerNothingDbl(P.txtWarenwert._value) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index a0b017da..d8b2fcb2 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -72,7 +72,7 @@ Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") And FilialenNr = 5501 Then + If (VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") And FilialenNr = 5501 Then FIRMA_DY = "IMEX" ElseIf FilialenNr = 5701 Then FIRMA_DY = "AMBAR" @@ -81,7 +81,7 @@ ElseIf FilialenNr = 4801 Then FIRMA_DY = "ATILLA" Else - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then If DY Is Nothing Then ' ' FIRMA_DY = DY. diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index aaedef1f..05efc8ba 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -26,7 +26,9 @@ Public Class frmBU_Mahnlauf 'Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum - Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */ isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email,count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum + Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */ + isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, + count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum " & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto 0) End Function + Public Function isMahnlauf_Betrag(KdNr As Integer, Firma_ID As Integer) As Boolean + Dim sqlStr = "SELECT sum(dec_fremdbrutto+dec_fremdzahlung) + FROM op_debitor OP + WHERE (OP.i_firm_refid = '" & Firma_ID & "') AND (dt_geloescht IS NULL) + and OP.i_personenkonto='" & KdNr & "'" + + Return (SQL.getValueTxtBySql(sqlStr, "FIBU",,, 0) > 0) + 'Wenn <0, dann Guthaben!! + End Function + Public Function increaseMahnstufe(KdNr As Integer, Firma_ID As Integer) As Boolean Dim sqlStr = "UPDATE op_debitor SET si_mahnstufe=(isnull(si_mahnstufe,0)+1),d_mahnung=GETDATE() @@ -348,7 +360,7 @@ Public Class frmBU_Mahnlauf rpt.txtLeistung.Text = cFakturierung.checkNull(rpt.Fields.Item("OP_Typ").Value) rpt.Label15.Text = cFakturierung.checkNull(rpt.Fields.Item("Rechnungsdatum").Value) - If CDate(rpt.Fields.Item("Faelligkeit").Value) >= CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0 Then + If (CDate(rpt.Fields.Item("Faelligkeit").Value) >= CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then rpt.Label16.Text = "" Else rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value) @@ -450,6 +462,8 @@ Public Class frmBU_Mahnlauf Dim Mail_HTMLBody = "" Dim Mail_To = "" + Dim Mail_CC = "" + Dim Mail_BCC = "" Select Case AD.LandKz Case "TR" @@ -480,6 +494,12 @@ Public Class frmBU_Mahnlauf End Select Mail_HTMLBody = "
" & Mail_HTMLBody & "
" Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") + Mail_cc = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") + Mail_bcc = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") + + ' isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, + 'isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, + If Mail_To = "" Then Mahndruckart = 2 ' Wenn keine Mahn-Mail hinterlegt, sollte die Mail geöffenet werden @@ -487,9 +507,9 @@ Public Class frmBU_Mahnlauf Case 5 'MAIL_SEND Dim list As New List(Of String) list.Add(tmpPath) - Dim bcc = "buchhaltung@verag.ag" - 'Mail_To = bcc - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_Subject, Mail_HTMLBody, "buchhaltung@verag.ag", False, False, , bcc, list) + Mail_BCC = "buchhaltung@verag.ag;" & Mail_BCC + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_Subject, Mail_HTMLBody, "buchhaltung@verag.ag", False, False, Mail_CC, Mail_BCC, list) Case Else @@ -500,6 +520,8 @@ Public Class frmBU_Mahnlauf Mail.HTMLBody = Mail_HTMLBody Mail.To = Mail_To + Mail.CC = Mail_CC + Mail.BCC = Mail_BCC Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Mahnung.pdf") 'Mail.Sender = "bewerbung@verag.ag" @@ -828,7 +850,7 @@ Public Class frmBU_Mahnlauf Dim Konto = r.Cells("Konto").Value Dim FirmaId = cboFirma._value - If isFaelligAndMahnlauf(Konto, FirmaId) Then + If isFaelligAndMahnlauf(Konto, FirmaId) And isMahnlauf_Betrag(Konto, FirmaId) Then Dim Path = "" Select Case AUSGABE Case "PDF" diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index dab7bfcf..a03f55aa 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -2,7 +2,7 @@ Imports System.Text Public Class usrCntlBH - Dim GrenzeVersicherung = 40000 + Dim GrenzeVersicherung = 50000 Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim culture As CultureInfo = New CultureInfo("de-DE") Private Sub btnWord_Click(sender As Object, e As EventArgs) Handles btnWord.Click diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 9eb6ea90..593def0f 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -510,20 +510,26 @@ Public Class cProgramFunctions End If - 'Standard-Drucker: - Dim srchPrinter = "" + 'Standard-Drucker as AVISO_OPTIONS: If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then - srchPrinter = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD - Else - Dim oPS As New System.Drawing.Printing.PrinterSettings - srchPrinter = oPS.PrinterName + For Each i In cboPrinter.Items + If i.ToString.ToUpper.Contains(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD.ToUpper) Then ' If i.ToString = srchPrinter Then ' Contains, weil sonst \\dc02\ stört + cboPrinter.SelectedItem = i + Exit Sub + End If + Next End If + + 'Standard-Drucker: + Dim oPS As New System.Drawing.Printing.PrinterSettings For Each i In cboPrinter.Items - If i.ToString.ToUpper.Contains(srchPrinter.ToUpper) Then ' If i.ToString = srchPrinter Then ' Contains, weil sonst \\dc02\ stört + If i.ToString.ToUpper.Contains(oPS.PrinterName.ToUpper) Then ' If i.ToString = srchPrinter Then ' Contains, weil sonst \\dc02\ stört cboPrinter.SelectedItem = i Exit Sub End If Next + + End If End Sub diff --git a/SDL/kunden/frmKundenUebersichtZOLL.vb b/SDL/kunden/frmKundenUebersichtZOLL.vb index 3cf04790..447bc660 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.vb @@ -56,6 +56,7 @@ Public Class frmKundenUebersichtZOLL 'line under InitializeComponent(), and it will work; InitializeComponent() MenuStripSDL.Renderer = New MyRenderer() + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try @@ -67,8 +68,9 @@ Public Class frmKundenUebersichtZOLL InitializeComponent() Me.kdNr = KdNr MenuStripSDL.Renderer = New MyRenderer() - Catch ex As Exception + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) End Try End Sub @@ -104,6 +106,7 @@ Public Class frmKundenUebersichtZOLL timerOP.Interval = 500 timerOP.Enabled = False + System.Console.WriteLine("QQQQQQQ2") lblTESTSystem.Visible = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM 'If Not VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "COBAN" Then @@ -165,11 +168,11 @@ Public Class frmKundenUebersichtZOLL - ' BERECHTIGUNEN = cBerechtignungenFunctions.loadBerechtigungen(USRID) - AddHandler KdSearchBox1.PropertyChanged, Sub() + ' BERECHTIGUNEN = cBerechtignungenFunctions.loadBerechtigungen(USRID) + AddHandler KdSearchBox1.PropertyChanged, Sub() Try - setKD(KdSearchBox1.KdNr_value) - Catch ex As Exception + setKD(KdSearchBox1.KdNr_value) + Catch ex As Exception MsgBox(ex.Message & vbNewLine & ex.StackTrace) End Try End Sub diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index fc14cc06..aca129a8 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1266,7 +1266,16 @@ Public Class usrCntlKundenuebersicht - If sumGes <> 0 Then txtOffenePosten.Text = sumGes.ToString("C") Else txtOffenePosten.Text = "" + If sumGes <> 0 Then + txtOffenePosten.Text = sumGes.ToString("C") + If sumGes < 0 Then + txtOffenePosten.ForeColor = Color.Green + Else + txtOffenePosten.ForeColor = Color.Red + End If + Else + txtOffenePosten.Text = "" + End If 'If sumGes > 0 Then ' txtOffenePosten.Text = sumGes.ToString("C") 'Else @@ -1353,10 +1362,15 @@ Public Class usrCntlKundenuebersicht ' If .RowCount > 0 Then - If OP_tmp > 0 Then + If OP_tmp <> 0 Then ' txtOffenePosten.Text = String.Format("{0:n}", .Rows(0).Cells("KumSaldoEUR").Value) 'txtOffenePosten.Text = String.Format("{0:n}", OP_tmp) txtOffenePosten.Text = OP_tmp.ToString("C") + If OP_tmp < 0 Then + txtOffenePosten.ForeColor = Color.Green + Else + txtOffenePosten.ForeColor = Color.Red + End If Else txtOffenePosten.Text = "" End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 795b8832..a791154e 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -22,16 +22,16 @@ Partial Class usrcntlKundeBearbeitenFull 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.lblHinweisKdNr = New System.Windows.Forms.Label() @@ -316,6 +316,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label97 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() Me.CheckBox1 = New System.Windows.Forms.CheckBox() + Me.Button13 = New System.Windows.Forms.Button() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -2485,8 +2486,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -2584,8 +2585,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -2743,41 +2744,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" Me.dgvKreditkarten.ReadOnly = True - DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -2916,8 +2917,8 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) @@ -3153,8 +3154,8 @@ Partial Class usrcntlKundeBearbeitenFull 'dgvSonst_IDSKunden ' Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251) @@ -3357,8 +3358,8 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Enabled = False @@ -3428,7 +3429,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label84.AutoSize = True Me.Label84.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label84.Location = New System.Drawing.Point(276, 104) + Me.Label84.Location = New System.Drawing.Point(259, 104) Me.Label84.Name = "Label84" Me.Label84.Size = New System.Drawing.Size(66, 13) Me.Label84.TabIndex = 8 @@ -3486,7 +3487,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_UstIdNrGeprueftAm._Waehrung = False Me.txtUSt_UstIdNrGeprueftAm._WaehrungZeichen = True Me.txtUSt_UstIdNrGeprueftAm.ForeColor = System.Drawing.Color.Red - Me.txtUSt_UstIdNrGeprueftAm.Location = New System.Drawing.Point(345, 101) + Me.txtUSt_UstIdNrGeprueftAm.Location = New System.Drawing.Point(324, 101) Me.txtUSt_UstIdNrGeprueftAm.MaxLength = 10 Me.txtUSt_UstIdNrGeprueftAm.MaxLineLength = -1 Me.txtUSt_UstIdNrGeprueftAm.MaxLines_Warning = "" @@ -3516,18 +3517,18 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_UstIdNr.MaxLines_Warning = "" Me.txtUSt_UstIdNr.MaxLines_Warning_Label = Nothing Me.txtUSt_UstIdNr.Name = "txtUSt_UstIdNr" - Me.txtUSt_UstIdNr.Size = New System.Drawing.Size(120, 20) + Me.txtUSt_UstIdNr.Size = New System.Drawing.Size(108, 20) Me.txtUSt_UstIdNr.TabIndex = 7 Me.txtUSt_UstIdNr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'GroupBox3 ' + Me.GroupBox3.Controls.Add(Me.Button13) Me.GroupBox3.Controls.Add(Me.btnUIDPruef) Me.GroupBox3.Controls.Add(Me.txtEORINL) Me.GroupBox3.Controls.Add(Me.Label5) Me.GroupBox3.Controls.Add(Me.txtEORI) Me.GroupBox3.Controls.Add(Me.Label33) - Me.GroupBox3.Controls.Add(Me.Label84) Me.GroupBox3.Controls.Add(Me.txtFirmenname1) Me.GroupBox3.Controls.Add(Me.cboUSt_UstIdNrLand) Me.GroupBox3.Controls.Add(Me.Label15) @@ -3538,6 +3539,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox3.Controls.Add(Me.txtFirmenname2) Me.GroupBox3.Controls.Add(Me.Label16) Me.GroupBox3.Controls.Add(Me.txtUSt_Steuernummer) + Me.GroupBox3.Controls.Add(Me.Label84) Me.GroupBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox3.Location = New System.Drawing.Point(3, 3) Me.GroupBox3.Name = "GroupBox3" @@ -3552,7 +3554,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.btnUIDPruef.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnUIDPruef.FlatAppearance.BorderSize = 0 Me.btnUIDPruef.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUIDPruef.Location = New System.Drawing.Point(419, 101) + Me.btnUIDPruef.Location = New System.Drawing.Point(397, 101) Me.btnUIDPruef.Name = "btnUIDPruef" Me.btnUIDPruef.Size = New System.Drawing.Size(25, 20) Me.btnUIDPruef.TabIndex = 15 @@ -4256,6 +4258,18 @@ Partial Class usrcntlKundeBearbeitenFull Me.CheckBox1.UseVisualStyleBackColor = True Me.CheckBox1.Visible = False ' + 'Button13 + ' + Me.Button13.BackgroundImage = Global.SDL.My.Resources.Resources.list + Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button13.FlatAppearance.BorderSize = 0 + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.Location = New System.Drawing.Point(419, 101) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(25, 20) + Me.Button13.TabIndex = 16 + Me.Button13.UseVisualStyleBackColor = True + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4626,4 +4640,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents Button4 As Button Friend WithEvents CheckBox1 As CheckBox Friend WithEvents btnUIDPruef As Button + Friend WithEvents Button13 As Button End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index fb7f4d49..c8318f4f 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -105,6 +105,9 @@ Public Class usrcntlKundeBearbeitenFull If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AWOR", "SDL") Then cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4000000-4099999: AWOR", "4001000-4099999")) End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2800000-2899999: UNISPED BREXIT", "2800000-2899999")) + End If If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "AMBAR" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AMBAR", "SDL") Then cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) @@ -1180,7 +1183,9 @@ Public Class usrcntlKundeBearbeitenFull Select Case cboKundenkreis._value Case "1080000-1099990" : cbxFiBu.Checked = True : cboFirma.changeItem("20") : cboFiliale.changeItem("5501") Case "2000000-2099990" : cbxFiBu.Checked = True : cboFirma.changeItem("21") : cboFiliale.changeItem("5601") + Case "2800000-2899999" : cbxFiBu.Checked = True : cboFirma.changeItem("26") : cboFiliale.changeItem("7003") Case "3000000-3099990" : cbxFiBu.Checked = True : cboFirma.changeItem("24") : cboFiliale.changeItem("5701") + Case "4001000-4099999" : cbxFiBu.Checked = True : cboFirma.changeItem("26") : cboFiliale.changeItem("7002") Case "728000-799999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") Case "30000-49999" : cbxFiBu.Checked = True : cboFirma.changeItem("11") : cboFiliale.changeItem("4803") Case "500000-599999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") @@ -1333,7 +1338,7 @@ Public Class usrcntlKundeBearbeitenFull cboKundenkreis.changeItem("4001000-4099999") End If If cboFiliale._value = 7003 Then - cboKundenkreis.changeItem("2000000-2099999") + cboKundenkreis.changeItem("2800000-2899999") End If End Sub @@ -1388,4 +1393,33 @@ Public Class usrcntlKundeBearbeitenFull ' sender.BackgroundImage = My.Resources.fragezeichen 'End If End Sub + + Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click + genUIDEORIList(KUNDE.KundenNr, "UID") + + End Sub + + Sub genUIDEORIList(kdNr, typeListe) + If kdNr <= 0 Then Exit Sub + Dim frmList As New frmKundenUIDEORI_List + Select Case typeListe + Case "UID" + Dim dt = sql.loadDgvBySql("SELECT [uid_id],[uid_KundenNr] KundenNr,[uid_UstIdKz]UstIdKz,[uid_UstIdNr]UstIdNr,[uid_Datum]Datum,[uid_valid]Gültig,[uid_Sachbearbeiter]Sachbearbeiter,[uid_stufe]Stufe FROM [tblUIDPruefung]where uid_KundenNr='" & kdNr & "' ORDER BY uid_Datum desc", "FMZOLL") + If dt IsNot Nothing Then + frmList.dgv.DataSource = dt + frmList.dgv.Columns("uid_id").Visible = False + AddHandler frmList.dgv.CellDoubleClick, Sub() + Dim PdfTmp = SDL.FormularManagerNEU.UID_PRUEFUNG_PROTOKOLL(frmList.dgv.SelectedRows(0).Cells("uid_id").Value) + If PdfTmp <> "" Then + Process.Start(PdfTmp) + + End If + End Sub + frmList.Show(Me) + End If + Case "EORI" + End Select + + + End Sub End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 98a1f443..ba763fce 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmMDMDatenverarbetiung Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.lblProzPruef = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() Me.Panel1.SuspendLayout() @@ -170,12 +171,13 @@ Partial Class frmMDMDatenverarbetiung Me.lbl.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold) Me.lbl.Location = New System.Drawing.Point(13, 13) Me.lbl.Name = "lbl" - Me.lbl.Size = New System.Drawing.Size(183, 17) + Me.lbl.Size = New System.Drawing.Size(246, 25) Me.lbl.TabIndex = 0 Me.lbl.Text = "MDM Datenverarbeitung" ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.lblProzPruef) Me.Panel1.Controls.Add(Me.PictureBox1) Me.Panel1.Controls.Add(Me.pic) Me.Panel1.Controls.Add(Me.Panel3) @@ -289,6 +291,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeBrutto._DateTimeOnly = False Me.txtPruefsummeBrutto._numbersOnly = False Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" + Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True Me.txtPruefsummeBrutto._Prozent = False Me.txtPruefsummeBrutto._ShortDateNew = False Me.txtPruefsummeBrutto._ShortDateOnly = False @@ -313,7 +316,7 @@ Partial Class frmMDMDatenverarbetiung Me.cbx.AutoSize = True Me.cbx.Location = New System.Drawing.Point(13, 73) Me.cbx.Name = "cbx" - Me.cbx.Size = New System.Drawing.Size(103, 17) + Me.cbx.Size = New System.Drawing.Size(110, 21) Me.cbx.TabIndex = 42 Me.cbx.Text = "Prüfergebnis OK" Me.cbx.UseVisualStyleBackColor = True @@ -409,6 +412,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeNetto._DateTimeOnly = False Me.txtPruefsummeNetto._numbersOnly = False Me.txtPruefsummeNetto._numbersOnlyKommastellen = "" + Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True Me.txtPruefsummeNetto._Prozent = False Me.txtPruefsummeNetto._ShortDateNew = False Me.txtPruefsummeNetto._ShortDateOnly = False @@ -443,6 +447,7 @@ Partial Class frmMDMDatenverarbetiung Me.txtAnzahl._DateTimeOnly = False Me.txtAnzahl._numbersOnly = False Me.txtAnzahl._numbersOnlyKommastellen = "" + Me.txtAnzahl._numbersOnlyTrennzeichen = True Me.txtAnzahl._Prozent = False Me.txtAnzahl._ShortDateNew = False Me.txtAnzahl._ShortDateOnly = False @@ -494,10 +499,20 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.Location = New System.Drawing.Point(0, 100) Me.MyDatagridview1.Name = "MyDatagridview1" Me.MyDatagridview1.ReadOnly = True + Me.MyDatagridview1.RowHeadersWidth = 62 Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577) Me.MyDatagridview1.TabIndex = 0 ' + 'lblProzPruef + ' + Me.lblProzPruef.Location = New System.Drawing.Point(63, 92) + Me.lblProzPruef.Name = "lblProzPruef" + Me.lblProzPruef.Size = New System.Drawing.Size(69, 13) + Me.lblProzPruef.TabIndex = 41 + Me.lblProzPruef.Text = "0%" + Me.lblProzPruef.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -510,7 +525,7 @@ Partial Class frmMDMDatenverarbetiung Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmMDMDatenverarbetiung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Datenverarbetiung" + Me.Text = "Datenverarbeitung" Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.FlowLayoutPanel.ResumeLayout(False) @@ -562,4 +577,5 @@ Partial Class frmMDMDatenverarbetiung Friend WithEvents PictureBox1 As PictureBox Friend WithEvents pic As PictureBox Friend WithEvents Button6 As Button + Friend WithEvents lblProzPruef As Label End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 479ae9fc..84e28d87 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -179,10 +179,11 @@ Public Class frmMDMDatenverarbetiung FROM tblPLOSE_Details WHERE 1 = 1 And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' - AND plose_Fakturiert=0 + AND plose_Fakturiert=1 group by plose_POLSEKundennummer,plose_ProduktCode order by plose_POLSEKundennummer,plose_ProduktCode", "FMZOLL") .LOAD() + 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT If .Columns.Count > 0 Then .Columns("plose_POLSEKundennummer").HeaderText = "PLOSE KdNr" @@ -846,6 +847,10 @@ Public Class frmMDMDatenverarbetiung allPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) + 'Rückvergütung Consortio !! + If r("plp_LeistungsNr") = "190" Then '(PRODUCTCODE=301; VERAG-LEISTUNGSNR=190!! + rabattPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) + End If Next @@ -890,8 +895,6 @@ Public Class frmMDMDatenverarbetiung End Function - - Function allPlosePos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double) Try @@ -937,6 +940,37 @@ Public Class frmMDMDatenverarbetiung End Try Return False End Function + Function rabattPlosePos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double) + Try + Dim POS As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen() + Dim LEISTUNG As New VERAG_PROG_ALLGEMEIN.cLeistungen(LeistungsNr) + POS.LeistungsNr = LEISTUNG.LeistungsNr + POS.LeistungsBez = "Rabatt " & LEISTUNG.LeistungsBez + + POS.BerechnungsartNr = LEISTUNG.BerechnungsartNr + 'POS.Preis = BruttoBetrag + POS.Anzahl = 1 + POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig + ' POS.BGebBgl = NettoBetrag* -1 + + If POS.Steuerpflichtig Then + POS.SteuerpflichtigerBetrag = NettoBetrag * -1 + + POS.Preis = NettoBetrag + Else + POS.SteuerfreierBetrag = BruttoBetrag * -1 + POS.Preis = BruttoBetrag * -1 + End If + + RG.POSITIONEN.Add(POS) + + Return True + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Return False + End Function Function allPlosePosBGeb(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, BGebLeistungsNr As Integer, BGebBgl As Double, BGebProzent As Double) Try @@ -996,6 +1030,112 @@ Public Class frmMDMDatenverarbetiung Function pruefData_PLOSE() As Boolean pruefData_PLOSE = True Try + Dim VERAGKdNr_DT As DataTable = SQL.loadDgvBySql("SELECT AdressenNr,PLOSEKundenNr FROM Adressen WHERE PLOSEKundenNr is not null", "FMZOLL") + Dim VERAGLeistungsNr_DT = SQL.loadDgvBySql("SELECT [plp_LeistungsNr],plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode is not null and plp_Firma IN ('PSS','PU') ", "FMZOLL") + 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 ", "FMZOLL") + ' Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80", "FMZOLL") + + Dim VERAGKdNr = -1 + Dim VERAGLeistungsNr = -1 + Dim found = False + Dim results As DataRow() + + Dim cnt = 0 + + For Each r As DataGridViewRow In MyDatagridview1.Rows + 'KUNDEN-NR / PLOSE KD-NR + results = VERAGKdNr_DT.Select("PLOSEKundenNr = '" & r.Cells("plose_POLSEKundennummer").Value & "'") + If results.Length > 0 Then + 'Gefunden! + r.Cells("VERAGKdNr").Value = results(0)("PLOSEKundenNr") + r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream + VERAGKdNr = results(0)("AdressenNr") + found = True + Else + r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip + pruefData_PLOSE = False + End If + + 'KUNDEN-NR / PLOSE KD-NR + 'Default -> Nicht gefunden + 'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip + 'found = False + 'For Each k In VERAGKdNr_DT.Rows + ' If r.Cells("plose_POLSEKundennummer").Value = k("PLOSEKundenNr") Then + ' 'Gefunden! + ' r.Cells("VERAGKdNr").Value = k("PLOSEKundenNr") + ' r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream + ' VERAGKdNr = k("AdressenNr") + ' found = True + ' Exit For + ' End If + 'Next + 'If Not found Then pruefData_PLOSE = False + + 'VERAG/PLOSE LEISTUNG + results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") + If results.Length > 0 Then + 'Gefunden! + VERAGLeistungsNr = results(0)("plp_LeistungsNr") + r.Cells("VERAGLeistungsNr").Value = results(0)("plp_LeistungsNr") + r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream + found = True + Else + r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip + pruefData_PLOSE = False + End If + + + 'VERAG OFFERT 80 + 'Default -> Nicht gefunden + Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") + results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") + If results.Length > 0 Then + 'Gefunden! + r.Cells("KundeOffertenNr").Value = results(0)("OffertenNr") + r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream + Else + pruefData_PLOSE = False + r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip + End If + + + + 'VERAG LEISTUNGS-NR + 'Default -> Nicht gefunden + Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") + results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") + If results.Length > 0 Then + 'Gefunden! + r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr + r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream + Else + r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip + pruefData_PLOSE = False + End If + + + If cnt Mod 5 = 0 Then + lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" + lblProzPruef.Refresh() + Me.Refresh() + End If + + cnt += 1 + + Next + lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + pruefData_PLOSE = False + End Try + End Function + + Function pruefData_PLOSE_old() As Boolean + pruefData_PLOSE_old = True + Try + Dim cnt = 0 + For Each r As DataGridViewRow In MyDatagridview1.Rows Dim VERAGKdNr = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen WHERE PLOSEKundenNr='" & r.Cells("plose_POLSEKundennummer").Value & "'", "FMZOLL") @@ -1003,7 +1143,7 @@ Public Class frmMDMDatenverarbetiung r.Cells("VERAGKdNr").Value = VERAGKdNr r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream Else - pruefData_PLOSE = False + pruefData_PLOSE_old = False r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip End If Dim VERAGLeistungsNr = SQL.getValueTxtBySql("SELECT TOP (1) [plp_LeistungsNr] FROM [tblPLOSE_Produktbeschreibung] where plp_ProductCode='" & r.Cells("plose_ProduktCode").Value & "' and plp_Firma IN ('PSS','PU') ", "FMZOLL") @@ -1011,7 +1151,7 @@ Public Class frmMDMDatenverarbetiung r.Cells("VERAGLeistungsNr").Value = VERAGLeistungsNr r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream Else - pruefData_PLOSE = False + pruefData_PLOSE_old = False r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip End If @@ -1021,7 +1161,7 @@ Public Class frmMDMDatenverarbetiung r.Cells("KundeOffertenNr").Value = OffertenNr r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream Else - pruefData_PLOSE = False + pruefData_PLOSE_old = False r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip End If @@ -1032,18 +1172,30 @@ Public Class frmMDMDatenverarbetiung r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream Else - pruefData_PLOSE = False + pruefData_PLOSE_old = False r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip End If Else - pruefData_PLOSE = False + pruefData_PLOSE_old = False r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip End If + + + If cnt Mod 5 = 0 Then + lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" + lblProzPruef.Refresh() + Me.Refresh() + End If + + cnt += 1 + Next + lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) - pruefData_PLOSE = False + pruefData_PLOSE_old = False End Try End Function diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index c2887d49..1101de61 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -318,7 +318,7 @@ Public Class cADMIN 'falls ID mitgegeben, dann diese laden, ansonsten den anderen Wert suchen 'Dim sql As String = "SELECT mit_vname,mit_nname,mit_berechtigung FROM tblUser where mit_username=@mit_username COLLATE Latin1_General_CS_AS and mit_pwd=@mit_pwd COLLATE Latin1_General_CS_AS " - Dim sql As String = "SELECT mit_id,mit_vname,mit_nname,mit_niederlassung,mit_username,mit_pwd,mit_info,mit_abteilung,mit_standartFiliale,mit_FMZollPersID,mit_firmaFMZoll,mit_TESTonly FROM " & + Dim sql As String = "SELECT mit_id,mit_vname,mit_nname,mit_niederlassung,mit_username,mit_pwd,mit_info,mit_abteilung,mit_standartFiliale,mit_FMZollPersID,mit_firmaFMZoll,mit_TESTonly,mit_abweichenderAnzeigename FROM " & " tblMitarbeiter,tblBerProg where mit_username=@mit_username and mit_pwd=@mit_pwd COLLATE Latin1_General_CS_AS AND (mit_firma=@mit_firma OR mit_firma='ALL' ) AND bepr_programm=@bepr_programm AND bepr_userId=mit_id " @@ -345,7 +345,7 @@ Public Class cADMIN ' If cMitarbeiterAVISO.Grenzstelle = "Nickelsdorf" Then cMitarbeiterAVISO.Grenzstelle = "NKD" ' If cMitarbeiterAVISO.Grenzstelle = "Salzburg" Then cMitarbeiterAVISO.Grenzstelle = "SBG" ' If cMitarbeiterAVISO.Grenzstelle = "" Then cMitarbeiterAVISO.Grenzstelle = "???" - cMitarbeiterAVISO.Mitarbeiter = CStr(dr.Item("mit_username")) + cMitarbeiterAVISO.Mitarbeiter = If(CStr(dr.Item("mit_abweichenderAnzeigename")) <> "", CStr(dr.Item("mit_abweichenderAnzeigename")), CStr(dr.Item("mit_username"))) cMitarbeiterAVISO.Mitarbeitername = CStr(dr.Item("mit_vname")) & " " & CStr(dr.Item("mit_nname")) cMitarbeiterAVISO.KW = CStr(dr.Item("mit_pwd")) ' cMitarbeiterAVISO.Sicherheitsstufe = CInt(dr.Item("ber_sicherheitsstufe")) diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb index a500deec..331ef412 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb @@ -159,100 +159,116 @@ Public Class KdSearchBox End Sub Sub doKeyDown(srchdate As DateTime) - If Eingabe_verarbeitet Then Exit Sub ' Bereits abgearbetiet -> Timer + Try + If usrcntl Is Nothing Then Exit Sub + If Eingabe_verarbeitet Then Exit Sub ' Bereits abgearbetiet -> Timer - Dim span_last_search = CInt(DirectCast((srchdate - last_search), TimeSpan).TotalMilliseconds) - Dim span_last_eingabe = CInt(DirectCast((srchdate - last_eingabe), TimeSpan).TotalMilliseconds) + Dim span_last_search = CInt(DirectCast((srchdate - last_search), TimeSpan).TotalMilliseconds) + Dim span_last_eingabe = CInt(DirectCast((srchdate - last_eingabe), TimeSpan).TotalMilliseconds) - 'TIMER_SEARCH - If TIMER_SEARCH Then - If span_last_search < 500 And span_last_eingabe < 500 Then - Exit Sub - End If - End If - - - - If usrcntl.Visible = False Then - usrcntl.Width = usrcntlWIDTH - usrcntl.Height = usrcntlHEIGHT - - Dim locationOnForm As Point = Nothing - If Me.FindForm IsNot Nothing Then - If dgvpos = "LEFT" Or dgvpos = "" Then - locationOnForm = Me.FindForm().PointToClient(Me.Parent.PointToScreen(Me.Location)) - ElseIf dgvpos = "RIGHT" Then - locationOnForm = Me.FindForm().PointToClient(Me.Parent.PointToScreen(Me.Location)) - locationOnForm.X = locationOnForm.X - (usrcntl.Width - Me.Width) + 'TIMER_SEARCH + If TIMER_SEARCH Then + If span_last_search < 500 And span_last_eingabe < 500 Then + Exit Sub End If End If - If locationOnForm.Y + usrcntl.Height + Me.Height > form.ClientRectangle.Height Then - usrcntl.Height = form.ClientRectangle.Height - locationOnForm.Y - Me.Height - End If - - usrcntl.Location = locationOnForm - usrcntl.Top += Me.Height - End If - - With usrcntl.dgvKundenAktiv - If usrcntl.Visible = False Then - .AllowUserToAddRows = False - .AllowUserToDeleteRows = False - .AllowUserToOrderColumns = False - .AllowUserToResizeColumns = False - .AllowUserToResizeRows = False - .ReadOnly = True - .MultiSelect = False - .SelectionMode = DataGridViewSelectionMode.FullRowSelect - .BackgroundColor = Color.White - .ForeColor = Color.Black - .GridColor = Color.White + usrcntl.Width = usrcntlWIDTH + usrcntl.Height = usrcntlHEIGHT + + Dim locationOnForm As Point = Nothing + If Me.FindForm IsNot Nothing Then + If dgvpos = "LEFT" Or dgvpos = "" Then + locationOnForm = Me.FindForm().PointToClient(Me.Parent.PointToScreen(Me.Location)) + ElseIf dgvpos = "RIGHT" Then + locationOnForm = Me.FindForm().PointToClient(Me.Parent.PointToScreen(Me.Location)) + locationOnForm.X = locationOnForm.X - (usrcntl.Width - Me.Width) + End If + End If + + + If locationOnForm.Y + usrcntl.Height + Me.Height > form.ClientRectangle.Height Then + usrcntl.Height = form.ClientRectangle.Height - locationOnForm.Y - Me.Height + End If + + usrcntl.Location = locationOnForm + usrcntl.Top += Me.Height End If - 'THREADING AKTIV - Me.ThreadInitAKTIV() - ' Dim ThreadInitAKTIV = New System.Threading.Thread(AddressOf Me.ThreadInitAKTIV) - ' ThreadInitAKTIV.IsBackground = True - ' ThreadInitAKTIV.Start() + If usrcntl IsNot Nothing AndAlso usrcntl.dgvKundenAktiv IsNot Nothing Then - End With + With usrcntl.dgvKundenAktiv + + If usrcntl.Visible = False Then + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .ReadOnly = True + .MultiSelect = False + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .BackgroundColor = Color.White + .ForeColor = Color.Black + Try + .GridColor = Color.White + Catch ex As Exception + 'Keine Ahnung warum hier ein Fehler kommt + End Try + + End If - If nurAktive Then + 'THREADING AKTIV + Me.ThreadInitAKTIV() + ' Dim ThreadInitAKTIV = New System.Threading.Thread(AddressOf Me.ThreadInitAKTIV) + ' ThreadInitAKTIV.IsBackground = True + ' ThreadInitAKTIV.Start() + + End With + End If + + If nurAktive Then usrcntl.dgvKundenInAktiv.Visible = False usrcntl.Panel1.Visible = False Else - With usrcntl.dgvKundenInAktiv - If usrcntl.Visible = False Then - .AllowUserToAddRows = False - .AllowUserToDeleteRows = False - .AllowUserToOrderColumns = False - .AllowUserToResizeColumns = False - .AllowUserToResizeRows = False - .ReadOnly = True - .MultiSelect = False - .SelectionMode = DataGridViewSelectionMode.FullRowSelect - .BackgroundColor = Color.White - .ForeColor = Color.Black - .GridColor = Color.White - .DefaultCellStyle.ForeColor = Color.Gray + If usrcntl IsNot Nothing AndAlso usrcntl.dgvKundenInAktiv IsNot Nothing Then + + With usrcntl.dgvKundenInAktiv + If usrcntl.Visible = False Then + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .ReadOnly = True + .MultiSelect = False + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .BackgroundColor = Color.White + .ForeColor = Color.Black + Try + .GridColor = Color.White + Catch ex As Exception + 'Keine Ahnung warum hier ein Fehler kommt + End Try + .DefaultCellStyle.ForeColor = Color.Gray + End If + + + Me.ThreadInitINAKTIV() + 'THREADING INAKTIV + 'Dim ThreadInitINAKTIV = New System.Threading.Thread(AddressOf Me.ThreadInitINAKTIV) + 'ThreadInitINAKTIV.IsBackground = True + 'ThreadInitINAKTIV.Start() + + End With + End If + End If - - Me.ThreadInitINAKTIV() - 'THREADING INAKTIV - 'Dim ThreadInitINAKTIV = New System.Threading.Thread(AddressOf Me.ThreadInitINAKTIV) - 'ThreadInitINAKTIV.IsBackground = True - 'ThreadInitINAKTIV.Start() - - End With - - End If - - If _hideIfListEmpty Then + If _hideIfListEmpty Then If usrcntl.dgvKundenAktiv.RowCount = 0 And usrcntl.dgvKundenInAktiv.RowCount = 0 Then setObjectVisible(usrcntl, False) @@ -281,6 +297,9 @@ Public Class KdSearchBox Eingabe_verarbeitet = True last_search = Now + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try End Sub Public Sub hideDgv(o) '(sender As Object, e As EventArgs) @@ -345,6 +364,9 @@ Public Class KdSearchBox If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then SQLstr &= " OR Filialen.Firma IN ('IMEX','VERAG') " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then + SQLstr &= " OR (Filialen.Firma IN ('UNISPED') AND Kunden.[FilialenNr]=7002) " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide + End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL") Then SQLstr &= " OR Filialen.Firma IN ('FRONTOFFICE') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice End If @@ -432,6 +454,9 @@ Public Class KdSearchBox If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then SQLstr &= " OR Filialen.Firma IN ('IMEX','VERAG') " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then + SQLstr &= " OR (Filialen.Firma IN ('UNISPED') AND Kunden.[FilialenNr]=7002) " ' Wenn die OFFERTE_FREMD_VERAGIMEX --> Beide + End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_FRONTOFFICE", "SDL") Then SQLstr &= " OR Filialen.Firma IN ('FRONTOFFICE') " ' Wenn die Firmenbezeichnung im CLUSter vorkommt .--> Frontoffice End If diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb index 6d0174e9..f4f8d38c 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb @@ -8,6 +8,7 @@ Public Class MyTextBox Implements INotifyPropertyChanged Property _numbersOnly As Boolean = False Property _numbersOnlyKommastellen As String = "" + Property _numbersOnlyTrennzeichen As Boolean = True Property _ShortDateOnly As Boolean = False ' nicht mehr public , da fehler Property _ShortDateNew As Boolean = False Property _DateTimeOnly As Boolean = False @@ -294,7 +295,9 @@ Public Class MyTextBox sender.text = sender.text.ToString.Replace(" ", "").Replace(Chr(160), "") ' 160: irgend ein Sonder-Leerzeichen pruefungHandled = True Try - If IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then + If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then + Me._value = CInt(sender.text) + ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) Me._value = CDbl(sender.text) ' Else @@ -582,7 +585,10 @@ Public Class MyTextBox End If ElseIf _numbersOnly Then - If IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then + If Not _numbersOnlyTrennzeichen And IsNumeric(v) Then + Propvalue = CInt(v) + Me.Text = v + ElseIf IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then Propvalue = CDbl(v) Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) ElseIf IsNumeric(v) Then @@ -623,7 +629,9 @@ Public Class MyTextBox If _numbersOnly Then Try 'String.Format("{0:N2}", CDbl(sender.text)) - If IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then + If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then + sender.text = CInt(sender.text) + ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) Else sender.text = CDbl(sender.text) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index ec2bdeae..1094ffa6 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -593,7 +593,9 @@ Public Class SQL Return defaultReturn Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & conn.ConnectionString, System.Reflection.MethodInfo.GetCurrentMethod.Name & sql) + Dim connstr = "" + If conn IsNot Nothing Then connstr = conn.ConnectionString + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & connstr, System.Reflection.MethodInfo.GetCurrentMethod.Name & sql) End Try 'MsgBox("3") Return defaultReturn diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb index 069d85d4..db3a6e34 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb @@ -227,6 +227,9 @@ Public Class cAdressen + + + Public Function doesOrdnungsbegriffExist() As Boolean Try Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb index 8afd0b2d..51630946 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb @@ -197,6 +197,17 @@ Public Class cEmailBenachrichtigung End Select End Function + Public Shared Function getBCCEmail() As String + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" : Return "noreply@imex-group.at" + Case "ATILLA" : Return "noreply@verag.ag" + Case "UNISPED" : Return "No-Reply@unisped.at" + Case "FRONTOFFICE" : Return "noreply@front-office.eu" + Case "AMBAR" : Return "" '"noreply@verag.ag" + Case Else : Return "noreply@verag.ag" + End Select + End Function + Shared Sub eMails_einlesenOLD(hFrächter_kdnr As String, hAuftraggeber_kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, ByRef Emails_list_sent As VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList) 'ART: '1=Ankunft diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 6a0f67a8..83b25a4d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -4,6 +4,7 @@ Public Class cMitarbeiter Property mit_id As Integer Property mit_username As String = "" + Property mit_abweichenderAnzeigename As String = "" Property mit_pwd As String = "" Property mit_geschlecht As String = "" Property mit_affix As String = "" @@ -110,6 +111,7 @@ Public Class cMitarbeiter Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_id", mit_id,, True, True)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_username", mit_username)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_abweichenderAnzeigename", mit_abweichenderAnzeigename)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_pwd", mit_pwd)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_geschlecht", mit_geschlecht)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_affix", mit_affix)) @@ -298,6 +300,7 @@ Public Class cMitarbeiter Try Me.mit_id = dr.Item("mit_id") Me.mit_username = dr.Item("mit_username") + Me.mit_abweichenderAnzeigename = dr.Item("mit_abweichenderAnzeigename") Me.mit_pwd = dr.Item("mit_pwd") Me.mit_affix = dr.Item("mit_affix") If Not dr.Item("mit_geschlecht") Is DBNull.Value Then Me.mit_geschlecht = dr.Item("mit_geschlecht") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb index 04a9b270..4e20e0c9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb @@ -792,7 +792,10 @@ Public Class cSMS 'Keine Übermittlung. Dim MaId As Integer = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & Me.sms_AvisoId & "' ", "AVISO", -1) If MaId > 0 Then - VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(Me.sms_AvisoId, Nothing, 3, "B", MaId, "*WhatsApp Fehler*", 0, "", "Fehler bei der WhatsApp Übermittlung: " & If(Me.sms_Failure, "")) + Dim absenderFirma = "" + VERAG_PROG_ALLGEMEIN.cSMS.GET_AccountInfo(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, Me.sms_Account, absenderFirma) + + VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(Me.sms_AvisoId, Nothing, 3, "B", MaId, "*WhatsApp Fehler*", 0, "", "Fehler bei der WhatsApp Übermittlung: " & If(Me.sms_Failure, ""),,, absenderFirma) End If End Select diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cVorauskasse.vb b/VERAG_PROG_ALLGEMEIN/Classes/cVorauskasse.vb index bef47484..0c36ef4f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cVorauskasse.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cVorauskasse.vb @@ -149,14 +149,15 @@ Public Class cVorauskasse - Public Shared Function LOADByFilialeAbfNr(FilialeNr As Integer, AbfertigungsNr As Integer, Optional vk_Rolle As String = "") As cVorauskasse + Public Shared Function LOADByFilialeAbfNr(FilialeNr As Integer, AbfertigungsNr As Integer, Optional vk_Rolle As String = "", Optional vk_KdNr As String = "") As cVorauskasse Try Dim VK As New cVorauskasse Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM tblVorauskassen WHERE vk_AbfertigungsNr=@vk_AbfertigungsNr AND vk_FilialeNr=@vk_FilialeNr " & If(If(vk_Rolle, "") <> "", "AND vk_Rolle=@vk_Rolle ", ""), conn) + Using cmd As New SqlCommand("SELECT * FROM tblVorauskassen WHERE vk_AbfertigungsNr=@vk_AbfertigungsNr AND vk_FilialeNr=@vk_FilialeNr " & If(If(vk_Rolle, "") <> "", "AND vk_Rolle=@vk_Rolle ", "") & If(If(vk_KdNr, "") <> "", "AND vk_KdNr=@vk_KdNr ", ""), conn) cmd.Parameters.AddWithValue("@vk_FilialeNr", FilialeNr) cmd.Parameters.AddWithValue("@vk_AbfertigungsNr", AbfertigungsNr) cmd.Parameters.AddWithValue("@vk_Rolle", vk_Rolle) + cmd.Parameters.AddWithValue("@vk_KdNr", vk_KdNr) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In VK.getParameterList() diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 343a00fa..3518bf0c 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1082,6 +1082,8 @@ Public Class cFormularManager Public Shared Sub mergePDFs(files As List(Of String), ByRef outputFile As String) + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() files.RemoveAll(Function(v) v.Equals("")) 'Alle leeren Stings löschen If files.Count > 0 Then Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray) @@ -1095,10 +1097,9 @@ Public Class cFormularManager Public Shared Sub PrintViaSpirePDF(PDFFile As String(), Optional printerName As String = "") Try If printerName = "" Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then - Dim sPrinters As ArrayList + Dim sPrinters As ArrayList - If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then sPrinters = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST Else sPrinters = New ArrayList @@ -1106,13 +1107,17 @@ Public Class cFormularManager sPrinters.Add(sPrinter) Next End If + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then + For i As Integer = 0 To sPrinters.Count - 1 - If i.ToString.ToUpper.Contains(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD.ToUpper) Then + If i.ToString.ToLower.Contains(VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD.ToLower) Then printerName = i End If Next + End If - Else + If printerName = "" Then Dim oPS As New System.Drawing.Printing.PrinterSettings printerName = oPS.PrinterName End If @@ -1120,6 +1125,10 @@ Public Class cFormularManager End If 'Dim docs As Spire.Pdf.PdfDocument() = {New Spire.Pdf.PdfDocument("C:\Users\DEVELOPER1\Desktop\Agrotel.pdf")} + If printerName = "" Then + MsgBox("Drucker konnte nicht ermittelt werden!") + End If + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() For Each pdfPath In PDFFile Dim doc As New Spire.Pdf.PdfDocument(pdfPath) @@ -1202,6 +1211,8 @@ Public Class cFormularManager Public Shared Sub PrintViaSpirePDF_FromURL(URLs As String(), Optional printerName As String = "") Try + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() If printerName = "" Then Dim oPS As New System.Drawing.Printing.PrinterSettings printerName = oPS.PrinterName @@ -1239,10 +1250,13 @@ Public Class cFormularManager Return System.IO.Path.GetTempPath() & Guid.NewGuid().ToString() & ".pdf" End Function + + Public Shared Function getPDFViaSpirePDF_FromURL(URL As String, Optional targetPath As String = "") As String Try If targetPath = "" Then targetPath = getTMPPath_PDF() + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL) doc.LoadFromHTML(URL, True, True, True) If doc IsNot Nothing Then diff --git a/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml b/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml index 354b8ead..fb5cc36c 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml +++ b/VERAG_PROG_ALLGEMEIN/My Project/license.elic.xml @@ -1,24 +1,32 @@ - - - Runtime - VERAG Spedition AG - al@verag.ag - VERAG Spedition AG - 2021-08-11T12:00:00Z - 2022-08-11T12:00:00Z - - - Spire.PDF Platinum - 7.5 - - 1 - 1 - - - - - e-iceblue - sales@e-iceblue.com - http://www.e-iceblue.com - - + + + Runtime + VERAG Spedition AG + al@verag.ag + VERAG Spedition AG + 2022-07-12T00:00:00Z + 2023-07-12T00:00:00Z + + + Spire.PDFViewer for Forms + 7.1 + + 1 + 1 + + + + Spire.PDF Pro Edition + 8.7 + + 1 + 1 + + + + + e-iceblue + sales@e-iceblue.com + http://www.e-iceblue.com + + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb index bfa78c9b..0929a874 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb @@ -13,6 +13,7 @@ Case "IMEX" : where = " and ncts_firma = 'IMEX' " Case "UNISPED" : where = " and ncts_firma = 'UNISPED' " Case "VERAG/ATILLA" : where = " and (ncts_firma is null OR ncts_firma IN ('VERAG','ATILLA','DURMAZ','FRONTOFFICE')) " + Case "VERIMEX" : where = " and ncts_firma = 'VERIMEX' " End Select diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 1d3b0585..25298aa7 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -116,17 +116,17 @@ ..\..\..\dll\RichTextBoxEx.dll - + False - ..\..\..\dll\Spire.PDF\2021\Spire.License.dll + ..\..\..\dll\Spire.PDF\2022\Spire.License.dll - + False - ..\..\..\dll\Spire.PDF\2021\Spire.Pdf.dll + ..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll False - ..\..\..\dll\Spire.PDF\2021\Spire.PdfViewer.Forms.dll + ..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb index 7246ec69..a13f77df 100644 --- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb @@ -7,6 +7,8 @@ Public Class cAllgemein Public Shared NIEDERLASSUNG As String 'SUB, WAI, ... Public Shared ABTEILUNG As String 'QS ZOLL ... Public Shared STAMMFILIALE As String 'IMEX,UNISPED;ATILLA... + Public Shared WARENORT_ZUGANG As Boolean = False + Public Shared WARENORT As String Public Shared CLUSTER As String = "" 'Firmenverbund ' Public Shared SPECIFIC As cSPECIFIC = New cSPECIFIC @@ -36,6 +38,7 @@ Public Class cAllgemein Public Shared PROGVERSION As String = "" Public Shared USRNAME As String + Public Shared ABW_USRNAME As String 'Public Shared USRBER As Integer Public Shared USRID As Integer Public Shared USR_VNAME As String @@ -106,6 +109,7 @@ Public Class cAllgemein End Select USRNAME = (MITARBEITER.mit_vname & " " & MITARBEITER.mit_nname) + ABW_USRNAME = MITARBEITER.mit_abweichenderAnzeigename If NIEDERLASSUNG = "" Then NIEDERLASSUNG = MITARBEITER.mit_niederlassung If ABTEILUNG = "" Then ABTEILUNG = MITARBEITER.mit_abteilung Else @@ -394,9 +398,9 @@ Public Class cNCTS_GUARANTEES Public Shared TOBB() As String = {"17TR0004000032349", "20TR0004000069756", "13TR0004000009323", "21TR0004000097157", "12TR0004000004665", "15TR0004000020917", "17TR0004000029518", "20DE0000000078205", "19IT01TR000003323", "21TR0004000079552", "21TR0004000078157", "21TR0004000090364", "21TR0004000092350", "20TR0004000069557", - "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175"} + "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356"} 'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518", "21TR0004000079552", "21TR0004000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"} - Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716"} + Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716", "21DE0000000081910"} Public Shared VERAG() As String = {"17DE0000000071678", "05AT510000G000FP7"} Public Shared IMEX() As String = {"16AT520000G000VA6"} Public Shared ATILLA() As String = {"20AT520000G000092"} diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index f029e898..758beaa9 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -123,6 +123,14 @@ Public Class cProgramFunctions End Function + Public Shared Sub spireLoadLicense() + ''Nicht notwendig --> license.elic hat beide drinnen. + 'Spire.License.LicenseProvider.SetLicenseKey("MkctkXG06cMhlK6LAQCVDXFpzaLd8k9flTIXzX2vqnaj15/RjBiXqzJFPI5Ay0WJO+ng6Fwgb1s0Owoicm6acvP5dL8R/rHMlEAIQmWgY231zrrzVcbfujmJLyeYq1bwdbZY8vAtegSo3uhg8MruQ0NwF8OwrmrRTQzW8VkBRePb6jhCAWqMyr4Ho/d06JN3ngF3ulN/aNkFIWTHBvPG+M0CWuhudGhNtyDcnWPHDHm1+qigpwwnh69s8A4romdnSDQpFa2/LG5KAzwVmcjKSfVZs6e497ydRBFpggoe8d4J0FnRW//ROJOraTklVBMcGNZm9plWQvA23wxAhaVQHPINx/ecdTb9NIAeQajYyghx/tA+XVQ5uessceZW4LWZ4cnq6nhsBS4Y6oZ76/pHw1cUSfOHFCVi++X+2JYatsUJcAn2QXM6qpul7MpKCdDtT+yE94umhllKK7oBA8TMVFntgRfSZU+fftgMB+Nrs91UqM52OQsM4f0Q/dQvLGL/gr7NYE7QBQRV8ersUHls2s/7NHJ1VSoXKO9bghFaqzWoMGJ1UM/DvgdMg+URo6F9yanH4dEv8XDpTgx82f4pwncquCZJoPTdlXVhF4mK6/euo5Od3pmO9ZTqY+DxNwpgBIvkWTTvZiqkq4aDhNR5fhoihtAIWDiaHxMhlXxKTeK8z6n3puusWs0ZcXXaXb1jfUi7L9v8tWavr7Kag89coCXv7q5ejJ+mxTH9N6wIA029crL1+xyWSMOIaU6Iav8nrro5Xhdt14abW+458iqjVQRL1l6ZUkZjXaJHjoqy1aKg1OafFAGjULuOp8ozBJwQbRD0y5czx60NFjKlxR01SrfMrHV8uCjJXWm4BquAQPlHq6gfqSdXjmv/ZgKiKnXu+2FelPHK96IRK+y+pSv0hUx9JJ+9zL0JdAdwKmm2rRGk2KTKKfJ8jB+FdTpp61ecYsM2XB+GqZvLgJx6DUFklevpLG8XuKxcJFJGyAEhUzeUYhjUv60gSRKKAs8XlOmP35fBP2Gd2X6H1cUJFEdam62dDnE9ZBRyBlwA2n7iFav3s7+PzSuEACBG8R1nky52Ye9qE6zM8Plw0boPIoOueKYQIO+9wDLZyhHYjwc/6h3snP76tjsra7IS1c0Yx/P2lMx8C9LogL4c7Hyo7DH/bmn7Kx1C3eYH7IMY2uXoRfJ2tEtJ8MxvD1Xm4ZU1rL/BWpiwTi2rHNl/ikBteyZ7D4YlfoiEpB7P4UksR/SLYS1gpmeh3py7dQytQg8tfq7Ylyn+4umppvhi2ZBhJKElo7DdRegYofwM4XZW5eyWV0Qq7WoBs7YGwq0SHcuUEsgq9mW3j4a7g5/kuTkZSXxVXFKmYEHo+CLJvcbyeWrYeSfgdWd914iiNOzCo/mufmYsOxndMUCUEv9DeKS/zIu7OKM0OIE1O62kt7rBfRyJ5tLcoPKhCaU2y2sa4bsw59YAXq09Maj136qUjLiOfyROIvxlQ30zaydZnn/pqoseHtklySmgCnbO2uQ2vl5RHnv0AbOT7UgLFmQv4x3HL2M5ezEW+3POA1OuEW/TlAvMiaE=") + 'Spire.License.LicenseProvider.LoadLicense() + 'Spire.License.LicenseProvider.SetLicenseKey("DqgBAA7OVWqLrl0/vKFRQ3B4fULEZEi+uN7wMgS475TeA6kOemBFjzZEG9fkW/Bgn5JDj2f9fGF9/QZ3jnik3iDgvDkaWO3yrb0V+5OaXxviTkoSVmCxzBNhsfNre2Q9BkETcd3DCYew7psFTdQvVKTtugehhx5bhxitSH6q16Vvdma8/EvVg7dsYajEq+Bjxi5Ibe5Q3po5SnZBnvrbegroXy34zuauqFiKnuaIdSFlmqjuf59veZvss6mIqSZSW9IsyfyKRjLupvFZcsH5yKPOuzmoL00KQ2OqxToVvD45IEUEvjNqdWeUKLPx/JVgaV3RmsxqPWd9Bm6zb7h04OBOKNVRtSSmjX2KnBRXdQgXfSGF1uIDlvLNtpD5AOYxKPOIfJ/AFxi9m8pYKnzqSMbpaxxlOqy9Y03EXkrko3SOzhyg+k6ZyebbqMrzeOzJ7f5cl9TfttlADwnoLa42No35+xkYI3tF/kALsrWWGcVsUWK78cg2w2s79y4ERBbgZlbYqVpdsOyKBO7k1ujA83J2MUYfoSydNivNYM05Ll1UJzbMY0sxb6HGWwVHl3t7aVwioZbmonI90fmrZpfjrpkzlL0MvjY5LxL1JXcv5xJ/oXaLN/q1GxCuFvSDroV3uKRbGhonGmTroQpp7AMFoah8Bg+glLFL2ibSoJ16dlvmxwBuZM0uDMCMfJhsFRSEzUEHbX0gv8MTNC3ROmM81Rrm7klfKrsJD3FrBlf13q6yIpxo+qp0/AgkovpjsBv8y8dxEJs37C0PHcvkCr/kA0HDDTH+Rstx8EelQzOv5dcr6CgW1VWW3+dyPjHjADlRPXd+bo+gquT6NMezbQOUdm3wMNbpCQ/qwcZ5bzEXGmdhWcEs/Z+QmXRJvhBbEf3WQrlLSuzVIooL/nXo5MG8XooWPZHURz1g92vvqA2H6FU+DLJkiNp/OI5Xzp0NNqhOubcSX70noHx7SdgQrnAIGZtE90/MzLBPFZMIv1yjaDyoZsTA3nSatae4w7PvN6cXtacLZl5GnAJIRxlmjR+OvwbfXhAcbVeNYtRYXhExR9B4fxKp8/eXZorvzW7yFH8cSopnqSjmw6ywqx0u2upOuuNeGp5/kMP4QC+SMRruXWQM46Ed168OaU1GJ0PpHr+W2EWZLbqqNhrYct1FpOnVxJjA90DOKsbXFzbLGC83YgZdVo9AAIzMYu8RIhbn6ACJQlC+d9nn0S/wZPtX+PUZK1ACCCDdfm/0jwvUEb8Us2pWn6qA/ZHtkk4a/iII8F9hrDMVOQYJBJQ/IPnyJneHfqjtfB/Hw/1/KdHJYnyWg5KXaZWz+Ut4Vc48ZJCt3B6Izaf2wD68iYaDeemnJAFI3OcsjAzNx54kxs5VBJ4VtsFYPMN3SnovtfEVis3mLlKqzy0EdTOOIm0ZkgxCDHS3KogjOp2SI0kvAxxD1jE1IOKpgLkRo6mfjCzjS6RmZ/vBoBbx1OGqqxUlkD+2TyfQUGggoEX8XtYykiVoMuVUdikUQtHP12gq2aYzS9rKpaIINaEpcqU+vQlIumrlsL2MFIdvcdTEBhfoPtq4j9GZkOY=") + 'Spire.License.LicenseProvider.LoadLicense() + End Sub + Public Shared Function genCSVFromDT(dt As DataTable, Optional openCSV As Boolean = False, Optional showColumnName As Boolean = True, Optional optFileName As String = "") As String Try @@ -296,17 +304,23 @@ Public Class cProgramFunctions Msg.BodyEncoding = System.Text.Encoding.GetEncoding("ISO-8859-1") Msg.From = New MailAddress(eMailfrom) - For Each s In eMailTo.ToString.Split(";") - If s <> "" Then Msg.To.Add(convertToIso(s).ToString.Trim()) - Next + If eMailTo IsNot Nothing Then + For Each s In eMailTo.ToString.Split(";") + If s <> "" Then Msg.To.Add(convertToIso(s).ToString.Trim()) + Next + End If - For Each s In cc.ToString.Split(";") - If s <> "" Then Msg.CC.Add(convertToIso(s).ToString.Trim()) - Next + If cc IsNot Nothing Then + For Each s In cc.ToString.Split(";") + If s <> "" Then Msg.CC.Add(convertToIso(s).ToString.Trim()) + Next + End If - For Each s In bcc.ToString.Split(";") - If s <> "" Then Msg.Bcc.Add(convertToIso(s).ToString.Trim()) - Next + If bcc IsNot Nothing Then + For Each s In bcc.ToString.Split(";") + If s <> "" Then Msg.Bcc.Add(convertToIso(s).ToString.Trim()) + Next + End If Msg.Subject = betreff '"ERROR - DAKOSY Einarbeitung" If uhrzeitAngeben Then @@ -322,11 +336,20 @@ Public Class cProgramFunctions If aa IsNot Nothing AndAlso aa <> "" Then Msg.Attachments.Add(New System.Net.Mail.Attachment(aa)) Next End If + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + + + + Try + 'SENDEN:::::::::::::::::::::: mySmtpsvr.Send(Msg) Catch ex As Exception - Try 'Falls Fehler nicht beim Senden, sonder was anderes. + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) Catch ex3 As Exception End Try