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

div. Änderungen

Browse Source
This commit is contained in:
d.breimaier
2024-09-19 13:14:44 +02:00
parent add7ac39a9
commit 3789fdec0e
44 changed files with 1181 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initATLASAufschubkonten/App.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>

3
initATLASAufschubkonten/My Project/Application.Designer.vb generated
View File

@@ -1,6 +1,5 @@
'------------------------------------------------------------------------------
' <auto-
' ated>
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
' Laufzeitversion:4.0.30319.42000
'

2
initATLASAufschubkonten/My Project/Resources.Designer.vb generated
View File

@@ -22,7 +22,7 @@ Namespace My.Resources
'''<summary>
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _

2
initATLASAufschubkonten/My Project/Settings.Designer.vb generated
View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase

3
initATLASAufschubkonten/RoutineManager.vbproj
View File

@@ -11,7 +11,7 @@
<AssemblyName>RoutineManager</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -216,6 +216,7 @@
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>

4
initATLASAufschubkonten/cUTA.vb
View File

@@ -246,6 +246,7 @@ Public Class cUTA
Property Leistungsort_verlagerbar As Char
Property abgerechnetDatum As Object
Property abgerechnet As Boolean = False
Property daId As Object
Public hasEntry = False
@@ -348,6 +349,7 @@ Public Class cUTA
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Leistungsort_verlagerbar", Leistungsort_verlagerbar))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnetDatum", abgerechnetDatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnet", abgerechnet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId))
Return list
End Function
@@ -1240,7 +1242,7 @@ Public Class cUTA
ERROR_PFAD = cUTA.Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ARCHIV_PFAD = cUTA.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNGS_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ZIEL_PFAD = cUTA.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)

4
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -6076,6 +6076,9 @@ Public Class frmDYNachrichtenVerarbeitung
Next
'TODO: SET_FIRMA
tryGetFirmaNiederlassung(EZA.eza_firma, EZA.eza_niederlassung, (EZA.eza_AnmeldenderBearbeiterEMail, "").ToString, EZA.eza_ObjectName)
End If
@@ -6084,6 +6087,7 @@ Public Class frmDYNachrichtenVerarbeitung
If EZA.SAVE_ALL() Then
If If(EZA.eza_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05)
Else

27
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -226,7 +226,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim targetFile As SftpFile
For Each file As SftpFile In files
If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then
'If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then
If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), Not file.Name.ToLower.StartsWith("_")) Then
Dim remoteFileName = "/" & file.Name
Dim filePath = uta.VERARBEITUNG_PFAD & If(IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name)
@@ -400,8 +403,28 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
'------------------------------------------
'------------------ .PDF ------------------
'------------------------------------------
'PDFs über EEA
If fi.Extension.ToLower = ".pdf" Then
If Not IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToString.StartsWith("invoice_") Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
DS.uploadDataToDATENSERVER(d,,,,,, True)
'TO DO -> ÄNDERN----------------------
' SQL.doSQL("Update [tblUTAImport] SET [daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
'TO DO -> ÄNDERN----------------------
End If
End If
frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
'AKTUELL NOCH KEINE PDFs -> HIER LOGIK FÜR UTA_PDFs
dgvEinarbeitung.Refresh()

1052
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

20
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -520,10 +520,11 @@ Public Class frmStartOptions
Case "ABGLEICH_KUNDENUEMSAETZE"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim lastyears = 2
Dim lastyears As Integer = 2
If DELETE_Kundenumsaetze(lastyears) Then
INSERT_Kundenumsaetze(lastyears)
End If
closeMe()
Case "AMBAR_VERAG_BUCHUNGEN"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
@@ -4307,7 +4308,7 @@ Public Class frmStartOptions
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
txtBatchNr.Text = CInt(SQL.getValueTxtBySql("SELECT max([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions] ", "FMZOLL",,, 0))
cbxMSEBatchNr.DataSource = SQL.loadCboBySql("SELECT distinct([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions]", "FMZOLL")
End Sub
@@ -4376,7 +4377,6 @@ Public Class frmStartOptions
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Return False
End Try
End Function
@@ -4474,7 +4474,7 @@ Public Class frmStartOptions
If fehler <> "" Then
MsgBox(fehler)
Else
fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value)
fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value, cbxUploadDA.Checked)
If fehler <> "" Then
MsgBox(fehler)
Me.Visible = True
@@ -4567,9 +4567,13 @@ Public Class frmStartOptions
Private Sub LinkLabel57_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel57.LinkClicked
If txtBatchNr.Text <> "" Then
If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 1000 Then Exit Sub
End If
If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 100 Then Exit Sub
If Not IsNumeric(cbxMSEBatchNr._value) Then Exit Sub
If CInt(cbxMSEBatchNr._value) < 1 AndAlso CInt(cbxMSEBatchNr._value) > 1000 Then Exit Sub
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
@@ -4585,7 +4589,7 @@ Public Class frmStartOptions
Else
Dim totalPages = 1
Dim batchrequestNr = CInt(txtBatchNr.Text)
Dim batchrequestNr = IIf(txtBatchNr.Text <> "", CInt(txtBatchNr.Text), CInt(cbxMSEBatchNr._value))
fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 0)
If fehler <> "" Then
@@ -4692,7 +4696,7 @@ Public Class frmStartOptions
ElseIf sender Is LinkLabel61 Then
dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & datVon.Value & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & Date.Parse(datVon.Value).ToShortDateString & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
If dtTransactionID.Rows.Count = 0 Then
MsgBox("Zu diesem Rechnungsdatum gibt es keine Rechnung!")
Me.Visible = True