Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -400,7 +400,6 @@ Anzeige:
|
||||
|
||||
End If
|
||||
|
||||
|
||||
'----------------------------------------------------------------
|
||||
|
||||
FORM.addDGVEinarbeitung("VW: Bekanntgabe Massnahme", regNR)
|
||||
@@ -417,6 +416,15 @@ Anzeige:
|
||||
|
||||
Dim BezugsNr = readVW_SumAVerwahrungsinfo
|
||||
|
||||
Dim originalTestSetting As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
|
||||
|
||||
Try
|
||||
|
||||
If Not originalTestSetting Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
End If
|
||||
|
||||
|
||||
If VeralteteWeitereRegistriernummer = "" Then Return False
|
||||
|
||||
Dim filiale As String = ""
|
||||
@@ -475,12 +483,10 @@ Anzeige:
|
||||
|
||||
If SND IsNot Nothing AndAlso SND.tblSnd_Abfertigungsart_ID = 44 Then
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
|
||||
Dim existingEntries As DataTable
|
||||
existingEntries = (New SQL).loadDgvBySql("Select gs_gsnr, gs_gsId, gs_posNr, gs_freitext,gs_systemuser,gs_VeralteteWeitereRegistriernummer from [tblGesamtsicherheit] where [gs_ATBNr] = '" & Vorpapiernummer & "' order by gs_datum desc", "AVISO")
|
||||
If existingEntries.Rows.Count = 0 Then
|
||||
existingEntries = (New SQL).loadDgvBySql("Select gs_gsnr, gs_gsId, gs_freitext,gs_systemuser,gs_VeralteteWeitereRegistriernummer from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or (gs_avisoId = " & SND.tblSnd_AvisoID & ") order by gs_datum desc", "AVISO")
|
||||
existingEntries = (New SQL).loadDgvBySql("Select gs_gsnr, gs_gsId, gs_posNr,gs_freitext,gs_systemuser,gs_VeralteteWeitereRegistriernummer from [tblGesamtsicherheit] where ([gs_filialenNr] = '" & SND.FilialenNr & "' and [gs_abfertigungsNr] = " & SND.AbfertigungsNr & " ) or (gs_avisoId = " & SND.tblSnd_AvisoID & ") order by gs_datum desc", "AVISO")
|
||||
End If
|
||||
|
||||
If existingEntries.Rows.Count > 0 Then
|
||||
@@ -495,8 +501,6 @@ Anzeige:
|
||||
End If
|
||||
|
||||
Dim urspringsSicherheit As cSicherheiten
|
||||
|
||||
Try
|
||||
Dim rows = existingEntries.Select("gs_freitext = 'DAKOSY DUMMY' AND gs_posNr = 0")
|
||||
|
||||
If rows.Length > 0 Then
|
||||
@@ -646,40 +650,42 @@ Anzeige:
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("verwahrung@verag.ag", IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "Verwahrungseingang aus DAKOSY - " & Now().ToShortDateString, InfoText,,,,, "d.breimaier@verag.ag")
|
||||
End If
|
||||
|
||||
|
||||
|
||||
'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Return True
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Return False
|
||||
|
||||
Finally
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = originalTestSetting
|
||||
End Try
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
End Function
|
||||
|
||||
Shared Sub saveVerwahrungsAusgang(regNR As String, posErledigung As DataTable, veralteteregNR As String, EZA As DAKOSY_Worker.SumAErledigungsinformationVorpapier_005.SumAErledigungsinformationVorpapierSIVRPTyp, sendInfoMail As Boolean)
|
||||
|
||||
Dim originalTestSetting As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
|
||||
|
||||
Try
|
||||
|
||||
If Not originalTestSetting Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
End If
|
||||
|
||||
If posErledigung IsNot Nothing AndAlso posErledigung.Rows.Count > 0 Then
|
||||
|
||||
If regNR <> "" AndAlso veralteteregNR <> "" Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
|
||||
|
||||
For Each POS As DataRow In posErledigung.Rows
|
||||
|
||||
@@ -701,9 +707,6 @@ Anzeige:
|
||||
If dtGesamtsicherheit.Rows.Count > 0 Then
|
||||
|
||||
|
||||
|
||||
Try
|
||||
|
||||
Dim gs_row As DataRow = dtGesamtsicherheit.Rows(0)
|
||||
|
||||
Dim rows = dtGesamtsicherheit.Select("gsp_gspPosId = " & gs_row("gs_posNr") & " AND gsp_MRNNr IS NOT NULL")
|
||||
@@ -720,10 +723,11 @@ Anzeige:
|
||||
Dim Warenwert As Double = 0
|
||||
Dim Sicherheitsbetrag As Double = 0
|
||||
|
||||
'Berechnung Warenwert und Sicherheitsbetrag aus Sendung
|
||||
'Berechnung Warenwert und Sicherheitsbetrag aus Sendung -> immer aus den Produktivdaten!
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Dim dtVorpapiere As DataTable = SQL.loadDgvBySql("SELECT tblSnd_Warenwert,tblSnd_WarenwertWaehrung,tblSnd_Vorpapier_Pos,tblSnd_Vorpapier2_Pos, tblSnd_Vorpapier3_Pos from tblSendungen where tblSnd_Vorpapier = '" & gs_row("gs_ATBNr") & "' Or tblSnd_Vorpapier2 = '" & gs_row("gs_ATBNr") & "' OR tblSnd_Vorpapier3 = '" & gs_row("gs_ATBNr") & "'", "AVISO")
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
|
||||
If dtVorpapiere.Rows.Count > 0 Then
|
||||
|
||||
Dim rowsVorp = dtVorpapiere.Select("tblSnd_Warenwert is not null AND (tblSnd_Vorpapier_Pos = '" & gs_row.Item("gs_posNr") & "' or tblSnd_Vorpapier2_Pos = '" & gs_row.Item("gs_posNr") & "' or tblSnd_Vorpapier3_Pos = '" & gs_row.Item("gs_posNr") & "')")
|
||||
@@ -798,17 +802,6 @@ Anzeige:
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("verwahrung@verag.ag", IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "Verwahrungsausgang aus DAKOSY - " & Now().ToShortDateString, InfoText2,,,,, "d.breimaier@verag.ag")
|
||||
End If
|
||||
|
||||
|
||||
'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
|
||||
Finally
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
End Try
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
@@ -818,12 +811,16 @@ Anzeige:
|
||||
|
||||
Next
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
Finally
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = originalTestSetting
|
||||
End Try
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Shared Function AddNewGesamtSichNr() As Integer
|
||||
|
||||
Reference in New Issue
Block a user