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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-10-06 12:07:00 +02:00
parent bd16233c41 9f4d1eeef0
commit 36c9fb0750
14 changed files with 1547 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -28,6 +28,7 @@ Public Class cRMC
Property rmc_sammelReNr As Object = Nothing
Property UStVAn_ID As Object = Nothing
Property rmc_daId_InvAtt As Object = Nothing
Property rmc_isBTO As Boolean = False
Public hasEntry = False
@@ -37,19 +38,27 @@ Public Class cRMC
End Sub
Sub New(rmc_kdNr, rmc_reNr)
Sub New(rmc_kdNr As String, rmc_reNr As String)
Me.rmc_kdNr = rmc_kdNr
Me.rmc_reNr = rmc_reNr
LOAD()
End Sub
Sub New(rmc_kdNr, rmc_reNr, rmc_reDatum)
Sub New(rmc_kdNr As String, rmc_reNr As String, rmc_reDatum As String)
Me.rmc_kdNr = rmc_kdNr
Me.rmc_reNr = rmc_reNr
Me.rmc_reDatum = rmc_reDatum
LOAD()
End Sub
Sub New(rmc_kdNr As String, rmc_reDatum As String, rmc_landKZ As String, rmc_isBTO As Boolean)
Me.rmc_kdNr = rmc_kdNr
Me.rmc_landKZ = rmc_landKZ
Me.rmc_reDatum = rmc_reDatum
Me.rmc_isBTO = rmc_isBTO
LOADCountry()
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_id", rmc_id))
@@ -77,6 +86,7 @@ Public Class cRMC
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_betragMWST", rmc_betragMWST))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_daId_InvAtt", rmc_daId_InvAtt))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_isBTO", rmc_isBTO))
Return list
@@ -126,6 +136,37 @@ Public Class cRMC
End Try
End Sub
Public Sub LOADCountry()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblRMCImport WHERE rmc_kdNr=@rmc_kdNr AND rmc_landKZ = @rmc_landKZ and rmc_reDatum = @rmc_reDatum and rmc_isBTO = @rmc_isBTO ", conn)
cmd.Parameters.AddWithValue("@rmc_kdNr", rmc_kdNr)
cmd.Parameters.AddWithValue("@rmc_landKZ", rmc_landKZ)
cmd.Parameters.AddWithValue("@rmc_reDatum", rmc_reDatum)
cmd.Parameters.AddWithValue("@rmc_isBTO", rmc_isBTO)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Public Function getUpdateCmd() As String
@@ -175,11 +216,11 @@ Public Class cRMC
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt FROM [tblRMCImport]
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt, isnull(rmc_isBTO,0) as rmc_isBTO FROM [tblRMCImport]
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr] or rmc_kdNr=adr.[weitereWölflKundenNr]
where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND rmc_landKZ ='" & LandKZ & "'" & IIf(Not Archiv, " And rmc_archiv = 0 ", "") & "
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0)
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0), isnull(rmc_isBTO,0)
having sum([rmc_betragMWST])<>0
order by rmc_reDatum", conn)

20
VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb generated
View File

@@ -240,6 +240,26 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
Friend ReadOnly Property KVI_report() As Byte()
Get
Dim obj As Object = ResourceManager.GetObject("KVI_report", resourceCulture)
Return CType(obj,Byte())
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
Friend ReadOnly Property KVI_report_general() As Byte()
Get
Dim obj As Object = ResourceManager.GetObject("KVI_report_general", resourceCulture)
Return CType(obj,Byte())
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

8
VERAG_PROG_ALLGEMEIN/My Project/Resources.resx
View File

@@ -202,7 +202,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDQAACw0B7QfALAAA9UFJREFUeF7s/QmUbOtB
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAA9UFJREFUeF7s/QmUbOtB
nge3dDWjCQlL14CExBXCBsEFMwsEBptrScw4xsZJcBzMIn8wSWyWcRziBNvEg8BDYjm//5g4eMBmMJiL
BzAIIdlEuqfneaiqruquqWueusaurtr/eoveV32+3eec7uoavm/X86z1rHPOd3qorl171/f0npY8z1tC
REREREREHNfAACIiIiIiIuJdDAwgIiIiIiIi3sXAACIiIiIiIuJdDAwgIiIiIiIi3sXAACIiIiIiIuJd
@@ -2029,4 +2029,10 @@
<data name="sRGB2014" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sRGB2014.icc;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="KVI_report" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\KVI_report.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="KVI_report_general" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\KVI_report_general.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

BIN
VERAG_PROG_ALLGEMEIN/Resources/KVI_report.xlsx Normal file
View File

Binary file not shown.

BIN
VERAG_PROG_ALLGEMEIN/Resources/KVI_report_general.xlsx Normal file
View File

Binary file not shown.

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -41,7 +41,7 @@ Public Class cSyska_Interface
Left Join tblKundenErweitert ON KundenNr=kde_KundenNr
Left Join [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz
Left Join Währungstabelle ON St.LandNr = Währungstabelle.Währungsschlüssel
WHERE FiBuSchnittstelle = 0 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' and KundenNr = 203152 Order by [Konto-Nr]"
WHERE FiBuSchnittstelle = 0 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' Order by [Konto-Nr]"
Return SQL.loadDgvBySql(SQLString, "FMZOLL")
End Function

2
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -973,6 +973,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="ProgAllg.pfx" />
<None Include="Resources\KVI_report.xlsx" />
<None Include="Resources\KVI_report_general.xlsx" />
<None Include="Resources\sRGB2014.icc" />
<None Include="Schnittstellen\ATEZ\NCTS_API\JSON_schema\query_declarationSchema.json" />
<None Include="Schnittstellen\ATEZ\NCTS_API\NCTS-P5\CC015C.xsd">

1348
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

File diff suppressed because it is too large Load Diff