Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -120,7 +120,7 @@
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal DE", "VZ_FISKAL_DE"))
|
||||
End If
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", Me.FindForm) Then
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED Ltd", "IMEX"))
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED Ltd", "LTD"))
|
||||
End If
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handling", "HANDLING"))
|
||||
MyComboBox1.changeItem("VZ")
|
||||
|
||||
@@ -4281,12 +4281,12 @@ Public Class FormularManagerNEU
|
||||
Dim dgvVon = (i - 1) * 10 ' Start der Seite in der DGV
|
||||
Dim listPos As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem)
|
||||
|
||||
If i = 1 Then
|
||||
'BisherigeFelder in listPOSladen:
|
||||
For Each p In list
|
||||
' If i = 1 Then 'zt jed
|
||||
'BisherigeFelder in listPOSladen:
|
||||
For Each p In list
|
||||
listPos.Add(p)
|
||||
Next
|
||||
End If
|
||||
' End If
|
||||
|
||||
For ii As Integer = 0 To 9
|
||||
'Wenn DGV Ende --> Abbruch:
|
||||
|
||||
1133
SDL/OriginalArchiv_ATR/frmATR.Designer.vb
generated
1133
SDL/OriginalArchiv_ATR/frmATR.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -118,6 +118,38 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
/9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
|
||||
AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
|
||||
BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
|
||||
GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
|
||||
AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
|
||||
AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
|
||||
w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
|
||||
VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
|
||||
CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
|
||||
8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
|
||||
ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
|
||||
KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
|
||||
</value>
|
||||
</data>
|
||||
<data name="FlatButton1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
/9j/4AAQSkZJRgABAQEAAAAAAAD/7gAOQWRvYmUAZAAAAAAB/9sAQwABAQEBAQEBAQEBAQEBAQEBAQEB
|
||||
AQECAQEBAQECAgICAgICAgICAgIDAgICAwMDAwMDBQUFBQUFBQUFBQUFBQUF/9sAQwEBAQECAQIDAgID
|
||||
BAQDBAQFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUF/8AAEQgA
|
||||
GQAZAwERAAIRAQMRAf/EABgAAAMBAQAAAAAAAAAAAAAAAAAICQcK/8QAKRAAAQUAAgIABAcBAAAAAAAA
|
||||
AQIDBAUGAAcRITESIxVBYSIyEzMIFv/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAA
|
||||
AAAAAAAA/9oADAMBAAIRAxEAPwDsSKq/7Vudfqtf2Ky3W77t1EhyJ2zp6WBFraLTW8SKwzFh3EeKwhmM
|
||||
w202htsDwB64CSWH+lrc3ilVadknOB9Pyx5/c+5cunIwP6vrN6dDCVKHw+kQPz4DTyLim0vTGs7ByGt7
|
||||
VhTIWM1NlDU73LrX3qq7qoLzqUqQ5dracLLyQfCklJ/EEHxwKNcCflzQva7Adn5eM8iPKtd/3dGjOrHl
|
||||
CX/+uu1oCvY9FQAPASxnqXraJBDWh1mqq9RFZSzZZtvKOy5ItAAC0w4glhxLi/61FYBHs+OAxOYzVhjv
|
||||
8072rtGHIkiXkewbJuHJAEuJGnQZBabeAJSFhAHzAHgVN4Eiu2d5aQqnXZPF6TM12hk9sdyt3a5uzqc/
|
||||
ZU0FWpt3EJ+SbMjvIVJS6FIUgeQkefXkHgLI1adyMwzAa7QpUxShaP4h3HSftc+Pv7r54GoZDeaeu697
|
||||
KyW71mPsIEnA6z7BMPYFReXTtvJirbbhIRHnPvuh4LUUeR6ICR8QOBcDgHAOAcA4H//Z
|
||||
</value>
|
||||
</data>
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA
|
||||
|
||||
@@ -1,5 +1,469 @@
|
||||
Public Class frmATR
|
||||
Imports DocumentFormat.OpenXml.Drawing.Charts
|
||||
Imports System.IO
|
||||
Imports System.Windows.Controls.Primitives
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
'DATENSERVER!!!!!!!!!!!!!!!!!!
|
||||
|
||||
Public Class frmATR
|
||||
|
||||
Dim ATR As VERAG_PROG_ALLGEMEIN.cOrigianlATR = Nothing
|
||||
Dim loadedDSID As Integer = -1
|
||||
Dim DSID As Integer = -1
|
||||
|
||||
Sub New()
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||
End Sub
|
||||
Sub New(atr_id)
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||
ATR = New VERAG_PROG_ALLGEMEIN.cOrigianlATR(atr_id)
|
||||
loadedDSID = ATR.atr_dsId
|
||||
End Sub
|
||||
|
||||
Private Sub Panel1_Paint(sender As Object, e As PaintEventArgs) Handles Panel1.Paint
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
'If ATR IsNot Nothing Then
|
||||
' If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löchen?", vbYesNoCancel) Then
|
||||
' If ATR.delete Then
|
||||
' Me.Close()
|
||||
' End If
|
||||
' End If
|
||||
'End If
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
|
||||
|
||||
If doValidation() Then
|
||||
If ATR Is Nothing Then
|
||||
ATR = New cOrigianlATR()
|
||||
ATR.atr_erfassungsdatum = Now
|
||||
ATR.atr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
ATR.atr_mitId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||
|
||||
End If
|
||||
|
||||
getValues()
|
||||
|
||||
'Falls keine Sendung gewählt, aber FilialeNr/AbfertigungsNr eingegeben:
|
||||
If ATR.atr_SendungsId <= 0 And ATR.atr_FilialenNr > 0 And ATR.atr_AbfertigungsNr > 0 Then
|
||||
'Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim SND = VERAG_PROG_ALLGEMEIN.cSendungen.LOADByFilialenNrAbfertigungsNr(ATR.atr_FilialenNr, ATR.atr_AbfertigungsNr)
|
||||
If SND IsNot Nothing Then
|
||||
ATR.atr_SendungsId = SND.tblSnd_SendungID
|
||||
ATR.atr_AvisoId = SND.tblSnd_AvisoID
|
||||
End If
|
||||
End If
|
||||
|
||||
If (ATR.atr_SendungsId > 0 AndAlso ATR.atr_anhID > 0) Or (loadedDSID <> DSID And loadedDSID > 0) Then
|
||||
If vbYes = MsgBox("ATR in Anhang speichern?", vbYesNoCancel) Then
|
||||
If ATR.atr_dsId < 0 Then
|
||||
MsgBox("Kein PDF-Anhang!")
|
||||
Else
|
||||
Dim ANH = New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(ATR.atr_anhID)
|
||||
ANH.anh_SendungsId = ATR.atr_SendungsId
|
||||
ANH.anh_AvisoId = ATR.atr_AvisoId
|
||||
ANH.anh_docId = DSID
|
||||
ANH.anh_Name = "ATR_ARCHIV"
|
||||
ANH.anh_Typ = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getFilePathTypeValid(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(DSID))
|
||||
ANH.anh_Art = "ATR"
|
||||
ANH.SAVE() 'Eintrag wird überschreiben
|
||||
ATR.atr_anhID = ANH.anh_id
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
If ATR.SAVE Then
|
||||
Me.Close()
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
End If
|
||||
Me.DialogResult = DialogResult.None
|
||||
End Sub
|
||||
|
||||
|
||||
Function doValidation() As Boolean
|
||||
lblErr_Ausstellungsdatum.Visible = False
|
||||
lblErr_DocNr.Visible = False
|
||||
lblErr_Aufbewarungsort.Visible = False
|
||||
|
||||
If txtDocNumber.Text.Trim = "" Then lblErr_Ausstellungsdatum.Visible = True : Return False
|
||||
If txtDocDatum._value = "" Then lblErr_DocNr.Visible = True : Return False
|
||||
If txtLocation._value = "" Then lblErr_Aufbewarungsort.Visible = True : Return False
|
||||
|
||||
Return True
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
|
||||
Sub loadValues()
|
||||
|
||||
If ATR.atr_empfaengerkdnr > -1 Then
|
||||
txtEmpfaenger.KdNr = ATR.atr_empfaengerkdnr
|
||||
Else
|
||||
txtEmpfaenger.KdNr_value = -1
|
||||
txtEmpfaenger.Text = ATR.atr_empfaenger
|
||||
End If
|
||||
|
||||
If ATR.atr_absenderkdnr > -1 Then
|
||||
txtAbsender.KdNr = ATR.atr_absenderkdnr
|
||||
Else
|
||||
txtAbsender.KdNr_value = -1
|
||||
txtAbsender.Text = ATR.atr_absender
|
||||
End If
|
||||
|
||||
txtLocation.Text = If(ATR.atr_location, "")
|
||||
txtInfo.Text = If(ATR.atr_info, "")
|
||||
|
||||
DSID = ATR.atr_dsId
|
||||
togglePDFPic()
|
||||
txtDocNumber.Text = If(ATR.atr_documentNr, "")
|
||||
txtDocDatum._value = If(ATR.atr_austellungsdatum, "")
|
||||
txtKennzeichen.Text = If(ATR.atr_LKW, "")
|
||||
txtFiliale.Text = If(ATR.atr_FilialenNr > 0, ATR.atr_FilialenNr, "")
|
||||
txtAbfNr.Text = If(ATR.atr_AbfertigungsNr > 0, ATR.atr_AbfertigungsNr, "")
|
||||
|
||||
sbAvisoSuche.SET_VALUE(ATR.atr_SendungsId)
|
||||
|
||||
If ATR.atr_erhalenDatum IsNot Nothing Then
|
||||
txtErhaltenDatum._value = CDate(ATR.atr_erhalenDatum).ToShortDateString
|
||||
txtErhaltenUhrzeit._value = CDate(ATR.atr_erhalenDatum).ToShortTimeString
|
||||
End If
|
||||
|
||||
txtErhaltenReferenz.Text = If(ATR.atr_DHL_ReferenzNr, "")
|
||||
Select Case If(ATR.atr_erhalten_Art, "")
|
||||
Case "PAKETDIENST" : cbxKurierPaketdienst.Checked = True
|
||||
Case "MOTORRAD" : cbxKurierMotorrad.Checked = True
|
||||
End Select
|
||||
End Sub
|
||||
Sub getValues()
|
||||
|
||||
ATR.atr_documentNr = txtDocNumber.Text
|
||||
ATR.atr_austellungsdatum = txtDocDatum._value
|
||||
'ATR.atr_erfassungsdatum = Now
|
||||
ATR.atr_absender = txtAbsender.KdName
|
||||
ATR.atr_absenderkdnr = txtAbsender.KdNr
|
||||
ATR.atr_empfaenger = txtEmpfaenger.KdName
|
||||
ATR.atr_empfaengerkdnr = txtEmpfaenger.KdNr
|
||||
ATR.atr_location = txtLocation.Text
|
||||
ATR.atr_info = txtInfo.Text
|
||||
ATR.atr_dsId = DSID
|
||||
If txtFiliale._value <> "" Then ATR.atr_FilialenNr = txtFiliale._value
|
||||
If txtAbfNr._value <> "" Then ATR.atr_AbfertigungsNr = txtAbfNr._value
|
||||
ATR.atr_LKW = txtKennzeichen.Text
|
||||
|
||||
ATR.atr_SendungsId = sbAvisoSuche._value
|
||||
If sbAvisoSuche._value <> "" Then
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
ATR.atr_AvisoId = SQL.DLookup("tblSnd_AvisoId", "tblSendungen", " tblSnd_SendungID='" & sbAvisoSuche._value & "'", "AVISO", -1)
|
||||
End If
|
||||
|
||||
|
||||
|
||||
If txtErhaltenDatum._value <> "" Then
|
||||
If txtErhaltenUhrzeit._value <> "" Then
|
||||
ATR.atr_erhalenDatum = CDate(txtErhaltenDatum._value & " " & txtErhaltenUhrzeit._value)
|
||||
Else
|
||||
ATR.atr_erhalenDatum = CDate(txtErhaltenDatum._value)
|
||||
End If
|
||||
End If
|
||||
ATR.atr_DHL_ReferenzNr = txtErhaltenReferenz.Text
|
||||
|
||||
If cbxKurierPaketdienst.Checked Then ATR.atr_erhalten_Art = "PAKETDIENST"
|
||||
If cbxKurierMotorrad.Checked Then ATR.atr_erhalten_Art = "MOTORRAD"
|
||||
|
||||
|
||||
End Sub
|
||||
Private Sub frmATR_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
txtAbsender.initKdBox(Me)
|
||||
|
||||
txtEmpfaenger.initKdBox(Me)
|
||||
|
||||
'sbAvisoSuche.initSearchBox(Me.FindForm, " [tblSnd_SendungID],LKW_Nr,[tblSnd_Empfaenger],[tblSnd_Absender],[tblSnd_Colli],[tblSnd_Gewicht],FilialenNr,AbfertigungsNr,[Code]+' - ' +[Description] as display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200)
|
||||
' sbAvisoSuche.initSearchBox(Me.FindForm, " [tblSnd_SendungID] ,Datum as Erfasst,LKW_Nr,[tblSnd_Empfaenger],[tblSnd_Absender],[tblSnd_Colli],[tblSnd_Gewicht],FilialenNr,AbfertigungsNr FROM tblSendungen inner join Aviso on AvisoID=tblSnd_AvisoID ", {"LKW_Nr", "tblSnd_Empfaenger", "tblSnd_Absender"}, " (Datum >= '" & Now.AddDays(-30).ToShortDateString & "') ", "Datum DESC", "tblSnd_SendungID", "Datum as Erfasst,LKW_Nr,[tblSnd_Empfaenger],[tblSnd_Absender],[tblSnd_Colli],[tblSnd_Gewicht],FilialenNr,AbfertigungsNr", "AVISO", False, 600, 300)
|
||||
sbAvisoSuche.initSearchBox(Me.FindForm, " [tblSnd_SendungID] ,Datum as Erfasst,LKW_Nr,[tblSnd_Empfaenger],[tblSnd_Absender],[tblSnd_Colli],[tblSnd_Gewicht],FilialenNr,AbfertigungsNr,LKW_Nr + ' ' +cast(FilialenNr as varchar(4)) +'/'+cast(AbfertigungsNr as varchar(8))as display FROM tblSendungen inner join Aviso on AvisoID=tblSnd_AvisoID ", {"LKW_Nr", "tblSnd_Empfaenger", "tblSnd_Absender"}, " Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' /* AND (Datum >= '" & Now.AddDays(-30).ToShortDateString & "') */ ", " Datum DESC", "tblSnd_SendungID", "display", "AVISO", False, 600, 300)
|
||||
|
||||
|
||||
If ATR IsNot Nothing Then
|
||||
loadValues()
|
||||
Else
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
|
||||
txtLocation.Text = "VERIMEX"
|
||||
End If
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "VRR" Then
|
||||
txtLocation.Text = "VERRECHNUNG"
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
AddHandler txtAbsender.PropertyChanged, Sub()
|
||||
FlatButton4.BackgroundImage = IIf(txtAbsender.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
|
||||
' ATR.atr_absender = txtAbsender.Text
|
||||
' ATR.atr_absenderKdNr = txtAbsender.KdNr
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
AddHandler txtEmpfaenger.PropertyChanged, Sub()
|
||||
FlatButton4.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv)
|
||||
'ATR.atr_empfaenger = txtEmpfaenger.Text
|
||||
'ATR.atr_empfaengerKdNr = txtEmpfaenger.KdNr
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
togglePDFPic()
|
||||
End Sub
|
||||
|
||||
Sub togglePDFPic()
|
||||
If DSID > 0 Then
|
||||
PictureBox1.BackgroundImage = My.Resources.pdf
|
||||
Else
|
||||
PictureBox1.BackgroundImage = My.Resources.pdf_gray
|
||||
End If
|
||||
End Sub
|
||||
Private Sub FlatButton4_Click(sender As Object, e As EventArgs) Handles FlatButton4.Click
|
||||
If txtAbsender.KdNr > 0 Then
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim zoll As New SDL.frmKundenUebersichtZOLL(txtAbsender.KdNr)
|
||||
If zoll IsNot Nothing Then zoll.Show()
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
End If
|
||||
End Sub
|
||||
Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
|
||||
If txtEmpfaenger.KdNr > 0 Then
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
Dim zoll As New SDL.frmKundenUebersichtZOLL(txtEmpfaenger.KdNr)
|
||||
If zoll IsNot Nothing Then zoll.Show()
|
||||
|
||||
Me.Cursor = Cursors.Default
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub sbAvisoSuche_TextChanged() Handles sbAvisoSuche.VALUE_CHANGED
|
||||
txtFiliale.Text = ""
|
||||
txtAbfNr.Text = ""
|
||||
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(sbAvisoSuche._value)
|
||||
If SND IsNot Nothing Then
|
||||
Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(SND.tblSnd_AvisoID)
|
||||
txtFiliale.Text = SND.FilialenNr
|
||||
txtAbfNr.Text = SND.AbfertigungsNr
|
||||
lblLKWId.Text = SND.tblSnd_AvisoID
|
||||
If AVISO IsNot Nothing Then
|
||||
txtKennzeichen.Text = AVISO.LKW_Nr
|
||||
End If
|
||||
' lblKennzeichen.Visible = True
|
||||
lblLKWId.Visible = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub btnScan_Click(sender As Object, e As EventArgs) Handles btnScan.Click
|
||||
quickScan()
|
||||
togglePDFPic()
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
|
||||
If DSID > 0 Then
|
||||
Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(DSID)
|
||||
If path <> "" Then Process.Start(path)
|
||||
'VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.OPEN_PATH(DSID)
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click
|
||||
addData_AnhangFD()
|
||||
togglePDFPic()
|
||||
End Sub
|
||||
|
||||
Public Sub addData_AnhangFD()
|
||||
Dim fd As New OpenFileDialog
|
||||
fd.Multiselect = False
|
||||
|
||||
If fd.ShowDialog = vbOK Then
|
||||
' For Each F_listItem In fd.FileNames
|
||||
|
||||
Dim fi As New FileInfo(fd.FileName)
|
||||
Dim filename = fi.Name
|
||||
If filename = "" Then
|
||||
MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & fd.FileName)
|
||||
Else
|
||||
|
||||
' Dim TMP_Path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(filename, fi.Extension,, False, "SendungsAnhaenge")
|
||||
' MsgBox(TMP_Path)
|
||||
' File.Copy(F_listItem, TMP_Path)
|
||||
Dim anhId = -1
|
||||
Dim destPath = ""
|
||||
|
||||
Dim Typ = ""
|
||||
If getFileTypeValid(fi.Extension.Replace(".", ""), Typ) Then
|
||||
If saveToDS(filename, fd.FileName, "ATR", Typ, DSID, anhId, destPath) Then
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
'Next
|
||||
' If flpnlAviso.Controls.Count > 0 Then DirectCast(flpnlAviso.Controls(0), usrCntlSendungAnhangElement).CLICK_Me()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Shared Function getFileTypeValid(extension, ByRef Typ) As Boolean
|
||||
Select Case extension.ToString.Replace(".", "").ToUpper
|
||||
Case "PDF" : Typ = "PDF"
|
||||
Case "XLS", "XLM", "XLSM", "XLSX", "CSV" : Typ = "EXCEL"
|
||||
Case "DOC", "DOCX" : Typ = "WORD"
|
||||
Case "TXT" : Typ = "TEXT"
|
||||
Case "JPEG", "JPG", "GIF", "TFF" : Typ = "BILD"
|
||||
Case "EXE" : MsgBox("Aviso-Anhänge: Ungültiges Datei-Format!") : Return False
|
||||
Case Else : Typ = "SONSTIGES"
|
||||
End Select
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Public Shared Function saveToDS(ByRef fileName, sourcePath, Art, Typ, Optional ByRef da_id = -1, Optional ByRef anhId = -1, Optional ByRef destPath = "", Optional SendungsId = Nothing) As Boolean
|
||||
fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName)
|
||||
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "ORIGINAL_ATR_ARCHIV", Now.Year, Now.ToString("ddMMyy"), "", Now.ToString("ddMMyyHHmmss") & fileName, -1, False)
|
||||
If Not DS.uploadDataToDATENSERVER(sourcePath) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
|
||||
If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
|
||||
|
||||
da_id = DS.da_id
|
||||
destPath = DS.GET_TOP1_PATH
|
||||
Dim fi As New FileInfo(sourcePath)
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Public Function quickScan(Optional SendungsId = Nothing) As Boolean
|
||||
Try
|
||||
'If KdNr < 0 Then Exit Sub
|
||||
Dim frmScan As New VERAG_PROG_ALLGEMEIN.frmScan("QuickScan")
|
||||
frmScan.DefaultFileName = "ScanATR" & Now.ToString("ddMMyyyy_HHmmss") ' Me._TEXT_PDF
|
||||
|
||||
If frmScan.ShowDialog() = DialogResult.OK Then
|
||||
If frmScan.ReturnValue IsNot Nothing Then
|
||||
Dim Filename = frmScan.fileName
|
||||
Dim TMP_Path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(Filename, ".pdf",, False, "SendungsAnhaenge")
|
||||
File.WriteAllBytes(TMP_Path, frmScan.ReturnValue)
|
||||
|
||||
Dim anhId = -1
|
||||
Dim destPath = ""
|
||||
If saveToDS(Filename, TMP_Path, "ATR", "PDF", DSID, anhId, destPath, SendungsId) Then
|
||||
Return True
|
||||
End If
|
||||
'addUsrcnlToPnl(TMP_Path)
|
||||
End If
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan")
|
||||
End Try
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
Dim data As IDataObject = Clipboard.GetDataObject
|
||||
If True Then 'data.GetDataPresent(DataFormats.FileDrop) Then
|
||||
For Each s As String In My.Computer.Clipboard.GetFileDropList() 'GetData(DataFormats.) 'data.GetData(DataFormats.FileDrop) 'DataFormats.FileDrop)
|
||||
' Dim F_listItem As String = Path.Combine("c:\mynewpath", Path.GetFileName(s))
|
||||
' File.Copy(s, newFile)
|
||||
' MsgBox(s)
|
||||
If System.IO.File.Exists(s) Then
|
||||
|
||||
Dim fi As New FileInfo(s)
|
||||
Dim filename = fi.Name
|
||||
If filename = "" Then
|
||||
MsgBox("Dateiname konnte nicht ermittelt werden." & vbNewLine & s)
|
||||
Else
|
||||
|
||||
Dim anhId = -1
|
||||
Dim destPath = ""
|
||||
|
||||
Dim Typ = ""
|
||||
If getFileTypeValid(fi.Extension.Replace(".", ""), Typ) Then
|
||||
If saveToDS(filename, s, "ATR", Typ, DSID, anhId, destPath) Then
|
||||
MsgBox("Dokument wurde hochgeladen.")
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
||||
End If
|
||||
togglePDFPic()
|
||||
End Sub
|
||||
|
||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
||||
txtLocation.Text = "VERIMEX"
|
||||
End Sub
|
||||
|
||||
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
txtLocation.Text = "VERRECHNUNG"
|
||||
End Sub
|
||||
|
||||
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
|
||||
txtLocation.Text = "FRONT-OFFICE"
|
||||
End Sub
|
||||
|
||||
Private Sub Panel1_DragDrop(sender As Object, e As DragEventArgs) Handles Panel1.DragDrop, PictureBox1.DragDrop
|
||||
|
||||
Try
|
||||
Dim added = False
|
||||
|
||||
If e.Data.GetDataPresent(DataFormats.FileDrop) Then
|
||||
Dim files() As String = e.Data.GetData(DataFormats.FileDrop)
|
||||
|
||||
If files.Count > 1 Then
|
||||
MsgBox("Nur eine Datei möglich!")
|
||||
ElseIf files.Count > 0 Then
|
||||
If files(0) <> "" Then
|
||||
Dim fio As New System.IO.FileInfo(files(0))
|
||||
If saveToDS(fio.Name, files(0), "ATR", "", DSID) Then
|
||||
MsgBox("Dokument wurde hochgeladen.")
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
|
||||
Dim FilePath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.EmAilAttach(e)
|
||||
If FilePath <> "" Then
|
||||
Dim fio As New System.IO.FileInfo(FilePath)
|
||||
If saveToDS(fio.Name, FilePath, "ATR", "", DSID) Then
|
||||
MsgBox("Dokument wurde hochgeladen.")
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
togglePDFPic()
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click
|
||||
Dim webAddress As String = "https://wiki.verag.ag/de/software/aviso/howtos/ATRArchiv"
|
||||
Process.Start(webAddress)
|
||||
End Sub
|
||||
End Class
|
||||
1238
SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.Designer.vb
generated
1238
SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,6 @@
|
||||
Public Class frmOriginalArchiv_ATR
|
||||
Imports javax.smartcardio
|
||||
|
||||
Public Class frmOriginalArchiv_ATR
|
||||
|
||||
|
||||
|
||||
@@ -7,10 +9,9 @@
|
||||
|
||||
Dim JAHR As Date = CDate("01.01." & Now.Year)
|
||||
|
||||
Public SendungKoppeln As Boolean = False
|
||||
Public SendungsId As Integer = -1
|
||||
|
||||
' Dim bindPOST As New cEasyBinding("FMZOLL")
|
||||
Dim bindPOST As New cEasyBinding("FMZOLL")
|
||||
Dim myTable As New DataTable
|
||||
Private Sub frmVorauskasse_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
|
||||
Me.Top = 0
|
||||
@@ -30,7 +31,7 @@
|
||||
Case Else
|
||||
QSwhere = " AND mit_firma <> 'IMEX' "
|
||||
End Select
|
||||
|
||||
If SendungKoppeln Then btnSendungKoppeln.Visible = True
|
||||
|
||||
' cboSachbearbeiterQS.fillWithSQL("SELECT ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & QSwhere & " ORDER BY Name ", False, "FMZOLL", True)
|
||||
|
||||
@@ -47,30 +48,24 @@
|
||||
End Select
|
||||
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' " & where & " ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "IMEX"
|
||||
'cboFiliale._allowedValuesFreiText = {"5501"}
|
||||
cboFiliale.changeItem("5501")
|
||||
Case "ATILLA"
|
||||
cboFiliale._allowedValuesFreiText = {"4801"}
|
||||
cboFiliale.changeItem("4801")
|
||||
cboFiliale.Enabled = False
|
||||
Case "AMBAR"
|
||||
cboFiliale._allowedValuesFreiText = {"5701"}
|
||||
cboFiliale.changeItem("5701")
|
||||
cboFiliale.Enabled = False
|
||||
End Select
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
' Case "IMEX"
|
||||
' 'cboFiliale._allowedValuesFreiText = {"5501"}
|
||||
' cboFiliale.changeItem("5501")
|
||||
' Case "ATILLA"
|
||||
' cboFiliale._allowedValuesFreiText = {"4801"}
|
||||
' cboFiliale.changeItem("4801")
|
||||
' 'cboFiliale.Enabled = False
|
||||
' Case "AMBAR"
|
||||
' cboFiliale._allowedValuesFreiText = {"5701"}
|
||||
' cboFiliale.changeItem("5701")
|
||||
' 'cboFiliale.Enabled = False
|
||||
'End Select
|
||||
|
||||
cboSachbearbeiterQS.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
|
||||
" FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_abteilung='QS' AND [mit_gekuendigt]=0 " & QSwhere & " order by name", False, "ADMIN", True)
|
||||
|
||||
btnMonat.PerformClick()
|
||||
btnSuche.PerformClick()
|
||||
bindPOST.updateImmediately = True
|
||||
AddHandler bindPOST.bindingdataTable.ColumnChanged, Sub(send As Object, ev As DataColumnChangeEventArgs)
|
||||
btn.PerformClick() 'geht anders nicht ??
|
||||
|
||||
End Sub
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -124,6 +119,7 @@
|
||||
End Sub
|
||||
|
||||
Dim biningInit = False
|
||||
|
||||
Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
|
||||
@@ -132,22 +128,14 @@
|
||||
|
||||
|
||||
' bindPOST = New cEasyBinding("FMZOLL")
|
||||
sqlstr &= " SELECT " & TopMax & " [post_id],[post_Datum],[post_FilialenNr],[post_AbfertigungsNr],[post_art],[post_Empfaenger_KdNr],[post_Empfaenger_Name1],post_Empfaenger_Adresse1 + ' ' + post_Empfaenger_Adresse2 + ' ' + post_Empfaenger_Adresse3 as Adresse,[post_ContainerLKWNr],[post_FirmaInAuftragKdnr],[post_FirmaInAuftrag],[post_Sachbearbeiter],[post_ReferenzPaketdienst],[post_KdAuftrNrAvisierer],[post_RgEmpfaenger_Name] FROM [tblPostversand] WHERE 1=1 "
|
||||
sqlstr &= " SELECT " & TopMax & " atr_id,atr_documentNr, atr_austellungsdatum, atr_FilialenNr, atr_AbfertigungsNr, atr_LKW,atr_EmpfaengerKdNr, atr_Empfaenger, atr_AbsenderKdNr,atr_Absender, atr_Sachbearbeiter,atr_DHL_ReferenzNr FROM [tblOriginalATR] WHERE 1=1 "
|
||||
|
||||
With MyDatagridview1
|
||||
' .DataSource = myTable
|
||||
'.SET_SQL(sqlstr & getVorauskasseWhere() & " ORDER BY post_Datum desc ", "FMZOLL", getVorauskasseList)
|
||||
' .LOAD()
|
||||
'bindPOST.bindingdataSet.Tables(0) = New DataTable
|
||||
bindPOST.initBinding(sqlstr & getVorauskasseWhere() & " ORDER BY post_Datum desc", "tblPostversand", getVorauskasseList)
|
||||
.DataSource = bindPOST.bindingdataTable
|
||||
.SET_SQL(sqlstr & getWhere() & " ORDER BY atr_austellungsdatum desc", "FMZOLL", getList)
|
||||
.LOAD()
|
||||
|
||||
lblErgebnis.Text = "Ergebnisse: " & .Rows.Count
|
||||
|
||||
'If Not biningInit Then
|
||||
' biningInit = True
|
||||
|
||||
'End If
|
||||
|
||||
' setDGVOptions()
|
||||
End With
|
||||
showDGV()
|
||||
@@ -157,50 +145,65 @@
|
||||
End Sub
|
||||
|
||||
|
||||
Function getVorauskasseWhere() As String
|
||||
Function getWhere() As String
|
||||
Dim sqlstr = ""
|
||||
|
||||
If txtAbfertDat.Text <> "" Then
|
||||
If txtAbfertDatBis.Text <> "" Then
|
||||
sqlstr &= " AND ([post_Datum] BETWEEN @Datum AND @DatumBis) "
|
||||
sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @DatumBis) "
|
||||
Else
|
||||
sqlstr &= " AND ([post_Datum] BETWEEN @Datum AND @Datum ) "
|
||||
sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @Datum ) "
|
||||
End If
|
||||
End If
|
||||
|
||||
If txtSuche._value <> "" Then
|
||||
sqlstr &= " AND ( "
|
||||
sqlstr &= " atr_documentNr LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_absender LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_empfaenger LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_DHL_ReferenzNr LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_LKW LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_location LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_info LIKE '" & txtSuche._value & "%' OR "
|
||||
sqlstr &= " atr_DHL_ReferenzNr LIKE '" & txtSuche._value & "%' "
|
||||
sqlstr &= " ) "
|
||||
End If
|
||||
|
||||
If txtAbfertigungsnummer.Text <> "" Then
|
||||
' If txtAbfertigungsnummerBis.Text <> "" Then
|
||||
'sqlstr &= " AND ([vk_AbfertigungsNr] BETWEEN @AbfertigungsNr AND @AbfertigungsNr_bis ) "
|
||||
'Else
|
||||
'sqlstr &= " AND vk_AbfertigungsNr LIKE @AbfertigungsNr "
|
||||
'End If
|
||||
sqlstr &= " AND post_AbfertigungsNr LIKE @AbfertigungsNr "
|
||||
sqlstr &= " AND atr_AbfertigungsNr LIKE @AbfertigungsNr "
|
||||
End If
|
||||
' If txtUnterNr.Text <> "" Then sqlstr &= " AND [UnterNr] LIKE @UnterNr "
|
||||
If cboFiliale._value <> "" Then sqlstr &= " AND [post_FilialenNr] LIKE @FilialenNr "
|
||||
If cboFiliale._value <> "" Then sqlstr &= " AND [atr_FilialenNr] LIKE @FilialenNr "
|
||||
|
||||
If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [post_SachbearbeiterId] = @PersonalnummerQS "
|
||||
If MyTextBox1.Text <> "" Then sqlstr &= " AND [post_ContainerLKWNr] LIKE @LKW "
|
||||
If txtFirma.Text <> "" Then sqlstr &= " AND [post_Empfaenger_Name1] LIKE @Firma "
|
||||
If txtInAuftrag.Text <> "" Then sqlstr &= " AND [post_FirmaInAuftrag] LIKE @InAuftrag "
|
||||
If txtSB._value <> "" Then sqlstr &= " AND [atr_mitId] = @PersonalnummerQS "
|
||||
If txtLKWKennzeichen.Text <> "" Then sqlstr &= " AND [atr_LKW] LIKE @LKW "
|
||||
If txtFEmpfänger.Text <> "" Then sqlstr &= " AND [atr_empfaenger] LIKE @Empfaenger "
|
||||
If txtAbsender.Text <> "" Then sqlstr &= " AND [atr_absender] LIKE @Absender "
|
||||
If txtDocumetNummer.Text <> "" Then sqlstr &= " AND [atr_documentNr] LIKE @DocumentNummer "
|
||||
|
||||
If txtReferenz.Text <> "" Then sqlstr &= " AND [post_ReferenzPaketdienst] LIKE @Referenz "
|
||||
If txtReferenz.Text <> "" Then sqlstr &= " AND [atr_DHL_ReferenzNr] LIKE @Referenz "
|
||||
|
||||
Return sqlstr
|
||||
End Function
|
||||
Function getVorauskasseList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
Function getList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum", txtAbfertDat.Text & " 00:00:00"))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DatumBis", txtAbfertDatBis.Text & " 23:59:59"))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AbfertigungsNr", txtAbfertigungsnummer.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocumentNummer", txtDocumetNummer.Text.Replace("*", "%")))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", cboFiliale._value))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerQS", cboSachbearbeiterQS._value))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKW", MyTextBox1.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", txtFirma.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("InAuftrag", txtInAuftrag.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerQS", txtSB._value))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKW", txtLKWKennzeichen.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Absender", txtAbsender.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Empfaenger", txtFEmpfänger.Text.Replace("*", "%")))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Referenz", txtReferenz.Text.Replace("*", "%")))
|
||||
|
||||
Return list
|
||||
@@ -218,51 +221,46 @@
|
||||
.MultiSelect = False
|
||||
|
||||
|
||||
.Columns("post_id").Visible = False
|
||||
.Columns("post_art").Visible = False
|
||||
.Columns("post_KdAuftrNrAvisierer").Visible = False
|
||||
.Columns("post_RgEmpfaenger_Name").Visible = False
|
||||
.Columns("atr_id").Visible = False
|
||||
' .Columns("post_art").Visible = False
|
||||
' .Columns("post_KdAuftrNrAvisierer").Visible = False
|
||||
' .Columns("atr_EmpfaengerKdNr").Visible = False
|
||||
' .Columns("atr_AbsenderKdNr").Visible = False
|
||||
|
||||
.Columns("post_FilialenNr").Width = 45
|
||||
.Columns("post_FilialenNr").HeaderText = "Filiale"
|
||||
.Columns("post_FilialenNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("post_AbfertigungsNr").Width = 80
|
||||
.Columns("post_AbfertigungsNr").HeaderText = "Abf-Nr"
|
||||
.Columns("post_AbfertigungsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("post_Datum").Width = 100
|
||||
.Columns("post_Datum").HeaderText = "Datum"
|
||||
.Columns("post_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("atr_FilialenNr").Width = 45
|
||||
.Columns("atr_FilialenNr").HeaderText = "Filiale"
|
||||
.Columns("atr_FilialenNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("atr_AbfertigungsNr").Width = 80
|
||||
.Columns("atr_AbfertigungsNr").HeaderText = "Abf-Nr"
|
||||
.Columns("atr_AbfertigungsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("atr_documentNr").Width = 120
|
||||
.Columns("atr_documentNr").HeaderText = "ATR-Nr"
|
||||
.Columns("atr_documentNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
.Columns("atr_austellungsdatum").Width = 100
|
||||
.Columns("atr_austellungsdatum").HeaderText = "Datum"
|
||||
.Columns("atr_austellungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
|
||||
|
||||
.Columns("post_ContainerLKWNr").Width = 120
|
||||
.Columns("post_ContainerLKWNr").HeaderText = "LKW Kennz."
|
||||
.Columns("atr_LKW").Width = 120
|
||||
.Columns("atr_LKW").HeaderText = "LKW Kennz."
|
||||
|
||||
|
||||
|
||||
.Columns("post_Empfaenger_KdNr").HeaderText = "KdNr"
|
||||
.Columns("post_Empfaenger_KdNr").Width = 50
|
||||
.Columns("post_Empfaenger_Name1").HeaderText = "Empfänger"
|
||||
.Columns("post_Empfaenger_Name1").Width = 150
|
||||
.Columns("Adresse").HeaderText = "Adresse"
|
||||
.Columns("Adresse").Width = 150
|
||||
.Columns("atr_EmpfaengerKdNr").HeaderText = "KdNr"
|
||||
.Columns("atr_EmpfaengerKdNr").Width = 50
|
||||
.Columns("atr_Empfaenger").HeaderText = "Empfänger"
|
||||
.Columns("atr_Empfaenger").Width = 150
|
||||
|
||||
.Columns("post_FirmaInAuftragKdnr").HeaderText = "KdNr"
|
||||
.Columns("post_FirmaInAuftragKdnr").Width = 50
|
||||
.Columns("post_FirmaInAuftrag").HeaderText = "in Auftrag"
|
||||
.Columns("post_FirmaInAuftrag").Width = 150
|
||||
.Columns("atr_AbsenderKdNr").HeaderText = "KdNr"
|
||||
.Columns("atr_AbsenderKdNr").Width = 50
|
||||
.Columns("atr_Absender").HeaderText = "in Auftrag"
|
||||
.Columns("atr_Absender").Width = 150
|
||||
|
||||
.Columns("post_Sachbearbeiter").MinimumWidth = 100
|
||||
.Columns("post_Sachbearbeiter").HeaderText = "Sachb."
|
||||
.Columns("atr_Sachbearbeiter").MinimumWidth = 100
|
||||
.Columns("atr_Sachbearbeiter").HeaderText = "Sachb."
|
||||
|
||||
.Columns("post_ReferenzPaketdienst").HeaderText = "Referenz Paketdienst"
|
||||
.Columns("post_ReferenzPaketdienst").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("atr_DHL_ReferenzNr").HeaderText = "Referenz Paketdienst"
|
||||
.Columns("atr_DHL_ReferenzNr").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
For Each c As DataGridViewColumn In .Columns
|
||||
If c.Name = "post_ReferenzPaketdienst" Then
|
||||
c.ReadOnly = False
|
||||
Else
|
||||
c.ReadOnly = True
|
||||
End If
|
||||
Next
|
||||
|
||||
End With
|
||||
End Sub
|
||||
@@ -345,9 +343,9 @@
|
||||
Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click
|
||||
|
||||
If MyDatagridview1.SelectedRows.Count > 0 Then
|
||||
Dim VK As New VERAG_PROG_ALLGEMEIN.cPostversand(MyDatagridview1.SelectedRows(0).Cells("post_id").Value)
|
||||
Dim ATR As New VERAG_PROG_ALLGEMEIN.cOrigianlATR(MyDatagridview1.SelectedRows(0).Cells("atr_id").Value)
|
||||
If vbYes <> MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then Exit Sub
|
||||
VK.DELETE()
|
||||
ATR.DELETE()
|
||||
btnSuche.PerformClick()
|
||||
|
||||
'MyDatagridview1.RELOAD()
|
||||
@@ -360,17 +358,62 @@
|
||||
Private Sub gridAviso_DoubleClick(sender As Object, e As System.EventArgs) Handles MyDatagridview1.DoubleClick
|
||||
If MyDatagridview1.SelectedRows.Count = 0 And MyDatagridview1.SelectedRows.Count = 0 Then Exit Sub
|
||||
|
||||
Dim kdnr = MyDatagridview1.SelectedRows(0).Cells("post_Empfaenger_KdNr").Value
|
||||
SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnr, {kdnr, Nothing, Nothing, Nothing, "", MyDatagridview1.SelectedRows(0).Cells("post_id").Value})
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen)
|
||||
Dim atr_id = MyDatagridview1.SelectedRows(0).Cells("atr_id").Value
|
||||
Dim f As New frmATR(atr_id)
|
||||
f.ShowDialog(Me)
|
||||
btnSuche.PerformClick()
|
||||
End Sub
|
||||
|
||||
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
|
||||
bindPOST.updateBinding() ' geht nur mit dem Umweg über Button
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
Dim f As New frmATR
|
||||
f.ShowDialog(Me)
|
||||
btnSuche.PerformClick()
|
||||
End Sub
|
||||
|
||||
Private Sub txtSuche_TextChanged(sender As Object, e As EventArgs) Handles txtSuche.TextChanged
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown
|
||||
If e.KeyCode = Keys.Return Then
|
||||
btnSuche.PerformClick()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSendungKoppeln.Click
|
||||
If MyDatagridview1.SelectedRows.Count > 0 Then
|
||||
Dim ATR = New VERAG_PROG_ALLGEMEIN.cOrigianlATR(MyDatagridview1.SelectedRows(0).Cells("atr_id").Value)
|
||||
If ATR IsNot Nothing Then
|
||||
|
||||
If vbYes = MsgBox("ATR in Anhang speichern?", vbYesNoCancel) Then
|
||||
If ATR.atr_dsId < 0 Then MsgBox("Kein PDF-Anhang!") : Exit Sub
|
||||
Dim ANH = New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(ATR.atr_anhID)
|
||||
ANH.anh_SendungsId = SendungsId
|
||||
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)
|
||||
ANH.anh_AvisoId = SND.tblSnd_AvisoID
|
||||
ANH.anh_docId = ATR.atr_dsId
|
||||
ANH.anh_Name = "ATR_ARCHIV"
|
||||
ANH.anh_Typ = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getFilePathTypeValid(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ATR.atr_dsId))
|
||||
ANH.anh_Art = "ATR"
|
||||
If ANH.SAVE() Then 'Eintrag wird überschreiben
|
||||
ATR.atr_anhID = ANH.anh_id
|
||||
ATR.atr_SendungsId = SendungsId
|
||||
ATR.atr_AvisoId = SND.tblSnd_AvisoID
|
||||
ATR.atr_FilialenNr = SND.FilialenNr
|
||||
ATR.atr_AbfertigungsNr = SND.AbfertigungsNr
|
||||
If ATR.SAVE() Then
|
||||
Me.Close()
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click
|
||||
Dim webAddress As String = "https://wiki.verag.ag/de/software/aviso/howtos/ATRArchiv"
|
||||
Process.Start(webAddress)
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
@@ -784,6 +784,12 @@
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="OriginalArchiv_ATR\frmATR.Designer.vb">
|
||||
<DependentUpon>frmATR.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="OriginalArchiv_ATR\frmATR.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="OriginalArchiv_ATR\frmOriginalArchiv_ATR.Designer.vb">
|
||||
<DependentUpon>frmOriginalArchiv_ATR.vb</DependentUpon>
|
||||
</Compile>
|
||||
@@ -3179,6 +3185,9 @@
|
||||
<DependentUpon>usrCntlSDLLeistungVERAGCardNEU.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="My Project\licenses.licx" />
|
||||
<EmbeddedResource Include="OriginalArchiv_ATR\frmATR.resx">
|
||||
<DependentUpon>frmATR.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="OriginalArchiv_ATR\frmOriginalArchiv_ATR.resx">
|
||||
<DependentUpon>frmOriginalArchiv_ATR.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -4696,6 +4705,7 @@
|
||||
<None Include="Resources\modaltrans_original.png" />
|
||||
<None Include="Resources\Verag-AG-Logo_DE.jpg" />
|
||||
<None Include="Resources\plose_truckmaster.png" />
|
||||
<None Include="Resources\pdf_s.png" />
|
||||
<Content Include="Resources\Verag_Customs_Service_AEO.jpg">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Public Class cGlobal
|
||||
Public Class cGlobal_WARUM_SIEHE_VERGPROGALLG
|
||||
Public ConnStrInfo As String
|
||||
Public ConnStr As String
|
||||
Public USRNAME As String
|
||||
|
||||
@@ -11,6 +11,8 @@ Public Class cOrigianlATR
|
||||
Property atr_mitId As Integer
|
||||
Property atr_absender As Object = Nothing
|
||||
Property atr_empfaenger As Object = Nothing
|
||||
Property atr_empfaengerkdnr As Integer = -1
|
||||
Property atr_absenderkdnr As Integer = -1
|
||||
Property atr_austellungsdatum As Object = Nothing
|
||||
Property atr_AvisoId As Object = Nothing
|
||||
Property atr_SendungsId As Object = Nothing
|
||||
@@ -19,12 +21,20 @@ Public Class cOrigianlATR
|
||||
Property atr_DHL_ReferenzNr As Object = Nothing
|
||||
Property atr_location As Object = Nothing
|
||||
Property atr_info As Object = Nothing
|
||||
Property atr_erhalenDatum As Object = Nothing
|
||||
Property atr_erhalten_Art As Object = Nothing
|
||||
Property atr_FilialenNr As Integer = -1
|
||||
Property atr_AbfertigungsNr As Integer = -1
|
||||
Property atr_anhID As Integer = -1
|
||||
|
||||
|
||||
Public hasEntry = False
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
Sub New()
|
||||
|
||||
End Sub
|
||||
Sub New(atr_id)
|
||||
Me.atr_id = atr_id
|
||||
LOAD()
|
||||
@@ -33,7 +43,6 @@ Public Class cOrigianlATR
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_id", atr_id,, True))
|
||||
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_documentNr", atr_documentNr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erfassungsdatum", atr_erfassungsdatum))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_Sachbearbeiter", atr_Sachbearbeiter))
|
||||
@@ -48,6 +57,15 @@ Public Class cOrigianlATR
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_DHL_ReferenzNr", atr_DHL_ReferenzNr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_location", atr_location))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_info", atr_info))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erhalenDatum", atr_erhalenDatum))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_erhalten_Art", atr_erhalten_Art))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_FilialenNr", atr_FilialenNr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_AbfertigungsNr", atr_AbfertigungsNr))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_absenderkdnr", atr_absenderkdnr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_empfaengerkdnr", atr_empfaengerkdnr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atr_anhID", atr_anhID))
|
||||
|
||||
|
||||
Return list
|
||||
End Function
|
||||
@@ -68,6 +86,12 @@ Public Class cOrigianlATR
|
||||
|
||||
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
|
||||
End Function
|
||||
Public Function DELETE() As Boolean
|
||||
|
||||
Dim sqlstr = " DELETE tblOriginalATR WHERE atr_id='" & atr_id & "'"
|
||||
|
||||
Return SQL.doSQL(sqlstr, "FMZOLL")
|
||||
End Function
|
||||
|
||||
Public Sub LOAD()
|
||||
Try
|
||||
|
||||
@@ -1455,13 +1455,20 @@ Public Class cSyska_Interface
|
||||
For Each r In dt.Rows
|
||||
|
||||
If KdNr = -1 OrElse r("KundenNrZentrale") = KdNr Then 'TEST!!
|
||||
Dim strRisiko = 0
|
||||
If r("Risiko") Is DBNull.Value Then strRisiko = Format(CDbl(r("Risiko")), fmt).Replace(",", ".")
|
||||
Dim strRisiko As String = "0"
|
||||
If r("Risiko") IsNot DBNull.Value Then strRisiko = CDbl(r("Risiko")).ToString.Replace(",", ".")
|
||||
|
||||
'If r("Risiko") IsNot DBNull.Value Then
|
||||
|
||||
' MsgBox(Format(CDbl(r("Risiko")), fmt).Replace(",", "."))
|
||||
'MsgBox(Format(CDbl(r("Risiko")), fmt))
|
||||
' MsgBox((CDbl(r("Risiko"))))
|
||||
'End If
|
||||
|
||||
SQL.doSQL("UPDATE [FIBU2].[dbo].[fibu_konto]
|
||||
SET [dec_wert3] = '" & strRisiko & "'
|
||||
WHERE ([i_firm_refid]=1 Or [i_firm_refid]=19)
|
||||
AND [c_kontoart]='DE'
|
||||
AND [c_kontoart]='DE'
|
||||
And [i_konto]=" & r("KundenNrZentrale") & " ", "FIBU")
|
||||
End If
|
||||
Next
|
||||
@@ -1490,7 +1497,7 @@ Public Class cSyska_Interface
|
||||
GROUP BY Adressen.Ordnungsbegriff, Adressen.LandKz, Adressen.AdressenNr, Kunden.KundenNrZentrale, Kunden.Abfertigungsverbot, Kunden.LfdSaldo, Kunden.UStV_SummeUmsatzsteuerbetragEUR,
|
||||
Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR, Kunden.BankgarantieBetrag, Kunden.BankgarantieGültigBis
|
||||
) as T1
|
||||
GROUP BY KundenNrZentrale, Risiko,LfdSaldo, BankgarantieBetrag, BankgarantieGültigBis"
|
||||
GROUP BY KundenNrZentrale, Risiko,LfdSaldo, BankgarantieBetrag, BankgarantieGültigBis "
|
||||
End Function
|
||||
|
||||
End Class
|
||||
|
||||
@@ -492,6 +492,23 @@ Public Class cProgramFunctions
|
||||
|
||||
End Sub
|
||||
|
||||
Public Shared Function getFilePathTypeValid(filePath) As String
|
||||
Dim fi As New FileInfo(filePath)
|
||||
Dim filename = fi.Name
|
||||
|
||||
Dim Typ = ""
|
||||
Select Case fi.Extension.ToString.Replace(".", "").ToUpper
|
||||
Case "PDF" : Typ = "PDF"
|
||||
Case "XLS", "XLM", "XLSM", "XLSX", "CSV" : Typ = "EXCEL"
|
||||
Case "DOC", "DOCX" : Typ = "WORD"
|
||||
Case "TXT" : Typ = "TEXT"
|
||||
Case "JPEG", "JPG", "GIF", "TFF" : Typ = "BILD"
|
||||
Case "EXE" : MsgBox("Aviso-Anhänge: Ungültiges Datei-Format!") : Return False
|
||||
Case Else : Typ = "SONSTIGES"
|
||||
End Select
|
||||
Return Typ
|
||||
End Function
|
||||
|
||||
Shared Function EmAilAttach(e As DragEventArgs) As String
|
||||
Try
|
||||
|
||||
|
||||
Reference in New Issue
Block a user