edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ADMIN' of https://dev.azure.com/VeragAG/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2025-04-24 17:07:56 +02:00
parent f24df16840 37fc5ad3ad
commit 690b97ab54
10 changed files with 483 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
initATLASAufschubkonten/cWorker_NCTS.vb
View File

@@ -4154,12 +4154,17 @@ Public Class cWorker_NCTS
End If
End Sub
Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String)
Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String, Optional Division3 As String = "")
If DY_TMP Is Nothing Then Exit Sub
'Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(DY_TMP.dy_BezugsNr)
If (DY_TMP.dy_BezugsNr.Contains("IRU0")) Then
' Dim fio As New IO.FileInfo(filePath)
' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", ""))
checkATEZIRU_BereitstellungBezugsNr(DY_TMP.dy_BezugsNr, filePath, Division3)
End Sub
Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String, Optional Division3 As String = "")
If dy_BezugsNr = "" Then Exit Sub
If (dy_BezugsNr.Contains("IRU0")) OrElse Division3 = "IRU" Then
Try
@@ -4170,32 +4175,15 @@ Public Class cWorker_NCTS
End If
Dim F As New System.IO.FileInfo(filePath)
' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", ""))
'Dim DY_server = "91.93.197.91"
'Dim DY_name = "Verag"
'Dim DY_pwd = "5P1PYOr1"
''Dim DY_name = "Verag-test"
''Dim DY_pwd = "A1ZDTK99"
'Dim DY_port = "22"
'Dim DY_PFAD_IN = ""
'Dim DY_PFAD_IN_KD = ""
Dim DY_server = "sftp-01.singlewindow.io"
Dim DY_name = "VERAG"
Dim DY_pwd = "5P1PYOr1"
'Dim DY_name = "Verag-test"
'Dim DY_pwd = "A1ZDTK99"
Dim DY_port = "22"
'Dim DY_PFAD_IN = "/TIR/DE/OUT"
Dim DY_PFAD_IN = "/"
Dim DY_PFAD_IN_KD = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
DY_server = "sftp-01.singlewindow.io"
'DY_name = "IRU-TEST"
'DY_pwd = "T1AF58OP"
DY_name = "VERAG-TEST"
DY_pwd = "A1ZDTK99"
End If
@@ -4223,6 +4211,8 @@ Public Class cWorker_NCTS
End If
End Sub
Shared Sub checkATEZ_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String)
If dy_BezugsNr = "" Then Exit Sub
Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr)
@@ -4235,63 +4225,63 @@ Public Class cWorker_NCTS
' End If
End If
End Sub
Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String)
If dy_BezugsNr = "" Then Exit Sub
Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr)
If (dy_BezugsNr.Contains("IRU0")) Then
' Dim fio As New IO.FileInfo(filePath)
' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", ""))
'Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String)
' If dy_BezugsNr = "" Then Exit Sub
' Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr)
' If (dy_BezugsNr.Contains("IRU0")) Then
' ' Dim fio As New IO.FileInfo(filePath)
' ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", ""))
Try
' Try
If Not System.IO.File.Exists(filePath) Then
' If Not System.IO.File.Exists(filePath) Then
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Exit Sub
End If
Dim F As New System.IO.FileInfo(filePath)
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name)
' Exit Sub
' End If
' Dim F As New System.IO.FileInfo(filePath)
'Dim DY_server = "91.93.197.91"
'Dim DY_name = "Verag"
'Dim DY_pwd = "5P1PYOr1"
''Dim DY_name = "Verag-test"
''Dim DY_pwd = "A1ZDTK99"
'Dim DY_port = "22"
'Dim DY_PFAD_IN = ""
'Dim DY_PFAD_IN_KD = ""
' 'Dim DY_server = "91.93.197.91"
' 'Dim DY_name = "Verag"
' 'Dim DY_pwd = "5P1PYOr1"
' ''Dim DY_name = "Verag-test"
' ''Dim DY_pwd = "A1ZDTK99"
' 'Dim DY_port = "22"
' 'Dim DY_PFAD_IN = ""
' 'Dim DY_PFAD_IN_KD = ""
Dim DY_server = "sftp-01.singlewindow.io"
Dim DY_name = "IRU-TEST"
Dim DY_pwd = "T1AF58OP"
'Dim DY_name = "Verag-test"
'Dim DY_pwd = "A1ZDTK99"
Dim DY_port = "22"
Dim DY_PFAD_IN = "/TIR/DE/OUT"
Dim DY_PFAD_IN_KD = ""
' Dim DY_server = "sftp-01.singlewindow.io"
' Dim DY_name = "IRU-TEST"
' Dim DY_pwd = "T1AF58OP"
' 'Dim DY_name = "Verag-test"
' 'Dim DY_pwd = "A1ZDTK99"
' Dim DY_port = "22"
' Dim DY_PFAD_IN = "/TIR/DE/OUT"
' Dim DY_PFAD_IN_KD = ""
'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY)
' 'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY)
Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd))
Using client = New Renci.SshNet.SftpClient(ConnectionInfo)
client.Connect()
If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN)
Using uplfileStream = System.IO.File.OpenRead(filePath)
client.UploadFile(uplfileStream, "." & F.Name, True)
client.RenameFile("." & F.Name, F.Name)
End Using
client.Disconnect()
End Using
' Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd))
' Using client = New Renci.SshNet.SftpClient(ConnectionInfo)
' client.Connect()
' If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN)
' Using uplfileStream = System.IO.File.OpenRead(filePath)
' client.UploadFile(uplfileStream, "." & F.Name, True)
' client.RenameFile("." & F.Name, F.Name)
' End Using
' client.Disconnect()
' End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Exit Sub
End Try
' Catch ex As Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
' Exit Sub
' End Try
End If
End Sub
' End If
'End Sub
Shared Sub checkATEZ_Bereitstellung_VBD(dy_BezugsNr As String, filePath As String)

1
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -454,7 +454,6 @@ Public Class frmDYNachrichtenVerarbeitung
'AES/EZA: Wiedervorlage zur Ausfuhr
If Not found And cGetMsgType.isAES_E_EXP_FUP_DEXPFE(doc) Then
MsgBox("HALLLO")
If readAES_E_EXP_FUP_DEXPFE(doc) <> "" Then found = True
End If

76
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -25,6 +25,8 @@ Partial Class frmStartOptions
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
Me.pnl = New System.Windows.Forms.Panel()
'Me.LinkLabel73 = New System.Windows.Forms.LinkLabel()
'Me.Button27 = New System.Windows.Forms.Button()
Me.txtMRNPrefix = New System.Windows.Forms.TextBox()
Me.ATCNRinRE = New System.Windows.Forms.LinkLabel()
Me.PictureBox24 = New System.Windows.Forms.PictureBox()
@@ -145,6 +147,7 @@ Partial Class frmStartOptions
Me.PictureBox15 = New System.Windows.Forms.PictureBox()
Me.PictureBox14 = New System.Windows.Forms.PictureBox()
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.MyTextBox06 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.CheckBox9 = New System.Windows.Forms.CheckBox()
Me.Label49 = New System.Windows.Forms.Label()
Me.Button28 = New System.Windows.Forms.Button()
@@ -274,6 +277,8 @@ Partial Class frmStartOptions
Me.LinkLabel3 = New System.Windows.Forms.LinkLabel()
Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel()
Me.lblRoutineManager = New System.Windows.Forms.Label()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
' Me.Label050 = New System.Windows.Forms.Label()
Me.Button21 = New System.Windows.Forms.Button()
Me.cbxPloseNeu = New System.Windows.Forms.CheckBox()
Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -354,6 +359,8 @@ Partial Class frmStartOptions
'
Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
'Me.pnl.Controls.Add(Me.LinkLabel73)
'Me.pnl.Controls.Add(Me.Button27)
Me.pnl.Controls.Add(Me.txtMRNPrefix)
Me.pnl.Controls.Add(Me.ATCNRinRE)
Me.pnl.Controls.Add(Me.PictureBox24)
@@ -433,9 +440,32 @@ Partial Class frmStartOptions
Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnl.Location = New System.Drawing.Point(0, 0)
Me.pnl.Name = "pnl"
Me.pnl.Size = New System.Drawing.Size(1229, 920)
Me.pnl.Size = New System.Drawing.Size(1229, 970)
Me.pnl.TabIndex = 0
'
'LinkLabel73
'
'Me.LinkLabel73.AutoSize = True
'Me.LinkLabel73.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
'Me.LinkLabel73.Location = New System.Drawing.Point(1023, 173)
'Me.LinkLabel73.Name = "LinkLabel73"
'Me.LinkLabel73.Size = New System.Drawing.Size(176, 13)
'Me.LinkLabel73.TabIndex = 160
'Me.LinkLabel73.TabStop = True
'Me.LinkLabel73.Text = "Rechnungsdetaildaten aktualisieren"
'
'Button27
'
'Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat
'Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
'Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
'Me.Button27.Location = New System.Drawing.Point(1076, 386)
'Me.Button27.Name = "Button27"
'Me.Button27.Size = New System.Drawing.Size(123, 24)
'Me.Button27.TabIndex = 161
'Me.Button27.Text = "Test Err Mail"
'Me.Button27.UseVisualStyleBackColor = True
'
'txtMRNPrefix
'
Me.txtMRNPrefix.Location = New System.Drawing.Point(1036, 48)
@@ -946,7 +976,7 @@ Partial Class frmStartOptions
Me.tbcntr.Controls.Add(Me.TabPage3)
Me.tbcntr.Controls.Add(Me.TabPage4)
Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom
Me.tbcntr.Location = New System.Drawing.Point(0, 416)
Me.tbcntr.Location = New System.Drawing.Point(0, 466)
Me.tbcntr.Name = "tbcntr"
Me.tbcntr.SelectedIndex = 0
Me.tbcntr.Size = New System.Drawing.Size(1227, 502)
@@ -1017,7 +1047,7 @@ Partial Class frmStartOptions
'
Me.LinkLabel68.AutoSize = True
Me.LinkLabel68.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.LinkLabel68.Location = New System.Drawing.Point(18, 393)
Me.LinkLabel68.Location = New System.Drawing.Point(743, 32)
Me.LinkLabel68.Name = "LinkLabel68"
Me.LinkLabel68.Size = New System.Drawing.Size(127, 13)
Me.LinkLabel68.TabIndex = 151
@@ -1028,7 +1058,7 @@ Partial Class frmStartOptions
'
Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image)
Me.PictureBox26.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox26.Location = New System.Drawing.Point(837, 32)
Me.PictureBox26.Location = New System.Drawing.Point(876, 32)
Me.PictureBox26.Name = "PictureBox26"
Me.PictureBox26.Size = New System.Drawing.Size(18, 18)
Me.PictureBox26.TabIndex = 141
@@ -1842,6 +1872,7 @@ Partial Class frmStartOptions
'
'TabPage3
'
Me.TabPage3.Controls.Add(Me.MyTextBox06)
Me.TabPage3.Controls.Add(Me.CheckBox9)
Me.TabPage3.Controls.Add(Me.Label49)
Me.TabPage3.Controls.Add(Me.Button28)
@@ -1874,6 +1905,31 @@ Partial Class frmStartOptions
Me.TabPage3.Text = "Partner-Systeme"
Me.TabPage3.UseVisualStyleBackColor = True
'
'MyTextBox06
'
Me.MyTextBox06._DateTimeOnly = False
Me.MyTextBox06._numbersOnly = False
Me.MyTextBox06._numbersOnlyKommastellen = ""
Me.MyTextBox06._numbersOnlyTrennzeichen = False
Me.MyTextBox06._Prozent = False
Me.MyTextBox06._ShortDateNew = False
Me.MyTextBox06._ShortDateOnly = False
Me.MyTextBox06._TimeOnly = False
Me.MyTextBox06._TimeOnly_Seconds = False
Me.MyTextBox06._value = "200"
Me.MyTextBox06._Waehrung = False
Me.MyTextBox06._WaehrungZeichen = False
Me.MyTextBox06.ForeColor = System.Drawing.Color.Black
Me.MyTextBox06.Location = New System.Drawing.Point(583, 302)
Me.MyTextBox06.MaxLength = 18
Me.MyTextBox06.MaxLineLength = -1
Me.MyTextBox06.MaxLines_Warning = ""
Me.MyTextBox06.MaxLines_Warning_Label = Nothing
Me.MyTextBox06.Name = "MyTextBox06"
Me.MyTextBox06.Size = New System.Drawing.Size(150, 20)
Me.MyTextBox06.TabIndex = 148
Me.MyTextBox06.Text = "200"
'
'CheckBox9
'
Me.CheckBox9.AutoSize = True
@@ -2252,12 +2308,11 @@ Partial Class frmStartOptions
'Label50
'
Me.Label50.AutoSize = True
Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label50.Location = New System.Drawing.Point(728, 124)
Me.Label50.Location = New System.Drawing.Point(548, 305)
Me.Label50.Name = "Label50"
Me.Label50.Size = New System.Drawing.Size(27, 13)
Me.Label50.TabIndex = 163
Me.Label50.Text = "Jahr"
Me.Label50.Size = New System.Drawing.Size(29, 13)
Me.Label50.TabIndex = 149
Me.Label50.Text = "Top:"
'
'UTAREPdf
'
@@ -4155,7 +4210,7 @@ Partial Class frmStartOptions
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(1229, 920)
Me.ClientSize = New System.Drawing.Size(1229, 970)
Me.Controls.Add(Me.pnl)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -4248,6 +4303,7 @@ Partial Class frmStartOptions
Friend WithEvents PictureBox12 As PictureBox
Friend WithEvents LinkLabel20 As LinkLabel
Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents MyTextBox06 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label3 As Label
Friend WithEvents CheckBox1 As CheckBox
Friend WithEvents cbxBu As CheckBox

12
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -2419,6 +2419,8 @@ Public Class frmStartOptions
'IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\" & betreff.ToString.Replace(",", ""))
betreff = betreff.replace("*00*", "")
If betreff.ToString.Contains("VBD - Versandbegleitdokument (DE), ") Then
Dim found = False
betreff = betreff.replace("WG: ", "")
@@ -5629,9 +5631,9 @@ weiter:
' Dim dt = (New SQL).loadDgvBySql("SELECT TOP (1000) [ncts_Id] FROM [tblNCTS_FREMD] where ncts_Partnersystem='ATEZ' and ncts_status < 60", "FMZOLL")
Dim top = 200
'If IsNumeric(MyTextBox6._value) AndAlso CInt(MyTextBox6._value) > 0 Then
' top = CInt(MyTextBox6._value)
'End If
If IsNumeric(MyTextBox06._value) AndAlso CInt(MyTextBox06._value) > 0 Then
top = CInt(MyTextBox06._value)
End If
updateATEZStatusByMRNTop(top)
End Sub
@@ -5857,6 +5859,10 @@ weiter:
End Sub
'Private Sub Button27_Click_1(sender As Object, e As EventArgs) Handles Button27.Click
' cErrorHandler.sendERRORperMail(My.Application.Info.AssemblyName, "TEST", "", "error@verag.ag", "", "Error_Test")
'End Sub
Private Sub LinkLabel52_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel52.LinkClicked
If txtPloseJahr.Text.ToString.Length <> 4 Then MsgBox("Bitte Jahr eingeben!") : Exit Sub