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:
Andreas Luxbauer
2025-01-21 10:02:56 +01:00
parent 31b4cf7e47 28dad85ee4
commit 014037d610
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MDM_Worker/cPLOSE.vb
View File

@@ -631,7 +631,7 @@ Public Class cPLOSE
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='PLOSE' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='PLOSE' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
End Class

5
initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
View File

@@ -427,7 +427,7 @@ Public Class frmMDMNachrichtenVerarbeitung
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "PLOSE", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d),)
DS.uploadDataToDATENSERVER(d)
'DatenArchiv-Id in tblPLOSE_Inv_Data Tabelle eintragen (über PDF-Name) :
SQL.doSQL("Update [tblPLOSE_Inv_Data] SET [plInv_daId]='" & DS.da_id & "' where [plInv_PdfFileName] = '" & DS.da_name & "' and [plInv_Einlesedatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
SQL.doSQL("Update [tblPLOSE_Inv_Data] SET [plInv_daId]='" & DS.da_id & "' where [plInv_PdfFileName] = '" & DS.da_name & "' and [plInv_Einlesedatum] > DATEADD(DAY,-30,getdate()) and [plInv_daId] is null ", "FMZOLL")
frmStartOptions.moveFile_DateBack(d, ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
'frmStartOptions.copyFile_DateBack(d, ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
@@ -442,9 +442,6 @@ Public Class frmMDMNachrichtenVerarbeitung
End Select
If True Then
If Not alreadyMoved Then
If found Then

10
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -285,7 +285,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
downloadedFile.Dispose()
Dim fi As FileInfo = New FileInfo(filePath)
If fi.Extension = ".uta" Then
If fi.Extension.ToLower = ".uta" Then
ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen
cnt += 1
End If
@@ -472,11 +472,12 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim pdfAtt = doc.Attachments(0)
If pdfAtt.FileName = "ZUGFeRD-invoice.xml" Then
Dim filename = Path.GetFileName(pdfAtt.FileName)
File.WriteAllBytes(filename, pdfAtt.Data)
Dim xmlFile = doc.Attachments(0)
Dim pathTempXMLFile = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(xmlFile.FileName, ".xml", False, False)
File.WriteAllBytes(pathTempXMLFile, pdfAtt.Data)
Dim docxml As New XmlDocument()
docxml.Load(New XmlTextReader(filename))
docxml.Load(New XmlTextReader(pathTempXMLFile))
If docxml.HasChildNodes Then
If docxml.GetElementsByTagName("rsm:ExchangedDocument").Count > 0 Then
@@ -529,6 +530,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Catch ex As System.Exception
MsgBox(ex.StackTrace)
End Try
ElseIf fi.Name.ToString.StartsWith("AP") AndAlso fi.Name.ToLower.Contains("epn") Then 'nur einzelpostennachweise

8
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -421,14 +421,14 @@ Partial Class frmStartOptions
'
'LinkLabel69
'
Me.LinkLabel69.Location = New System.Drawing.Point(0, 0)
Me.LinkLabel69.Location = New System.Drawing.Point(248, 0)
Me.LinkLabel69.Name = "LinkLabel69"
Me.LinkLabel69.Size = New System.Drawing.Size(100, 23)
Me.LinkLabel69.TabIndex = 0
'
'Button27
'
Me.Button27.Location = New System.Drawing.Point(0, 0)
Me.Button27.Location = New System.Drawing.Point(391, 0)
Me.Button27.Name = "Button27"
Me.Button27.Size = New System.Drawing.Size(75, 23)
Me.Button27.TabIndex = 1
@@ -2418,8 +2418,6 @@ Partial Class frmStartOptions
'cbxUTATestkunden
'
Me.cbxUTATestkunden.AutoSize = True
Me.cbxUTATestkunden.Checked = True
Me.cbxUTATestkunden.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxUTATestkunden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxUTATestkunden.Location = New System.Drawing.Point(532, 374)
Me.cbxUTATestkunden.Name = "cbxUTATestkunden"
@@ -2920,8 +2918,6 @@ Partial Class frmStartOptions
'cbxDateienlöschenRMC
'
Me.cbxDateienlöschenRMC.AutoSize = True
Me.cbxDateienlöschenRMC.Checked = True
Me.cbxDateienlöschenRMC.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxDateienlöschenRMC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxDateienlöschenRMC.Location = New System.Drawing.Point(533, 105)
Me.cbxDateienlöschenRMC.Name = "cbxDateienlöschenRMC"