ATEZ

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -49,6 +49,7 @@ Partial Class frmATEZ_EZA
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Label4 = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.pnlHead.SuspendLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -359,12 +360,23 @@ Partial Class frmATEZ_EZA
         Me.Label4.TabIndex = 149
         Me.Label4.Text = "SUB"
         '
+        'Button2
+        '
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(416, 383)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(65, 23)
+        Me.Button2.TabIndex = 158
+        Me.Button2.Text = "json"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
         'frmATEZ_EZA
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.ClientSize = New System.Drawing.Size(680, 413)
+        Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.btnAgg_desc)
         Me.Controls.Add(Me.btnAgg_Tnr)
         Me.Controls.Add(Me.btnAgg_Unit)
@@ -412,4 +424,5 @@ Partial Class frmATEZ_EZA
     Friend WithEvents btnAgg_Unit As Button
     Friend WithEvents btnAgg_desc As Button
     Friend WithEvents Label4 As Label
+    Friend WithEvents Button2 As Button
 End Class

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -76,7 +76,7 @@ Public Class frmATEZ_EZA
 
     End Sub
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnSend.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnSend.Click, Button2.Click
         Try
 
 
@@ -113,7 +113,7 @@ Public Class frmATEZ_EZA
 
 
             'txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            txtDyMandant.Text = "VERG"
+            'txtDyMandant.Text = "VERG"
 
             '    atez.setJsonPDF(atez_data, dgvAnhaenge)
 
@@ -302,6 +302,13 @@ Public Class frmATEZ_EZA
             ATEZ_RH_EZA.dispatchCountry = If(ATEZ_RH_EZA.dispatchCountry, "") ' not null
             ATEZ_RH_EZA.destinationCountry = If(ATEZ_RH_EZA.destinationCountry, "") ' not null
 
+
+            '-------------------JSON AUSGEBEN-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+            If sender Is Button2 Then
+                MsgBox(VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHub_sendToRelayHub_JobOrderRequest.getJSON(ATEZ_RH_EZA))
+                Exit Sub ' --> Json uns raus...
+
+            End If
             '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
             '-------------------SENDEN-----------------------------------------------------------------------------------------------------------------------------------------------------------------
             '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -466,9 +473,9 @@ Public Class frmATEZ_EZA
         '    Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME"
         '    Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
         'End Select 
-
+        FIRMA_DY = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)
-        txtDyMandant.Text = cDakosyFunftions.getFirma_DY(FilialenNr.ToString, Me)
+        txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY)
-        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(txtDyMandant.Text)
+        txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY)
 
         Label4.Text = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "-").ToString
 
@@ -490,7 +497,7 @@ Public Class frmATEZ_EZA
 
                 lblBezugsnummer.Text = atez_data.VERAG_LRN
 
-                cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+                cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "' " & If(txtDyMandant.Text = "UNAT", ", 'ATSPED' ", "") & ")  and dySr_visible=1", False, "FMZOLL", True)
                 cboStammreferenz.changeItem(atez_data.DAKOSY_TemplateCode)
                 'cboProzedur.changeItem(atez_data.DAKOSY_Procedure)
 
@@ -528,7 +535,7 @@ Public Class frmATEZ_EZA
             'Button1.Text = "An ATEZ senden -->"
             pnlHead.Enabled = True
 
-            cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+            cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "' " & If(txtDyMandant.Text = "UNAT", ", 'ATSPED' ", "") & ")  and dySr_visible=1", False, "FMZOLL", True)
             cboStammreferenz.changeItem("")
 
             getBezugsnr(BezugsNr)