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

div Änderungen (Mailsender, MDM-Einarbeitung, USTVA, Aufschubkonen,etc.)

Browse Source
This commit is contained in:
d.breimaier
2026-10-06 10:19:37 +02:00
parent 3860240e63
commit d7e32e516c
13 changed files with 1546 additions and 1400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.8.2")>
<Assembly: AssemblyFileVersion("1.5.8.2")>
<Assembly: AssemblyVersion("1.5.8.3")>
<Assembly: AssemblyFileVersion("1.5.8.3")>

1343
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

File diff suppressed because it is too large Load Diff

13
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -761,7 +761,6 @@ Public Class frmMDM_USTVAntrag
loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked, IIf(item.Name = "ploseneu", True, False))
init()
ElseIf item.Name = "rmc" Then
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
loadUSTVFrom_RMC(UStVAn_ID, Antrag_LandKz, cbxArchivierteEintracheNochmalsEinarbetien.Checked)
init()
ElseIf item.Name = "mse" Then
@@ -1219,13 +1218,23 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
USTV_POS.UStVPo_Zeitstempel = Now()
Dim isBTO As Boolean = False
If Not IsNothing(r.Item("rmc_isBTO")) AndAlso r.Item("rmc_isBTO") Then
isBTO = True
End If
If Not IsDBNull(r.Item("rmc_daId_InvAtt")) AndAlso IsNumeric(r.Item("rmc_daId_InvAtt")) AndAlso r.Item("rmc_daId_InvAtt") > 0 Then
Dim DS_ATT_ID As Integer = r.Item("rmc_daId_InvAtt")
If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
'merge current daId and invatt-daid
Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_MERGED", Now.Year, Now.ToString("yyyyMMdd"), USTV_POS.UStVPo_ReNr & "_INVOICE_RMC_ATT.pdf", kdNr, True)
Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_MERGED", Now.Year, Now.ToString("yyyyMMdd"), USTV_POS.UStVPo_ReNr & "_INVOICE_RMC_ATT" & IIf(isBTO, "_BTO", "_NTO") & ".pdf", kdNr, True)
Dim DS_ATT = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DS_ATT_ID)
Dim DS_ORG = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(USTV_POS.UStVPo_daId)

10
SDL/UsrCntlEssensbestellungen.vb
View File

@@ -408,16 +408,26 @@ Public Class UsrCntlessensbestellungen
If CheckBox1.Checked = False Then
essen.eb_abgerechnet = False
essen.eb_abgerechnet_am = DBNull.Value
Else
essen.eb_abgerechnet = True
If IsDBNull(essen.eb_abgerechnet_am) OrElse IsNothing(essen.eb_abgerechnet_am) Then essen.eb_abgerechnet_am = Now()
End If
If CheckBox2.Checked = False Then
essen.eb_storniert = False
essen.eb_storniert_am = DBNull.Value
Else
essen.eb_storniert = True
essen.eb_storniert_am = Now()
If IsDBNull(essen.eb_storniert_am) OrElse IsNothing(essen.eb_storniert_am) Then essen.eb_storniert_am = Now()
End If
If CheckBox3.Checked = False Then
essen.eb_gesendet = False
essen.eb_gesendet_am = DBNull.Value
Else
essen.eb_gesendet = True
If IsDBNull(essen.eb_gesendet_am) OrElse IsNothing(essen.eb_gesendet_am) Then essen.eb_gesendet_am = Now()
End If
essen.eb_MenuID = MenuID

9
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -1675,7 +1675,7 @@ Public Class frmMDMDatenverarbetiung
Dim top = ""
Dim sqlWhere = ""
Select Case art
Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543"
Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543 and Adressen.AdressenNr = 402022 "
Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543"
Case Else
MsgBox("falscher Typ!") : Return False
@@ -1731,7 +1731,10 @@ Public Class frmMDMDatenverarbetiung
Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
Dim verarbOK = IIf(test, False, True)
Dim RECHNUNG As cRechnungsausgang = Nothing
'Dim RECHNUNG As cRechnungsausgang = Nothing
Dim integerTem = 3051176
Dim RECHNUNG As New cRechnungsausgang(integerTem)
If Not gen_SPEDBUCH_ByKdNr(IDS("KdNrVERAG"), SPEDBUCH, art,,,, datPloseAnhang.Value) Then verarbOK = False
If Not gen_RECHNUNG_BySPEDBUCH(IDS("KdNrVERAG"), SPEDBUCH, art,,,, RECHNUNG) Then verarbOK = False
@@ -3224,7 +3227,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
rpt.txtKunde.Text &= " " & SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "")
Dim Station As String = ""
If Gruppierung_nach_Ort Then
If Gruppierung_nach_Ort And art <> "IDS" Then
Station = SQL.isDbnullEmpty(rpt.Fields.Item("OutletOrt").Value, "")
If Station <> "" Then
Station = " (" & Station & ")"

54
SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb
View File

@@ -55,6 +55,8 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
dt.Columns.Add("Betrag")
dt.Columns.Add("Fakturiert")
dt.Columns.Add("Differenz")
dt.Columns.Add("BezugsNr")
dt.Columns.Add("BelegNr")
' Dim fileReader() = System.IO.File.ReadAllLines(fd.FileName, System.Text.Encoding.UTF32)
Dim cnt = 1
@@ -112,10 +114,13 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
For Each r As DataRow In dt_Dateneinlesung.Rows
Dim SQLWHere = ""
Dim SQLWHereSPEDBUCH = ""
If r.Item("ATC") <> "" Then
SQLWHere = "[Status]<>0 and DruckDatumZeit is not null and (left([RechnungsausgangPositionen].Belegdaten,21)='" & r.Item("ATC") & "' or [RechnungsausgangPositionen].[Weitere_Reg_Nr] ='" & r.Item("ATC").value & "' ) AND [AufschubkontoNr]='" & AKTO & "'"
SQLWHereSPEDBUCH = "WHERE BelegNr = '" & r.Item("ATC") & "'"
ElseIf r.Item("MRN") <> "" Then
SQLWHere = "[Status]<>0 and DruckDatumZeit is not null and left([RechnungsausgangPositionen].Belegdaten,21)='" & r.Item("MRN") & "' AND [AufschubkontoNr]='" & AKTO & "'"
SQLWHereSPEDBUCH = "WHERE BelegNr = '" & r.Item("MRN") & "'"
End If
Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", SQLWHere, "FMZOLL", "0"))
@@ -123,9 +128,56 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER
Dim differenz = fakturiert - r.Item("betrag")
If Not cbx.Checked OrElse differenz <> 0 Then
Dim BezugsNr As String = ""
Dim BelegNr As String = ""
If fakturiert = 0 Then 'dann keine existierende Rechnung...
Dim dt_SPED_entry As DataTable = SQL.loadDgvBySql("select FilialenNr, AbfertigungsNr from Speditionsbuch " & SQLWHereSPEDBUCH, "FMZOLL")
For Each SPEDBUCH_row As DataRow In dt_SPED_entry.Rows
BezugsNr &= SPEDBUCH_row.Item("FilialenNr") & "/" & SPEDBUCH_row.Item("AbfertigungsNr") & ", "
Next
If BezugsNr.Trim() <> "" AndAlso BezugsNr.Trim.EndsWith(",") Then
BezugsNr = BezugsNr.Trim().TrimEnd(","c)
End If
erg &= r.Item("Zollamt") & " - " & IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")) & ": " & r.Item("Betrag") & " | " & differenz & vbNewLine
dt.Rows.Add({AKTO, Faelligkeit, IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")), r.Item("Datum"), r.Item("Zollamt"), r.Item("Betrag"), fakturiert, differenz})
dt.Rows.Add({AKTO, Faelligkeit, IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")), r.Item("Datum"), r.Item("Zollamt"), r.Item("Betrag"), fakturiert, differenz, BezugsNr, BelegNr})
Else
Dim dtFakturiert As DataTable = SQL.loadDgvBySql("select max(RechnungsNr) as RechnungsNr ,max(FilialenNr) as FilialenNr , max(AbfertigungsNr) as AbfertigungsNr from Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID WHERE " & SQLWHere & " group by RechnungsNr", "FMZOLL")
If dtFakturiert.Rows.Count > 0 Then
For Each rechnungs_row In dtFakturiert.Rows
BezugsNr &= rechnungs_row.Item("FilialenNr") & "/" & rechnungs_row.Item("AbfertigungsNr") & ", "
BelegNr &= rechnungs_row.Item("RechnungsNr") & ", "
Next
If BelegNr.Trim() <> "" AndAlso BelegNr.Trim.EndsWith(",") Then
BelegNr = BelegNr.Trim().TrimEnd(","c)
End If
If BezugsNr.Trim() <> "" AndAlso BezugsNr.Trim.EndsWith(",") Then
BezugsNr = BezugsNr.Trim().TrimEnd(","c)
End If
End If
erg &= r.Item("Zollamt") & " - " & IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")) & ": " & r.Item("Betrag") & " | " & differenz & vbNewLine
dt.Rows.Add({AKTO, Faelligkeit, IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")), r.Item("Datum"), r.Item("Zollamt"), r.Item("Betrag"), fakturiert, differenz, BezugsNr, BelegNr})
End If
End If
cnt += 1
lnlCnt.Text = cnt '& "/" & Flines.Count

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/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