asfinag, etc.
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.2.4.4")>
|
<Assembly: AssemblyVersion("1.2.4.5")>
|
||||||
<Assembly: AssemblyFileVersion("1.2.4.4")>
|
<Assembly: AssemblyFileVersion("1.2.4.5")>
|
||||||
|
|||||||
@@ -4266,14 +4266,14 @@ Public Class usrctlProcedures
|
|||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT DATEADD(MONTH, 1, MonatStart)
|
SELECT DATEADD(MONTH, 1, MonatStart)
|
||||||
FROM Monate
|
FROM Monate
|
||||||
WHERE MonatStart < '" & dtpbis.Value & "'
|
WHERE MonatStart < '" & dtpbis.Value & "'),
|
||||||
),
|
|
||||||
Daten AS (
|
Daten AS (
|
||||||
SELECT
|
SELECT
|
||||||
Teilnehmer,
|
Teilnehmer,
|
||||||
YEAR(Überlassungsdatum) AS Jahr,
|
YEAR(Überlassungsdatum) AS Jahr,
|
||||||
MONTH(Überlassungsdatum) AS Monat,
|
MONTH(Überlassungsdatum) AS Monat,
|
||||||
COUNT(*) AS DS_Anzahl
|
COUNT(*) AS DS_Anzahl,
|
||||||
|
COUNT(distinct(Registriernummer_MRN)) AS Anmeldungen_Anzahl
|
||||||
FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import]
|
FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import]
|
||||||
WHERE Überlassungsdatum IS NOT NULL
|
WHERE Überlassungsdatum IS NOT NULL
|
||||||
GROUP BY Teilnehmer, YEAR(Überlassungsdatum), MONTH(Überlassungsdatum)
|
GROUP BY Teilnehmer, YEAR(Überlassungsdatum), MONTH(Überlassungsdatum)
|
||||||
@@ -4286,7 +4286,8 @@ SELECT
|
|||||||
t.Teilnehmer,
|
t.Teilnehmer,
|
||||||
YEAR(m.MonatStart) AS Jahr,
|
YEAR(m.MonatStart) AS Jahr,
|
||||||
MONTH(m.MonatStart) AS Monat,
|
MONTH(m.MonatStart) AS Monat,
|
||||||
ISNULL(d.DS_Anzahl, 0) AS DS_Anzahl
|
ISNULL(d.DS_Anzahl, 0) AS DS_Anzahl,
|
||||||
|
ISNULL(d.Anmeldungen_Anzahl, 0) AS Anmeldungen_Anzahl
|
||||||
FROM Monate m
|
FROM Monate m
|
||||||
CROSS JOIN TeilnehmerListe t
|
CROSS JOIN TeilnehmerListe t
|
||||||
LEFT JOIN Daten d
|
LEFT JOIN Daten d
|
||||||
|
|||||||
@@ -1964,12 +1964,12 @@ Public Class cAsfinag
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
MDMEinarb.ds_total = counTrans
|
MDMEinarb.ds_total = counTrans - 2 'total - 2 (header + trailer)
|
||||||
MDMEinarb.ds_count = savedTrans
|
MDMEinarb.ds_count = savedTrans
|
||||||
MDMEinarb.importfilename = fi.Name
|
MDMEinarb.importfilename = fi.Name
|
||||||
MDMEinarb.import_date = Now()
|
MDMEinarb.import_date = Now()
|
||||||
|
|
||||||
If MDMEinarb.ds_total - 2 = MDMEinarb.ds_count Then 'total - header - trailer
|
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
|
||||||
MDMEinarb.completed = True
|
MDMEinarb.completed = True
|
||||||
MDMEinarb.completed_date = Now()
|
MDMEinarb.completed_date = Now()
|
||||||
End If
|
End If
|
||||||
|
|||||||
Reference in New Issue
Block a user