diff --git a/Aviso/ATEZ/frmATEZ_EZA.Designer.vb b/Aviso/ATEZ/frmATEZ_EZA.Designer.vb index e66573f..371d3e6 100644 --- a/Aviso/ATEZ/frmATEZ_EZA.Designer.vb +++ b/Aviso/ATEZ/frmATEZ_EZA.Designer.vb @@ -28,8 +28,11 @@ Partial Class frmATEZ_EZA Me.pnlHead = New System.Windows.Forms.Panel() Me.lblInfo = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() + Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() + Me.sbAdressierteZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.txtDyMandant = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtDyNiederlassung = New System.Windows.Forms.Label() @@ -43,11 +46,10 @@ Partial Class frmATEZ_EZA Me.btnAgg_Origin = New System.Windows.Forms.Button() Me.btnAgg_Unit = New System.Windows.Forms.Button() Me.btnAgg_desc = New System.Windows.Forms.Button() - Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtLKWId = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.sbAdressierteZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() 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() @@ -74,6 +76,7 @@ Partial Class frmATEZ_EZA ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnlHead.BackColor = System.Drawing.Color.White + Me.pnlHead.Controls.Add(Me.Label4) Me.pnlHead.Controls.Add(Me.lblInfo) Me.pnlHead.Controls.Add(Me.Label8) Me.pnlHead.Controls.Add(Me.cboStammreferenz) @@ -110,6 +113,45 @@ Partial Class frmATEZ_EZA Me.Label8.Text = "Stammreferenz:" Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'cboStammreferenz + ' + Me.cboStammreferenz._allowedValuesFreiText = Nothing + Me.cboStammreferenz._allowFreiText = False + Me.cboStammreferenz._value = "" + Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboStammreferenz.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.cboStammreferenz.FormattingEnabled = True + Me.cboStammreferenz.Location = New System.Drawing.Point(151, 56) + Me.cboStammreferenz.Name = "cboStammreferenz" + Me.cboStammreferenz.Size = New System.Drawing.Size(255, 24) + Me.cboStammreferenz.TabIndex = 145 + ' + 'txtLKWId + ' + Me.txtLKWId._DateTimeOnly = False + Me.txtLKWId._numbersOnly = False + Me.txtLKWId._numbersOnlyKommastellen = "" + Me.txtLKWId._numbersOnlyTrennzeichen = True + Me.txtLKWId._Prozent = False + Me.txtLKWId._ShortDateNew = False + Me.txtLKWId._ShortDateOnly = False + Me.txtLKWId._TimeOnly = False + Me.txtLKWId._TimeOnly_Seconds = False + Me.txtLKWId._value = "" + Me.txtLKWId._Waehrung = False + Me.txtLKWId._WaehrungZeichen = True + Me.txtLKWId.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtLKWId.ForeColor = System.Drawing.Color.Black + Me.txtLKWId.Location = New System.Drawing.Point(151, 86) + Me.txtLKWId.MaxLineLength = -1 + Me.txtLKWId.MaxLines_Warning = "" + Me.txtLKWId.MaxLines_Warning_Label = Nothing + Me.txtLKWId.Name = "txtLKWId" + Me.txtLKWId.Size = New System.Drawing.Size(255, 23) + Me.txtLKWId.TabIndex = 144 + ' 'Label3 ' Me.Label3.Location = New System.Drawing.Point(10, 91) @@ -126,6 +168,32 @@ Partial Class frmATEZ_EZA Me.Label9.TabIndex = 110 Me.Label9.Text = "Adressierte-Zollstelle:" ' + 'sbAdressierteZollstelle + ' + Me.sbAdressierteZollstelle._allowFreitext = False + Me.sbAdressierteZollstelle._AllowSetValue = False + Me.sbAdressierteZollstelle._allowSpaceAsSplitter = False + Me.sbAdressierteZollstelle._autoSizeGross = False + Me.sbAdressierteZollstelle._hideIfListEmpty = True + Me.sbAdressierteZollstelle._value = "" + Me.sbAdressierteZollstelle.conn_art = "FMZOLL" + Me.sbAdressierteZollstelle.dgvpos = "LEFT" + Me.sbAdressierteZollstelle.DISPLAY_PARAM = Nothing + Me.sbAdressierteZollstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.sbAdressierteZollstelle.INVISIBLE_COLUMNS = Nothing + Me.sbAdressierteZollstelle.key_visible = False + Me.sbAdressierteZollstelle.KEYPARAM = Nothing + Me.sbAdressierteZollstelle.Location = New System.Drawing.Point(151, 112) + Me.sbAdressierteZollstelle.Name = "sbAdressierteZollstelle" + Me.sbAdressierteZollstelle.searchActive = True + Me.sbAdressierteZollstelle.Size = New System.Drawing.Size(255, 23) + Me.sbAdressierteZollstelle.SQL_ORDER_BY = Nothing + Me.sbAdressierteZollstelle.SQL_SELECT = Nothing + Me.sbAdressierteZollstelle.SQL_WHERE = Nothing + Me.sbAdressierteZollstelle.SQL_WhereParamList = Nothing + Me.sbAdressierteZollstelle.TabIndex = 111 + Me.sbAdressierteZollstelle.usrcntl = Nothing + ' 'txtDyMandant ' Me.txtDyMandant.BackColor = System.Drawing.Color.White @@ -258,71 +326,6 @@ Partial Class frmATEZ_EZA Me.btnAgg_desc.Text = "Warenbeschreibung" Me.btnAgg_desc.UseVisualStyleBackColor = True ' - 'cboStammreferenz - ' - Me.cboStammreferenz._allowedValuesFreiText = Nothing - Me.cboStammreferenz._allowFreiText = False - Me.cboStammreferenz._value = "" - Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboStammreferenz.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.cboStammreferenz.FormattingEnabled = True - Me.cboStammreferenz.Location = New System.Drawing.Point(151, 56) - Me.cboStammreferenz.Name = "cboStammreferenz" - Me.cboStammreferenz.Size = New System.Drawing.Size(255, 24) - Me.cboStammreferenz.TabIndex = 145 - ' - 'txtLKWId - ' - Me.txtLKWId._DateTimeOnly = False - Me.txtLKWId._numbersOnly = False - Me.txtLKWId._numbersOnlyKommastellen = "" - Me.txtLKWId._numbersOnlyTrennzeichen = True - Me.txtLKWId._Prozent = False - Me.txtLKWId._ShortDateNew = False - Me.txtLKWId._ShortDateOnly = False - Me.txtLKWId._TimeOnly = False - Me.txtLKWId._TimeOnly_Seconds = False - Me.txtLKWId._value = "" - Me.txtLKWId._Waehrung = False - Me.txtLKWId._WaehrungZeichen = True - Me.txtLKWId.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtLKWId.ForeColor = System.Drawing.Color.Black - Me.txtLKWId.Location = New System.Drawing.Point(151, 86) - Me.txtLKWId.MaxLineLength = -1 - Me.txtLKWId.MaxLines_Warning = "" - Me.txtLKWId.MaxLines_Warning_Label = Nothing - Me.txtLKWId.Name = "txtLKWId" - Me.txtLKWId.Size = New System.Drawing.Size(255, 23) - Me.txtLKWId.TabIndex = 144 - ' - 'sbAdressierteZollstelle - ' - Me.sbAdressierteZollstelle._allowFreitext = False - Me.sbAdressierteZollstelle._AllowSetValue = False - Me.sbAdressierteZollstelle._allowSpaceAsSplitter = False - Me.sbAdressierteZollstelle._autoSizeGross = False - Me.sbAdressierteZollstelle._hideIfListEmpty = True - Me.sbAdressierteZollstelle._value = "" - Me.sbAdressierteZollstelle.conn_art = "FMZOLL" - Me.sbAdressierteZollstelle.dgvpos = "LEFT" - Me.sbAdressierteZollstelle.DISPLAY_PARAM = Nothing - Me.sbAdressierteZollstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.sbAdressierteZollstelle.INVISIBLE_COLUMNS = Nothing - Me.sbAdressierteZollstelle.key_visible = False - Me.sbAdressierteZollstelle.KEYPARAM = Nothing - Me.sbAdressierteZollstelle.Location = New System.Drawing.Point(151, 112) - Me.sbAdressierteZollstelle.Name = "sbAdressierteZollstelle" - Me.sbAdressierteZollstelle.searchActive = True - Me.sbAdressierteZollstelle.Size = New System.Drawing.Size(255, 23) - Me.sbAdressierteZollstelle.SQL_ORDER_BY = Nothing - Me.sbAdressierteZollstelle.SQL_SELECT = Nothing - Me.sbAdressierteZollstelle.SQL_WHERE = Nothing - Me.sbAdressierteZollstelle.SQL_WhereParamList = Nothing - Me.sbAdressierteZollstelle.TabIndex = 111 - Me.sbAdressierteZollstelle.usrcntl = Nothing - ' 'dgvAnhaenge ' Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 @@ -348,12 +351,32 @@ Partial Class frmATEZ_EZA Me.columnName.Name = "columnName" Me.columnName.ReadOnly = True ' + 'Label4 + ' + Me.Label4.BackColor = System.Drawing.Color.White + Me.Label4.Location = New System.Drawing.Point(106, 8) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(45, 12) + 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) @@ -400,4 +423,6 @@ Partial Class frmATEZ_EZA Friend WithEvents btnAgg_Origin As Button Friend WithEvents btnAgg_Unit As Button Friend WithEvents btnAgg_desc As Button + Friend WithEvents Label4 As Label + Friend WithEvents Button2 As Button End Class diff --git a/Aviso/ATEZ/frmATEZ_EZA.vb b/Aviso/ATEZ/frmATEZ_EZA.vb index 104ce2e..8405dc5 100644 --- a/Aviso/ATEZ/frmATEZ_EZA.vb +++ b/Aviso/ATEZ/frmATEZ_EZA.vb @@ -1,5 +1,6 @@  Imports com.esendex.sdk.optouts.models +Imports DAKOSY_Worker Imports DAKOSY_Worker.eZollTypes Imports SDL Imports VERAG_PROG_ALLGEMEIN @@ -75,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 @@ -112,7 +113,7 @@ Public Class frmATEZ_EZA 'txtDyMandant.Text = "VERA" 'TEST!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - txtDyMandant.Text = "VERG" + 'txtDyMandant.Text = "VERG" ' atez.setJsonPDF(atez_data, dgvAnhaenge) @@ -301,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----------------------------------------------------------------------------------------------------------------------------------------------------------------- '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -450,21 +458,26 @@ Public Class frmATEZ_EZA Private Sub frmATEZNCTS_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Select Case FIRMA_DY - Case "VERAG" : txtDyMandant.Text = "VERG" - txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + 'Select Case FIRMA_DY + ' Case "VERAG" : txtDyMandant.Text = "VERG" + ' txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG - Select Case FilialenNr - Case "5103" : txtDyNiederlassung.Text = "WAI" + ' Select Case FilialenNr + ' Case "5103" : txtDyNiederlassung.Text = "WAI" - End Select + ' End Select - Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" - Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" - Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" - Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" - End Select + ' Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" + ' Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" + ' 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.getIOPartner(FIRMA_DY) + txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY) + + Label4.Text = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "-").ToString initSeachboxes() lblAnh.Visible = True @@ -484,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) @@ -522,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)