From 5a68a36e4a2d071c55747f022255a1dfd57e1514 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 27 Apr 2026 08:13:47 +0200 Subject: [PATCH] LZ klipp --- .../rptLaufzettelZollDE.Designer.vb | 30 ++- SDL/Formulare/KDFormulare/frmFormulare.vb | 3 + .../usrCntlATLAS_EXGestellung.Designer.vb | 238 ++++++++++-------- .../EXGestellung/usrCntlATLAS_EXGestellung.vb | 73 ++++-- .../ATEZ/Read_T1/cATEZ_Read_T1.vb | 2 +- 5 files changed, 220 insertions(+), 126 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/rptLaufzettelZollDE.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/rptLaufzettelZollDE.Designer.vb index a5578e85..1ea1d921 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/rptLaufzettelZollDE.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/rptLaufzettelZollDE.Designer.vb @@ -80,13 +80,14 @@ Partial Public Class rptLaufzettelZollDE Me.TextBox3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.Line1 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() - Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() Me.Shape6 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.Shape7 = New GrapeCity.ActiveReports.SectionReportModel.Shape() Me.TextBox13 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.picBarcodeMRN = New GrapeCity.ActiveReports.SectionReportModel.Picture() Me.TextBox15 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() Me.TextBox16 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() + Me.TextBox17 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() CType(Me.txtAbfertigungsart, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAbsender, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtVerzollungsadresse, System.ComponentModel.ISupportInitialize).BeginInit() @@ -136,6 +137,7 @@ Partial Public Class rptLaufzettelZollDE CType(Me.picBarcodeMRN, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextBox16, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox17, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -333,7 +335,7 @@ Partial Public Class rptLaufzettelZollDE ' 'ReportHeader1 ' - Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Shape1, Me.txtFirmaInfo_ATILLA, Me.txtFirmaInfo_IMEX, Me.picVERAG, Me.TextBox8, Me.Shape3, Me.Shape4, Me.Shape5, Me.TextBox4, Me.TextBox9, Me.txtLKW, Me.TextBox12, Me.txtLKWId, Me.TextBox14, Me.txtSB, Me.TextBox18, Me.txtDatum, Me.TextBox25, Me.txtGrenzstelle, Me.TextBox27, Me.txtFraechter, Me.TextBox32, Me.TextBox5, Me.TextBox1, Me.Shape2, Me.TextBox2, Me.txtEmail, Me.txtDW, Me.txtFirmeninfo_rontoffice, Me.txtFirma_UNISPED, Me.SubReport1, Me.TextBox7, Me.txtFirmaInfo_VERAG, Me.TextBox11, Me.txtFirmeninfo_ambar}) + Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Shape1, Me.txtFirmaInfo_ATILLA, Me.txtFirmaInfo_IMEX, Me.picVERAG, Me.TextBox8, Me.Shape3, Me.Shape4, Me.Shape5, Me.TextBox4, Me.TextBox9, Me.txtLKW, Me.TextBox12, Me.txtLKWId, Me.TextBox14, Me.txtSB, Me.TextBox18, Me.txtDatum, Me.TextBox25, Me.txtGrenzstelle, Me.TextBox27, Me.txtFraechter, Me.TextBox32, Me.TextBox5, Me.TextBox1, Me.Shape2, Me.TextBox2, Me.txtEmail, Me.txtDW, Me.txtFirmeninfo_rontoffice, Me.txtFirma_UNISPED, Me.SubReport1, Me.TextBox7, Me.txtFirmaInfo_VERAG, Me.TextBox11, Me.txtFirmeninfo_ambar, Me.TextBox17}) Me.ReportHeader1.Height = 2.227953! Me.ReportHeader1.Name = "ReportHeader1" ' @@ -802,11 +804,6 @@ Partial Public Class rptLaufzettelZollDE Me.GroupHeader1.Height = 0.4023623! Me.GroupHeader1.Name = "GroupHeader1" ' - 'GroupFooter1 - ' - Me.GroupFooter1.Height = 0! - Me.GroupFooter1.Name = "GroupFooter1" - ' 'Shape6 ' Me.Shape6.Height = 0.4023622! @@ -874,6 +871,23 @@ Partial Public Class rptLaufzettelZollDE Me.TextBox16.Top = 0.01653543! Me.TextBox16.Width = 0.9429134! ' + 'GroupFooter1 + ' + Me.GroupFooter1.Height = 0! + Me.GroupFooter1.Name = "GroupFooter1" + ' + 'TextBox17 + ' + Me.TextBox17.Height = 0.5000001! + Me.TextBox17.Left = 0.4405512! + Me.TextBox17.Name = "TextBox17" + Me.TextBox17.Style = "font-size: 8.25pt; vertical-align: middle; ddo-char-set: 204" + Me.TextBox17.Text = "D-01665 Klipphausen" & Global.Microsoft.VisualBasic.ChrW(9) & Global.Microsoft.VisualBasic.ChrW(9) & Global.Microsoft.VisualBasic.ChrW(9) & "Tel. +49 8503/7973999-550 " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Am Bahndamm 3" & Global.Microsoft.VisualBasic.ChrW(9) & Global.Microsoft.VisualBasic.ChrW(9) & Global.Microsoft.VisualBasic.ChrW(9) & Global.Microsoft.VisualBasic.ChrW(9) & " klipphausen@" & + "front-office.eu" + Me.TextBox17.Top = 0! + Me.TextBox17.Visible = False + Me.TextBox17.Width = 6.67165! + ' 'rptLaufzettelZollDE ' Me.MasterReport = False @@ -946,6 +960,7 @@ Partial Public Class rptLaufzettelZollDE CType(Me.picBarcodeMRN, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextBox16, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox17, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub @@ -1017,4 +1032,5 @@ Partial Public Class rptLaufzettelZollDE Public WithEvents TextBox16 As GrapeCity.ActiveReports.SectionReportModel.TextBox Public WithEvents picBarcodeMRN As GrapeCity.ActiveReports.SectionReportModel.Picture Public WithEvents GroupHeader1 As GrapeCity.ActiveReports.SectionReportModel.GroupHeader + Public WithEvents TextBox17 As GrapeCity.ActiveReports.SectionReportModel.TextBox End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index eb0e9be6..96b9d2f7 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -3078,6 +3078,7 @@ Public Class FormularManagerNEU Case "WAI" : rpt.txtGrenzstelle.Text = "WAIDHAUS" Case "SBG" : rpt.txtGrenzstelle.Text = "BAD REICHENHALL" Case "SFD" : rpt.txtGrenzstelle.Text = "SPIELFELD" + Case "KLIPP" : rpt.txtGrenzstelle.Text = "KLIPPHAUSEN (DRESDEN)" Case "DTB", "FO_WIHD" : rpt.txtGrenzstelle.Text = "DETTELBACH" Case Else : rpt.txtGrenzstelle.Text = AVISO.Grenzstelle.Replace("???", "") End Select @@ -3584,6 +3585,8 @@ Public Class FormularManagerNEU Case "WAI" : ort = "Waidhaus" Case "NKD" : ort = "Nickelsdorf" Case "NEU" : ort = "Neuhaus am Inn" + Case "KLIPP" : ort = "Klipphausen" ': rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal + End Select rpt.TextBox32.Text = "Avisierer (*):" rpt.txtFraechter.Text = AVISO.Auftraggeber diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb index a35b6de6..26330608 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.Designer.vb @@ -24,18 +24,14 @@ Partial Class usrCntlATLAS_EXGestellung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.SplitContainer = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) - Me.btnAllgemein = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.cboDakosyAction = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() + Me.cbxNCTS = New System.Windows.Forms.CheckBox() Me.Label4 = New System.Windows.Forms.Label() Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label3 = New System.Windows.Forms.Label() Me.rtbMRN = New System.Windows.Forms.RichTextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label6 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.lblBezugsnummer = New System.Windows.Forms.Label() @@ -46,19 +42,25 @@ Partial Class usrCntlATLAS_EXGestellung Me.txtDyNiederlassung = New System.Windows.Forms.Label() Me.MenuStrip = New System.Windows.Forms.MenuStrip() Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Button2 = New System.Windows.Forms.Button() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) + Me.btnAllgemein = New System.Windows.Forms.Button() + Me.cboDakosyAction = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.cbxNCTS = New System.Windows.Forms.CheckBox() Me.cbxAutoTranslate = New System.Windows.Forms.CheckBox() Me.cbxForceTranslate = New System.Windows.Forms.CheckBox() + Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label5 = New System.Windows.Forms.Label() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() Me.SplitContainer.SuspendLayout() - Me.MyFlowLayoutPanel1.SuspendLayout() Me.pnl.SuspendLayout() Me.cntxtBezugsnr.SuspendLayout() Me.Panel1.SuspendLayout() Me.MenuStrip.SuspendLayout() + Me.MyFlowLayoutPanel1.SuspendLayout() Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' @@ -80,6 +82,8 @@ Partial Class usrCntlATLAS_EXGestellung 'SplitContainer.Panel2 ' Me.SplitContainer.Panel2.BackColor = System.Drawing.Color.White + Me.SplitContainer.Panel2.Controls.Add(Me.Label5) + Me.SplitContainer.Panel2.Controls.Add(Me.Button2) Me.SplitContainer.Panel2.Controls.Add(Me.cbxNCTS) Me.SplitContainer.Panel2.Controls.Add(Me.MyPanel1) Me.SplitContainer.Panel2.Controls.Add(Me.Label4) @@ -95,35 +99,6 @@ Partial Class usrCntlATLAS_EXGestellung Me.SplitContainer.SplitterWidth = 1 Me.SplitContainer.TabIndex = 0 ' - 'MyFlowLayoutPanel1 - ' - Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.WhiteSmoke - Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAllgemein) - Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) - Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(1) - Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(653, 72) - Me.MyFlowLayoutPanel1.TabIndex = 0 - ' - 'btnAllgemein - ' - Me.btnAllgemein.BackColor = System.Drawing.Color.SteelBlue - Me.btnAllgemein.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.btnAllgemein.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAllgemein.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.btnAllgemein.Image = Global.SDL.My.Resources.Resources.android_note12 - Me.btnAllgemein.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnAllgemein.Location = New System.Drawing.Point(2, 2) - Me.btnAllgemein.Margin = New System.Windows.Forms.Padding(2) - Me.btnAllgemein.Name = "btnAllgemein" - Me.btnAllgemein.Padding = New System.Windows.Forms.Padding(0, 12, 0, 3) - Me.btnAllgemein.Size = New System.Drawing.Size(75, 67) - Me.btnAllgemein.TabIndex = 0 - Me.btnAllgemein.Text = "Allgemein" - Me.btnAllgemein.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btnAllgemein.UseVisualStyleBackColor = False - ' 'pnl ' Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke @@ -135,20 +110,6 @@ Partial Class usrCntlATLAS_EXGestellung Me.pnl.Size = New System.Drawing.Size(361, 72) Me.pnl.TabIndex = 1 ' - 'cboDakosyAction - ' - Me.cboDakosyAction._allowedValuesFreiText = Nothing - Me.cboDakosyAction._allowFreiText = False - Me.cboDakosyAction._value = "" - Me.cboDakosyAction.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cboDakosyAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDakosyAction.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboDakosyAction.FormattingEnabled = True - Me.cboDakosyAction.Location = New System.Drawing.Point(200, 48) - Me.cboDakosyAction.Name = "cboDakosyAction" - Me.cboDakosyAction.Size = New System.Drawing.Size(159, 21) - Me.cboDakosyAction.TabIndex = 1 - ' 'Button1 ' Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -165,6 +126,18 @@ Partial Class usrCntlATLAS_EXGestellung Me.Button1.Text = "An DAKOSY senden -->" Me.Button1.UseVisualStyleBackColor = False ' + 'cbxNCTS + ' + Me.cbxNCTS.AutoSize = True + Me.cbxNCTS.Checked = True + Me.cbxNCTS.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxNCTS.Location = New System.Drawing.Point(474, 31) + Me.cbxNCTS.Name = "cbxNCTS" + Me.cbxNCTS.Size = New System.Drawing.Size(98, 17) + Me.cbxNCTS.TabIndex = 21 + Me.cbxNCTS.Text = "NCTS Erstellen" + Me.cbxNCTS.UseVisualStyleBackColor = True + ' 'Label4 ' Me.Label4.AutoSize = True @@ -183,31 +156,6 @@ Partial Class usrCntlATLAS_EXGestellung Me.TextBox1.Size = New System.Drawing.Size(25, 20) Me.TextBox1.TabIndex = 18 ' - 'sbAbgangZollstelle - ' - Me.sbAbgangZollstelle._allowFreitext = False - Me.sbAbgangZollstelle._AllowSetValue = False - Me.sbAbgangZollstelle._allowSpaceAsSplitter = False - Me.sbAbgangZollstelle._autoSizeGross = False - Me.sbAbgangZollstelle._hideIfListEmpty = True - Me.sbAbgangZollstelle._value = "" - Me.sbAbgangZollstelle.conn_art = "FMZOLL" - Me.sbAbgangZollstelle.dgvpos = "LEFT" - Me.sbAbgangZollstelle.DISPLAY_PARAM = Nothing - Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing - Me.sbAbgangZollstelle.key_visible = False - Me.sbAbgangZollstelle.KEYPARAM = Nothing - Me.sbAbgangZollstelle.Location = New System.Drawing.Point(145, 56) - Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle" - Me.sbAbgangZollstelle.searchActive = True - Me.sbAbgangZollstelle.Size = New System.Drawing.Size(183, 20) - Me.sbAbgangZollstelle.SQL_ORDER_BY = Nothing - Me.sbAbgangZollstelle.SQL_SELECT = Nothing - Me.sbAbgangZollstelle.SQL_WHERE = Nothing - Me.sbAbgangZollstelle.SQL_WhereParamList = Nothing - Me.sbAbgangZollstelle.TabIndex = 17 - Me.sbAbgangZollstelle.usrcntl = Nothing - ' 'Label3 ' Me.Label3.AutoSize = True @@ -236,20 +184,6 @@ Partial Class usrCntlATLAS_EXGestellung Me.Label2.Text = "NCTS-Vorpapier (MRN):" Me.Label2.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.FormattingEnabled = True - Me.cboStammreferenz.Location = New System.Drawing.Point(144, 27) - Me.cboStammreferenz.Name = "cboStammreferenz" - Me.cboStammreferenz.Size = New System.Drawing.Size(280, 21) - Me.cboStammreferenz.TabIndex = 11 - ' 'Label6 ' Me.Label6.AutoSize = True @@ -344,6 +278,66 @@ Partial Class usrCntlATLAS_EXGestellung Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20) Me.OptionenToolStripMenuItem.Text = "Optionen" ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.BackColor = System.Drawing.Color.White + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.Button2.Location = New System.Drawing.Point(341, 2) + Me.Button2.Margin = New System.Windows.Forms.Padding(2) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(83, 22) + Me.Button2.TabIndex = 22 + Me.Button2.Text = "UNISPED" + Me.Button2.UseVisualStyleBackColor = False + Me.Button2.Visible = False + ' + 'MyFlowLayoutPanel1 + ' + Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.WhiteSmoke + Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAllgemein) + Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) + Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(1) + Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(653, 72) + Me.MyFlowLayoutPanel1.TabIndex = 0 + ' + 'btnAllgemein + ' + Me.btnAllgemein.BackColor = System.Drawing.Color.SteelBlue + Me.btnAllgemein.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnAllgemein.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAllgemein.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.btnAllgemein.Image = Global.SDL.My.Resources.Resources.android_note12 + Me.btnAllgemein.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnAllgemein.Location = New System.Drawing.Point(2, 2) + Me.btnAllgemein.Margin = New System.Windows.Forms.Padding(2) + Me.btnAllgemein.Name = "btnAllgemein" + Me.btnAllgemein.Padding = New System.Windows.Forms.Padding(0, 12, 0, 3) + Me.btnAllgemein.Size = New System.Drawing.Size(75, 67) + Me.btnAllgemein.TabIndex = 0 + Me.btnAllgemein.Text = "Allgemein" + Me.btnAllgemein.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnAllgemein.UseVisualStyleBackColor = False + ' + 'cboDakosyAction + ' + Me.cboDakosyAction._allowedValuesFreiText = Nothing + Me.cboDakosyAction._allowFreiText = False + Me.cboDakosyAction._value = "" + Me.cboDakosyAction.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboDakosyAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDakosyAction.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboDakosyAction.FormattingEnabled = True + Me.cboDakosyAction.Location = New System.Drawing.Point(200, 48) + Me.cboDakosyAction.Name = "cboDakosyAction" + Me.cboDakosyAction.Size = New System.Drawing.Size(159, 21) + Me.cboDakosyAction.TabIndex = 1 + ' 'MyPanel1 ' Me.MyPanel1.Controls.Add(Me.cbxAutoTranslate) @@ -354,18 +348,6 @@ Partial Class usrCntlATLAS_EXGestellung Me.MyPanel1.Size = New System.Drawing.Size(560, 504) Me.MyPanel1.TabIndex = 20 ' - 'cbxNCTS - ' - Me.cbxNCTS.AutoSize = True - Me.cbxNCTS.Checked = True - Me.cbxNCTS.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxNCTS.Location = New System.Drawing.Point(474, 31) - Me.cbxNCTS.Name = "cbxNCTS" - Me.cbxNCTS.Size = New System.Drawing.Size(98, 17) - Me.cbxNCTS.TabIndex = 21 - Me.cbxNCTS.Text = "NCTS Erstellen" - Me.cbxNCTS.UseVisualStyleBackColor = True - ' 'cbxAutoTranslate ' Me.cbxAutoTranslate.AutoSize = True @@ -388,6 +370,56 @@ Partial Class usrCntlATLAS_EXGestellung Me.cbxForceTranslate.Text = "Übersetzung erzwingen" Me.cbxForceTranslate.UseVisualStyleBackColor = True ' + 'sbAbgangZollstelle + ' + Me.sbAbgangZollstelle._allowFreitext = False + Me.sbAbgangZollstelle._AllowSetValue = False + Me.sbAbgangZollstelle._allowSpaceAsSplitter = False + Me.sbAbgangZollstelle._autoSizeGross = False + Me.sbAbgangZollstelle._hideIfListEmpty = True + Me.sbAbgangZollstelle._value = "" + Me.sbAbgangZollstelle.conn_art = "FMZOLL" + Me.sbAbgangZollstelle.dgvpos = "LEFT" + Me.sbAbgangZollstelle.DISPLAY_PARAM = Nothing + Me.sbAbgangZollstelle.INVISIBLE_COLUMNS = Nothing + Me.sbAbgangZollstelle.key_visible = False + Me.sbAbgangZollstelle.KEYPARAM = Nothing + Me.sbAbgangZollstelle.Location = New System.Drawing.Point(145, 56) + Me.sbAbgangZollstelle.Name = "sbAbgangZollstelle" + Me.sbAbgangZollstelle.searchActive = True + Me.sbAbgangZollstelle.Size = New System.Drawing.Size(183, 20) + Me.sbAbgangZollstelle.SQL_ORDER_BY = Nothing + Me.sbAbgangZollstelle.SQL_SELECT = Nothing + Me.sbAbgangZollstelle.SQL_WHERE = Nothing + Me.sbAbgangZollstelle.SQL_WhereParamList = Nothing + Me.sbAbgangZollstelle.TabIndex = 17 + Me.sbAbgangZollstelle.usrcntl = Nothing + ' + '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.FormattingEnabled = True + Me.cboStammreferenz.Location = New System.Drawing.Point(144, 27) + Me.cboStammreferenz.Name = "cboStammreferenz" + Me.cboStammreferenz.Size = New System.Drawing.Size(280, 21) + Me.cboStammreferenz.TabIndex = 11 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(253, 7) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(83, 13) + Me.Label5.TabIndex = 23 + Me.Label5.Text = "Firma wechseln:" + Me.Label5.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.Label5.Visible = False + ' 'usrCntlATLAS_EXGestellung ' Me.Controls.Add(Me.SplitContainer) @@ -399,13 +431,13 @@ Partial Class usrCntlATLAS_EXGestellung Me.SplitContainer.Panel2.PerformLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer.ResumeLayout(False) - Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.pnl.ResumeLayout(False) Me.cntxtBezugsnr.ResumeLayout(False) Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.MenuStrip.ResumeLayout(False) Me.MenuStrip.PerformLayout() + Me.MyFlowLayoutPanel1.ResumeLayout(False) Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) @@ -438,4 +470,6 @@ Partial Class usrCntlATLAS_EXGestellung Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel Friend WithEvents cbxForceTranslate As CheckBox Friend WithEvents cbxAutoTranslate As CheckBox + Friend WithEvents Button2 As Button + Friend WithEvents Label5 As Label End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb index 32ec1a71..90b5849e 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EXGestellung/usrCntlATLAS_EXGestellung.vb @@ -45,37 +45,65 @@ Public Class usrCntlATLAS_EXGestellung sbAbgangZollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) cbxNCTS.Checked = False + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + Button2.Visible = True + Label5.Visible = True + End If + + + + End Sub + + + Sub initStammref() Select Case FIRMA_DY - Case "VERAG" : txtDyMandant.Text = "VERG" + Case "VERAG" + txtDyMandant.Text = "VERG" txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG - ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG - 'Case "SUB" : txtDyNiederlassung.Text = "VERG" - 'Case "SUW" : txtDyNiederlassung.Text = "ATIL" - ''Case "SBG" : txtDyNiederlassung.Text = "IMEX" - 'Case "NEU" : txtDyNiederlassung.Text = "IMEX" - 'Case "NKD" : txtDyNiederlassung.Text = "IMEX" - 'End Select - Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" - Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "SUB" '"ATSPED" - Case "IMEX" : txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" - Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" + + Case "ATILLA" + txtDyMandant.Text = "ATIL" + txtDyNiederlassung.Text = "SUW" + + Case "UNISPED" + txtDyMandant.Text = "UNAT" + txtDyNiederlassung.Text = "SUB" + + Case "IMEX" + txtDyMandant.Text = "IMEX" + txtDyNiederlassung.Text = "IME" + + Case "AMBAR" + txtDyMandant.Text = "ATIL" + txtDyNiederlassung.Text = "AMBWO" End Select + Dim MandantWhere As String = "(dySr_dy_Mandant = '" & txtDyMandant.Text & "' " & + "AND dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "'))" + + 'Select Case FIRMA_DY + ' Case "ATILLA" + ' MandantWhere = "((dySr_dy_Mandant = 'ATIL' AND dySr_dy_Niederlassung = 'SUW') " & + ' "OR (dySr_dy_Mandant = 'UNAT' AND dySr_dy_Niederlassung = 'SUB'))" + + ' Case Else + ' MandantWhere = "(dySr_dy_Mandant = '" & txtDyMandant.Text & "' " & + ' "AND dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "'))" + 'End Select + ' Dim BezugsNr = ("ID" & AVISO.AvisoID & "_" & SENDUNG.FilialenNr & "-" & SENDUNG.AbfertigungsNr & "_" & If(AVISO.Auftraggeber.Length > 8, AVISO.Auftraggeber.ToString.Substring(0, 5), AVISO.Auftraggeber)).Trim Dim BezugsNr = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr & "_EXG" lblBezugsnummer.Text = BezugsNr - cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EXG' 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='EXG' and " & MandantWhere & " and dySr_visible=1", False, "FMZOLL", True) ' MsgBox("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1") cboStammreferenz.changeItem("") If cboStammreferenz.Items.Count = 2 Then cboStammreferenz.SelectedIndex = 1 End If - - End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Me.Cursor = Cursors.WaitCursor @@ -450,5 +478,18 @@ Public Class usrCntlATLAS_EXGestellung Private Sub cbxNCTS_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNCTS.CheckedChanged MyPanel1.Enabled = cbxNCTS.Checked End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + FIRMA_DY = Button2.Text + initStammref() + + + + If Button2.Text = "UNISPED" Then + Button2.Text = "ATILLA" + Else + Button2.Text = "UNISPED" + End If + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb index e7610178..0abbd122 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb @@ -41,7 +41,7 @@ Public Class cATEZ_Read_T1 ' lt. API-Dokumentation Private Const Username As String = "verag" - Private Const Password As String = "$2a$11$ia/nymf749eoBktjhWyp2.1TP3VkmdWsX62bgBH1TGQbwFWQg4rc2" '"verag_password123" + Private Const Password As String = "verag_password123" Private Const ClientId As String = "client3" Private Const GrantType As String = "password"