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

Monitoring Anpassung, MDM Plose Einarbeitung Consortio, Update SND DY Anm

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-01-10 10:07:34 +01:00
parent d2f9685c4e
commit b0bc10ec94
20 changed files with 263 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ADMIN - Verknüpfung.lnk Normal file
View File

Binary file not shown.

21
DAKOSY_Worker/DAKOSY/cDakosy_Zollanmeldungen.vb
View File

@@ -1,5 +1,6 @@
Imports System.Data.SqlClient
Imports System.Reflection
Imports VERAG_PROG_ALLGEMEIN
Public Class cDakosy_Zollanmeldungen
@@ -298,6 +299,26 @@ Public Class cDakosy_Zollanmeldungen
Return False
End Function
Public Sub UPDATE_AVISO_SND(dy_SendungsId)
'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist.
If dy_SendungsId IsNot Nothing AndAlso dy_SendungsId > 0 Then
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
If SND.tblSnd_VG_MA <> VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then ' Nur wenn nicht bereits übernommen
SND.tblSnd_VG_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
SND.LetzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
SND.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then ' nur, wenn BO, dann darf das Team geändert werden... Damit das zuständige Team nachvollzeiehn kann, was mit dem LKW ist...
SND.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId
End If
If SND.SAVE() Then
Dim AvisoDAL As New cAvisoDAL
AvisoDAL.addAenderung(SND.tblSnd_AvisoID, "Sendung übernommen", "Sendung Nr. " & SND.tblSnd_PosUnterNr & " übernommen von " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & " am " & Format(Now, "dd.MM.yyyy HH:mm") & " (AUTO - DY/Send)")
End If
End If
End If
End Sub
Public Sub UPDATE_DATA()
Try
Select Case dy_ART

12
DAKOSY_Worker/cDakosyFunftions.vb
View File

@@ -58,7 +58,7 @@ Public Class cDakosyFunftions
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
End Try
End Function
@@ -106,7 +106,7 @@ Public Class cDakosyFunftions
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
End Try
End Function
@@ -234,13 +234,13 @@ Public Class cDakosyFunftions
IO.Directory.CreateDirectory(getDefaultFolder_SEND)
End If
Catch ex As Exception
Try
Try
getDefaultFolder_SEND = "C:\TEMP\" ' Path.GetTempPath
If Not IO.Directory.Exists(getDefaultFolder_SEND) Then
IO.Directory.CreateDirectory(getDefaultFolder_SEND)
End If
Catch ex2 As Exception
MsgBox(ex2.Message & ex2.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
getDefaultFolder_SEND = ""
End Try
End Try
@@ -350,7 +350,7 @@ Public Class cDakosyFunftions
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
End Try
End Function
@@ -460,7 +460,7 @@ Public Class cDakosyFunftions
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
End Try
End Function

58
MDM_Worker/cPLOSE.vb
View File

@@ -243,6 +243,7 @@ Imports System.Data.SqlClient
GET_Antraege_PLOSE(LIST, von, bis, KundenNr, Land, Archiv)
GET_Antraege_ByLieferantCode(LIST, "'90'", von, bis, KundenNr, Land, Archiv) 'SOFICO
GET_Antraege_ByLieferantCodeNULL(LIST, von, bis, KundenNr, Land, Archiv) 'SOFICO
cPLOSE_USTV_ANTR.reOrderList(LIST)
Return LIST
@@ -305,6 +306,61 @@ Imports System.Data.SqlClient
End Function
Public Shared Function GET_Antraege_ByLieferantCodeNULL(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_Lieferant],[plose_LieferantCode],sum([plose_NettobetragWaehrungAbbuchung])[plose_NettobetragWaehrungAbbuchung],sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] ,sum([plose_BruttobetragWaehrungAbbuchung] )[plose_BruttobetragWaehrungAbbuchung], [plose_WaehrungAbbuchung]
,sum([plose_NettobetragTransaktion])[plose_NettobetragTransaktion],sum([plose_MWSTBetrag])[plose_MWSTBetrag] ,sum([plose_BruttobetragTransaktion] )[plose_BruttobetragTransaktion]
FROM [tblPLOSE_Details]
INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer
INNER JOIN [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode]
where cast(plose_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND plose_LieferantCode is null
AND plp_Land ='" & Land & "'
/* " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & "*/
group by [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung]
having sum(plose_MWSTBetrag)>0
order by plose_SupplierRechnungsDatum
", conn)
cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader()
While dr.Read
Dim cPLOSE_USTV_ANT As New cPLOSE_USTV_ANTR
cPLOSE_USTV_ANT.plose_RechnungsDatum = dr.Item("plose_SupplierRechnungsDatum")
cPLOSE_USTV_ANT.plose_RechnungsNr = dr.Item("plose_SupplierRechnungsNr")
cPLOSE_USTV_ANT.plose_Lieferant = dr.Item("plose_Lieferant")
cPLOSE_USTV_ANT.plose_LieferantCode = dr.Item("plose_LieferantCode")
cPLOSE_USTV_ANT.plose_NettobetragTransaktion = dr.Item("plose_NettobetragTransaktion")
cPLOSE_USTV_ANT.plose_MWSTBetrag = dr.Item("plose_MWSTBetrag")
cPLOSE_USTV_ANT.plose_BruttobetragTransaktion = dr.Item("plose_BruttobetragTransaktion")
cPLOSE_USTV_ANT.plose_NettobetragWaehrungAbbuchung = dr.Item("plose_NettobetragWaehrungAbbuchung")
cPLOSE_USTV_ANT.plose_MWSTBetragWaehrungAbbuchung = dr.Item("plose_MWSTBetragWaehrungAbbuchung")
cPLOSE_USTV_ANT.plose_BruttobetragWaehrungAbbuchung = dr.Item("plose_BruttobetragWaehrungAbbuchung")
cPLOSE_USTV_ANT.plose_WaehrungAbbuchung = dr.Item("plose_WaehrungAbbuchung")
LIST.Add(cPLOSE_USTV_ANT)
End While
dr.Close()
End Using
End Using
Return True
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return False
End Function
Public Shared Function GET_Antraege_PLOSE(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -316,7 +372,7 @@ Imports System.Data.SqlClient
INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer
INNER JOIN [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode]
where cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND plose_LieferantCode IN (0,1,7)
AND plose_LieferantCode IN (0,1,7,9)
AND plp_Land ='" & Land & "'
/* " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & "*/
group by [plose_RechnungsDatum],[plose_RechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung]

2
MailSender/MAILSender.vb
View File

@@ -82,6 +82,7 @@ Module Mail
'Exit Sub
'sendTOBB("VERAG/ATILLA", Now.AddDays(-6), Now.AddDays(-1))
If PARAM = "" Then
@@ -275,6 +276,7 @@ Module Mail
Dim bool_sent = False
Select Case FirmaTmp
' Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list)
Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list)
Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list)
Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list)

4
MailSender/MailSender.vbproj
View File

@@ -50,10 +50,6 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
<Reference Include="DocumentFormat.OpenXml">
<HintPath>C:\Program Files (x86)\Open XML SDK\V2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">
<Private>False</Private>
</Reference>

9
TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj
View File

@@ -53,9 +53,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="VERAG_PROG_ALLGEMEIN">
<HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
@@ -112,5 +109,11 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

6
UID/My Project/AssemblyInfo.vb
View File

@@ -8,7 +8,7 @@ Imports System.Runtime.InteropServices
' Die Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("ADMIN")>
<Assembly: AssemblyTitle("6")>
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("ADMIN")>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.1.5")>
<Assembly: AssemblyFileVersion("1.0.1.5")>
<Assembly: AssemblyVersion("1.2.0.9")>
<Assembly: AssemblyFileVersion("1.2.0.9")>

18
UID/My Project/Resources.Designer.vb generated
View File

@@ -110,6 +110,15 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property asd3ad2asd3asd2asd() As String
Get
Return ResourceManager.GetString("asd3ad2asd3asd2asd", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
'''</summary>
@@ -654,15 +663,6 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.7 ähnelt.
'''</summary>
Friend ReadOnly Property Version() As String
Get
Return ResourceManager.GetString("Version", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

6
UID/My Project/Resources.resx
View File

@@ -187,9 +187,6 @@
<data name="connStringAdmin" xml:space="preserve">
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
</data>
<data name="Version" xml:space="preserve">
<value>2.0.7</value>
</data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -304,4 +301,7 @@
<data name="bbvn6" xml:space="preserve">
<value />
</data>
<data name="asd3ad2asd3asd2asd" xml:space="preserve">
<value />
</data>
</root>

2
UID/cProgramFunctions.vb
View File

@@ -943,7 +943,7 @@ Public Class cProgramFunctions
'gibt es keine deinierten Std.für einen Feiertag, werden die Stunden nach Mustereinteilung berechnet:
If getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) > 0 Then 'Wenn an deisem Tag Stunden angefallen wären (lt. Muster)
Dim getWochenstundenTAG = getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False)
If IsNumeric(tz.dsttz_pause) Then getWochenstundenTAG += tz.dsttz_pause
If IsNumeric(tz.dsttz_pause) Then getWochenstundenTAG -= tz.dsttz_pause
getWochenstunden -= getWochenstundenTAG
End If
End If

2
UID/cSqlDb.vb
View File

@@ -1134,7 +1134,7 @@ Public Class cOptionenDAL
VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "ADMIN_TOOLS"
VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 1
VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = My.Resources.Version
VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = Application.ProductVersion
'VERAG_PROG_ALLGEMEIN.cAllgemein.USRBER = CInt(dr.Item("ber_sicherheitsstufe"))
VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = CInt(dr.Item("mit_id"))

4
UID/frmLogin.vb
View File

@@ -68,7 +68,7 @@ Public Class frmLogin
txtUser.Focus()
lblAlertTxt.Visible = False
Me.FormBorderStyle = Windows.Forms.FormBorderStyle.None
lblVersion.Text = lblVersion.Text & " " & My.Resources.Version
lblVersion.Text = lblVersion.Text & " " & Application.ProductVersion 'My.Resources.Version
lblVersion.ContextMenuStrip = ctxUpdate
'auf UPDATES prüfen:
@@ -78,7 +78,7 @@ Public Class frmLogin
Sub UpdateMe(Optional doUpdateAnyway = False)
If doUpdateAnyway OrElse CInt(ADMIN.getAktuelleVersion().Replace(".", "")) > CInt(My.Resources.Version.Replace(".", "")) Then
If doUpdateAnyway OrElse CInt(ADMIN.getAktuelleVersion().Replace(".", "")) > CInt(Application.ProductVersion.Replace(".", "")) Then
Me.Enabled = False
If doUpdateAnyway OrElse vbYes = MsgBox("Es ist eine neue Programm-Version verfügbar. Das Programm muss aktualisiert werden, bevor Sie es weiter verwenden können. " & vbNewLine & vbNewLine & "Update jetzt durchführen?", CType(vbQuestion + vbYesNo, MsgBoxStyle), "Update verfügbar") Then
UpdateADMIN()

4
VERAGMonitoring/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.0.4.3")>
<Assembly: AssemblyFileVersion("1.0.4.3")>
<Assembly: AssemblyVersion("1.0.4.4")>
<Assembly: AssemblyFileVersion("1.0.4.4")>

51
VERAGMonitoring/cSqlDb.vb
View File

@@ -771,6 +771,57 @@ Public Class cBrgDb
End Using
Return Nothing
End Function
Public Function getBrgSumFromBrgKto_FelligZukunft(ByVal brgKto As String, Optional where As String = "", Optional EinzahlungsbetraegeMitrechnen As Boolean = True, Optional faelligkeitsTAG As String = "", Optional faelligkeit As Object = Nothing) As String
Dim einzahlung = ""
If Not EinzahlungsbetraegeMitrechnen Then
einzahlung = " AND [brgak_art] NOT IN ('einzahlung') "
End If
Dim sql As String = ""
If faelligkeit Is Nothing Then
Dim faelligkeitWhere As String = ""
If faelligkeitsTAG <> "" Then
If faelligkeitsTAG = "16" Then
faelligkeitWhere = " And (DATEPART(day,[brgak_faelligkeitsdatum] )=" & faelligkeitsTAG & " Or [brgak_faelligkeitsdatum] Is null) "
Else
faelligkeitWhere = " And DATEPART(day,[brgak_faelligkeitsdatum] )=" & faelligkeitsTAG & " "
End If
End If
sql = "SELECT SUM(brgak_betrag) " &
" FROM tblBrgAufschub WHERE ( brgak_faelligkeitsdatum> getdate()) AND brgak_brgaktoId = '" & brgKto & "' " & where & einzahlung & faelligkeitWhere
Else
sql = "SELECT SUM(brgak_betrag) " &
" FROM tblBrgAufschub WHERE brgak_faelligkeitsdatum='" & CDate(faelligkeit).ToShortDateString & "' AND brgak_brgaktoId = '" & brgKto & "' " & where & einzahlung
End If
' MsgBox(sql)
' Dim daten As New List(Of cEntry)
Dim dr As SqlDataReader
Dim daten As New List(Of cBuergschaft)
Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand(sql, conn)
dr = cmd.ExecuteReader()
Try
Dim cnt As Integer = 0
If dr.Read Then
If Not dr.GetValue(0) Is DBNull.Value Then
Return dr.GetValue(0)
End If
End If
Return "0"
Catch ex As Exception
MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ": Fehler mit der Datenbankverbindung:" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Datenbankfehler")
Finally
dr.Close()
End Try
End Using
End Using
Return Nothing
End Function
Public Function getBrgFromBrgKto(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal brgKto As String, Optional where As String = "", Optional EinzahlungsbetraegeMitrechnen As Boolean = True, Optional faelligkeitsTAG As String = "", Optional faelligkeit As Object = Nothing) As DataTable
Dim einzahlung = ""

25
VERAGMonitoring/frmMain.vb
View File

@@ -811,7 +811,7 @@ Public Class frmMain
Dim betrag As Double = 0
Dim betrag_oE As Double = 0
If ART = "ZOLL" Then
If ART = "ZOLL" Or ART = "EUST" Then
Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
Dim betragBrg_26 As Double = 0
If Now.Day <= 26 Then betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.ToString(".MM.yyyy"))) '9
@@ -826,9 +826,26 @@ Public Class frmMain
betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
betrag_oE = CDbl(betragBrg_oE_16) + CDbl(betragBrg_oE_26)
'ElseIf ART = "EUST" Then
' Dim betragBrg_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
' Dim betragBrg_26 As Double = 0
' If Now.Day <= 26 Then betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.ToString(".MM.yyyy"))) '9
' betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy"))) '9
' betragBrg_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
' betrag = CDbl(betragBrg_16) + CDbl(betragBrg_26)
' Dim betragBrg_oE_16 As Double = BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
' Dim betragBrg_oE_26 As Double = 0
' If Now.Day <= 26 Then betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.ToString(".MM.yyyy"))) '9
' betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.AddMonths(1).ToString(".MM.yyyy"))) '9
' betragBrg_oE_26 += BRG.getBrgSumFromBrgKto(Nothing, Nothing, BRG_ID,, False, , CDate("26" & Now.AddMonths(2).ToString(".MM.yyyy"))) '10
' betrag_oE = CDbl(betragBrg_oE_16) + CDbl(betragBrg_oE_26)
Else
betrag = BRG.getBrgSumFromBrgKto(vonbrg.ToShortDateString, Now.ToShortDateString, BRG_ID)
betrag_oE = BRG.getBrgSumFromBrgKto(vonbrg.ToShortDateString, Now.ToShortDateString, BRG_ID,, False)
betrag = BRG.getBrgSumFromBrgKto_FelligZukunft(BRG_ID)
betrag_oE = BRG.getBrgSumFromBrgKto_FelligZukunft(BRG_ID,, False)
'betrag = BRG.getBrgSumFromBrgKto(vonbrg.ToShortDateString, Now.ToShortDateString, BRG_ID)
'betrag_oE = BRG.getBrgSumFromBrgKto(vonbrg.ToShortDateString, Now.ToShortDateString, BRG_ID,, False)
End If
@@ -868,7 +885,7 @@ Public Class frmMain
Try
Dim dt As DataTable
If ART = "ZOLL" Then
If ART = "ZOLL" Or ART = "EUST" Then
Dim dt_betragBrg_16 As DataTable = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,,, , CDate("16" & vonFaell.ToString(".MM.yyyy")))
Dim dt_betragBrg_26 As New DataTable
If Now.Day <= 26 Then dt_betragBrg_26 = BRG.getBrgFromBrgKto(Nothing, Nothing, BRG_ID,, , , CDate("26" & Now.ToString(".MM.yyyy"))) '9

2
initATLASAufschubkonten/RoutineManager.vbproj
View File

@@ -276,7 +276,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{A3B497BD-842C-4A2B-B398-ED1976849DF1}</Project>
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
<ProjectReference Include="..\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj">

1
initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
View File

@@ -531,6 +531,7 @@ Public Class frmMDMNachrichtenVerarbeitung
Case "0" : plose_Lieferant = "PLOSE Sistem Service"
Case "7" : plose_Lieferant = "Consortio PLOSE"
Case "1" : plose_Lieferant = "Plose Union"
Case "9" : plose_Lieferant = "PLOSE UNION SOCIETA COOPERATIVA"
End Select
'FALSCHE WERTE!!!

84
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -58,6 +58,8 @@ Partial Class frmStartOptions
Me.CheckBox3 = New System.Windows.Forms.CheckBox()
Me.tbcntr = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.LinkLabel37 = New System.Windows.Forms.LinkLabel()
Me.PictureBox16 = New System.Windows.Forms.PictureBox()
Me.Button15 = New System.Windows.Forms.Button()
Me.Button8 = New System.Windows.Forms.Button()
Me.LinkLabel28 = New System.Windows.Forms.LinkLabel()
@@ -156,12 +158,13 @@ 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.LinkLabel37 = New System.Windows.Forms.LinkLabel()
Me.PictureBox16 = New System.Windows.Forms.PictureBox()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.pnl.SuspendLayout()
CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbcntr.SuspendLayout()
Me.TabPage1.SuspendLayout()
CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.picC0008, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -181,13 +184,13 @@ Partial Class frmStartOptions
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnl.Controls.Add(Me.Label21)
Me.pnl.Controls.Add(Me.Button16)
Me.pnl.Controls.Add(Me.Button14)
Me.pnl.Controls.Add(Me.Label20)
@@ -243,6 +246,7 @@ Partial Class frmStartOptions
Me.pnl.Controls.Add(Me.LinkLabel3)
Me.pnl.Controls.Add(Me.lklAufschubkontenATLASEZOLL)
Me.pnl.Controls.Add(Me.lblRoutineManager)
Me.pnl.Controls.Add(Me.txtGJ_UNISPED)
Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnl.Location = New System.Drawing.Point(0, 0)
Me.pnl.Name = "pnl"
@@ -694,6 +698,28 @@ Partial Class frmStartOptions
Me.TabPage1.Text = "Zollverfahren"
Me.TabPage1.UseVisualStyleBackColor = True
'
'LinkLabel37
'
Me.LinkLabel37.AutoSize = True
Me.LinkLabel37.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.LinkLabel37.Location = New System.Drawing.Point(295, 125)
Me.LinkLabel37.Name = "LinkLabel37"
Me.LinkLabel37.Size = New System.Drawing.Size(94, 13)
Me.LinkLabel37.TabIndex = 57
Me.LinkLabel37.TabStop = True
Me.LinkLabel37.Text = "C0141 - Zollstellen"
'
'PictureBox16
'
Me.PictureBox16.BackgroundImage = CType(resources.GetObject("PictureBox16.BackgroundImage"), System.Drawing.Image)
Me.PictureBox16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox16.Location = New System.Drawing.Point(400, 120)
Me.PictureBox16.Name = "PictureBox16"
Me.PictureBox16.Size = New System.Drawing.Size(18, 18)
Me.PictureBox16.TabIndex = 58
Me.PictureBox16.TabStop = False
Me.PictureBox16.Visible = False
'
'Button15
'
Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1881,27 +1907,39 @@ Partial Class frmStartOptions
Me.lblRoutineManager.TabIndex = 1
Me.lblRoutineManager.Text = "Routine Manager"
'
'LinkLabel37
'txtGJ_UNISPED
'
Me.LinkLabel37.AutoSize = True
Me.LinkLabel37.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.LinkLabel37.Location = New System.Drawing.Point(295, 125)
Me.LinkLabel37.Name = "LinkLabel37"
Me.LinkLabel37.Size = New System.Drawing.Size(94, 13)
Me.LinkLabel37.TabIndex = 57
Me.LinkLabel37.TabStop = True
Me.LinkLabel37.Text = "C0141 - Zollstellen"
Me.txtGJ_UNISPED._DateTimeOnly = False
Me.txtGJ_UNISPED._numbersOnly = True
Me.txtGJ_UNISPED._numbersOnlyKommastellen = ""
Me.txtGJ_UNISPED._numbersOnlyTrennzeichen = False
Me.txtGJ_UNISPED._Prozent = False
Me.txtGJ_UNISPED._ShortDateNew = False
Me.txtGJ_UNISPED._ShortDateOnly = False
Me.txtGJ_UNISPED._TimeOnly = False
Me.txtGJ_UNISPED._TimeOnly_Seconds = False
Me.txtGJ_UNISPED._value = ""
Me.txtGJ_UNISPED._Waehrung = False
Me.txtGJ_UNISPED._WaehrungZeichen = True
Me.txtGJ_UNISPED.ForeColor = System.Drawing.Color.Black
Me.txtGJ_UNISPED.Location = New System.Drawing.Point(339, 295)
Me.txtGJ_UNISPED.MaxLength = 4
Me.txtGJ_UNISPED.MaxLineLength = -1
Me.txtGJ_UNISPED.MaxLines_Warning = ""
Me.txtGJ_UNISPED.MaxLines_Warning_Label = Nothing
Me.txtGJ_UNISPED.Name = "txtGJ_UNISPED"
Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20)
Me.txtGJ_UNISPED.TabIndex = 68
'
'PictureBox16
'Label21
'
Me.PictureBox16.BackgroundImage = CType(resources.GetObject("PictureBox16.BackgroundImage"), System.Drawing.Image)
Me.PictureBox16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox16.Location = New System.Drawing.Point(400, 120)
Me.PictureBox16.Name = "PictureBox16"
Me.PictureBox16.Size = New System.Drawing.Size(18, 18)
Me.PictureBox16.TabIndex = 58
Me.PictureBox16.TabStop = False
Me.PictureBox16.Visible = False
Me.Label21.AutoSize = True
Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
Me.Label21.Location = New System.Drawing.Point(264, 298)
Me.Label21.Name = "Label21"
Me.Label21.Size = New System.Drawing.Size(75, 13)
Me.Label21.TabIndex = 69
Me.Label21.Text = "Geschäftsjahr:"
'
'frmStartOptions
'
@@ -1922,6 +1960,7 @@ Partial Class frmStartOptions
Me.tbcntr.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
Me.TabPage1.PerformLayout()
CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.picC0008, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1943,7 +1982,6 @@ Partial Class frmStartOptions
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -2081,4 +2119,6 @@ Partial Class frmStartOptions
Friend WithEvents Button16 As Button
Friend WithEvents LinkLabel37 As LinkLabel
Friend WithEvents PictureBox16 As PictureBox
Friend WithEvents Label21 As Label
Friend WithEvents txtGJ_UNISPED As VERAG_PROG_ALLGEMEIN.MyTextBox
End Class

16
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -70,6 +70,8 @@ Public Class frmStartOptions
cboSYSKAFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG 360 GmbH", "19"))
cboSYSKAFirma.changeItem("")
txtGJ_UNISPED.Text = Now.Year
txtEZOLLAnhDat._value = Now.ToShortDateString
Dim PARAM = "" 'INSERT_BENACHRICHTIGUNG_VERMERKE_TEAMS
@@ -81,6 +83,9 @@ Public Class frmStartOptions
' Next
End If
'doIDSPlatts()
'Exit Sub
'Standart-Errorverhalten ist MAIL
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL
@@ -1170,6 +1175,10 @@ Public Class frmStartOptions
' EXCEL AUSLESEN:::::::
':::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
If Not IO.Directory.Exists(ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\")) Then IO.Directory.CreateDirectory(ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\"))
Dim FILE_NEW = IDS_FILE.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", "_ORIG.xls")
While IO.File.Exists(FILE_NEW)
@@ -1533,6 +1542,7 @@ Public Class frmStartOptions
End Try
Try
If Not IO.Directory.Exists(ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\")) Then IO.Directory.CreateDirectory(ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\"))
Dim newFile = MIC_FILE.Replace("\NEW\", "\" & Now.Year & "\")
@@ -3010,10 +3020,12 @@ Public Class frmStartOptions
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox5.Checked 'False
If Not IsNumeric(txtGJ_UNISPED.Text) Then MsgBox("GJ: Falsches Fomat!")
If cboBMDUnispedFirma._value = "" Then
VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_ALL(CheckBox4.Checked, False)
VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_ALL(CheckBox4.Checked, False,, txtGJ_UNISPED.Text)
Else
VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_Buchungen(cboBMDUnispedFirma._value, CheckBox4.Checked)
VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_Buchungen(cboBMDUnispedFirma._value, CheckBox4.Checked, txtGJ_UNISPED.Text)
End If
End Sub