diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 15100e11..b13904de 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/ZOLLSYSTEM/TELOTEC/cTelotecInterface_Send.vb b/SDL/ZOLLSYSTEM/TELOTEC/cTelotecInterface_Send.vb index 5a8d1d0f..b8f6e23b 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/cTelotecInterface_Send.vb +++ b/SDL/ZOLLSYSTEM/TELOTEC/cTelotecInterface_Send.vb @@ -372,6 +372,55 @@ Class cTELOTECInterface_Send If POS.Telo_Artikelmenge IsNot Nothing Then XML_POS.Telo_ArtikelMenge = POS.Telo_Artikelmenge If POS.Telo_ArtikelMEH IsNot Nothing Then XML_POS.Telo_ArtikelMEH = POS.Telo_ArtikelMEH + + If POS.PACKSTUECKE IsNot Nothing AndAlso POS.PACKSTUECKE.Count > 0 Then + For Each PK In POS.PACKSTUECKE + Dim XML_PK As New vifDecPack + + + XML_PK.Mandant_ID = XML.Mandant_ID + XML_PK.Bereich_ID = XML.Bereich_ID + XML_PK.Referenz_ID = XML.Referenz_ID + XML_PK.ComIndicator = XML.ComIndicator + XML_PK.Pos_ID = POS.Pos_ID + + + If PK.Pack_Nr IsNot Nothing Then XML_PK.Pack_Nr = PK.Pack_Nr + If PK.Pack_Kind IsNot Nothing Then XML_PK.Pack_Kind = PK.Pack_Kind + XML_POS.vifDecPack.Add(XML_PK) + + Next + End If + + If POS.DOC_CERTS IsNot Nothing AndAlso POS.DOC_CERTS.Count > 0 Then + For Each DOC In POS.DOC_CERTS + Dim XML_DOC As New vifDecDocCerts + + + XML_DOC.Mandant_ID = XML.Mandant_ID + XML_DOC.Bereich_ID = XML.Bereich_ID + XML_DOC.Referenz_ID = XML.Referenz_ID + XML_DOC.ComIndicator = XML.ComIndicator + XML_DOC.Pos_ID = POS.Pos_ID + + + If DOC.DocCerts_ID IsNot Nothing Then XML_DOC.DocCerts_ID = DOC.DocCerts_ID + If DOC.DocCerts_DocCd IsNot Nothing Then XML_DOC.DocCerts_DocCd = DOC.DocCerts_DocCd + If DOC.DocCerts_DTy IsNot Nothing Then XML_DOC.DocCerts_DTy = DOC.DocCerts_DTy + If DOC.DocCerts_DRef IsNot Nothing Then XML_DOC.DocCerts_DRef = DOC.DocCerts_DRef + If DOC.DocCerts_IssD IsNot Nothing Then XML_DOC.DocCerts_IssD = DOC.DocCerts_IssD + If DOC.DocCerts_IssCtry IsNot Nothing Then XML_DOC.DocCerts_IssCtry = DOC.DocCerts_IssCtry + If DOC.DocCerts_DTIN IsNot Nothing Then XML_DOC.DocCerts_DTIN = DOC.DocCerts_DTIN + If DOC.DocCerts_UidVid IsNot Nothing Then XML_DOC.DocCerts_UidVid = DOC.DocCerts_UidVid + 'If DOC.DocCerts_ValD IsNot Nothing Then XML_DOC.DocCerts_Val = DOC.DocCerts_ValD + + + XML_POS.vifDecDocCerts.Add(XML_DOC) + + Next + End If + + XML.vifDecItem.Add(XML_POS) Next diff --git a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.Designer.vb b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.Designer.vb index e00e41aa..f19cee1f 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.Designer.vb +++ b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.Designer.vb @@ -45,6 +45,7 @@ Partial Class usrCntlTCeZOLL_EZA Me.cntxtBezugsnr = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.NeueBezugsnummerVergebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblUpload = New System.Windows.Forms.Label() Me.txtDyMandant = New System.Windows.Forms.Label() Me.txtDyNiederlassung = New System.Windows.Forms.Label() Me.MenuStrip = New System.Windows.Forms.MenuStrip() @@ -55,7 +56,7 @@ Partial Class usrCntlTCeZOLL_EZA Me.DynamicAutomotiveXLSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.EZAIDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.lblUpload = New System.Windows.Forms.Label() + Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.SuspendLayout() @@ -382,6 +383,16 @@ Partial Class usrCntlTCeZOLL_EZA Me.Panel1.Size = New System.Drawing.Size(934, 25) Me.Panel1.TabIndex = 1 ' + 'lblUpload + ' + Me.lblUpload.BackColor = System.Drawing.Color.White + Me.lblUpload.Location = New System.Drawing.Point(255, 6) + Me.lblUpload.Name = "lblUpload" + Me.lblUpload.Size = New System.Drawing.Size(154, 13) + Me.lblUpload.TabIndex = 22 + Me.lblUpload.Text = "VERG" + Me.lblUpload.Visible = False + ' 'txtDyMandant ' Me.txtDyMandant.BackColor = System.Drawing.Color.White @@ -432,7 +443,7 @@ Partial Class usrCntlTCeZOLL_EZA ' 'DateiimportToolStripMenuItem ' - Me.DateiimportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DynamicAutomotiveXLSToolStripMenuItem}) + Me.DateiimportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.DynamicAutomotiveXLSToolStripMenuItem}) Me.DateiimportToolStripMenuItem.Name = "DateiimportToolStripMenuItem" Me.DateiimportToolStripMenuItem.Size = New System.Drawing.Size(87, 20) Me.DateiimportToolStripMenuItem.Text = "Datei-Import" @@ -440,8 +451,8 @@ Partial Class usrCntlTCeZOLL_EZA 'DynamicAutomotiveXLSToolStripMenuItem ' Me.DynamicAutomotiveXLSToolStripMenuItem.Name = "DynamicAutomotiveXLSToolStripMenuItem" - Me.DynamicAutomotiveXLSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.DynamicAutomotiveXLSToolStripMenuItem.Text = "Trendyol (XLSX)" + Me.DynamicAutomotiveXLSToolStripMenuItem.Size = New System.Drawing.Size(181, 22) + Me.DynamicAutomotiveXLSToolStripMenuItem.Text = "Trendyol TNR (XLSX)" ' 'ToolStripMenuItem1 ' @@ -456,15 +467,11 @@ Partial Class usrCntlTCeZOLL_EZA Me.EZAIDToolStripMenuItem.Size = New System.Drawing.Size(109, 22) Me.EZAIDToolStripMenuItem.Text = "EZA ID" ' - 'lblUpload + 'ToolStripMenuItem2 ' - Me.lblUpload.BackColor = System.Drawing.Color.White - Me.lblUpload.Location = New System.Drawing.Point(255, 6) - Me.lblUpload.Name = "lblUpload" - Me.lblUpload.Size = New System.Drawing.Size(154, 13) - Me.lblUpload.TabIndex = 22 - Me.lblUpload.Text = "VERG" - Me.lblUpload.Visible = False + Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(181, 22) + Me.ToolStripMenuItem2.Text = "Trendyol (XLSX)" ' 'usrCntlTCeZOLL_EZA ' @@ -522,4 +529,5 @@ Partial Class usrCntlTCeZOLL_EZA Friend WithEvents DateiimportToolStripMenuItem As ToolStripMenuItem Friend WithEvents DynamicAutomotiveXLSToolStripMenuItem As ToolStripMenuItem Friend WithEvents lblUpload As Label + Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem End Class diff --git a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.vb b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.vb index b8f820b5..390d35d0 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.vb +++ b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA.vb @@ -628,7 +628,7 @@ Public Class usrCntlTCeZOLL_EZA End Sub - Private Function importExcel_trendyol() As Boolean + Private Function importExcel_trendyol(splitTNR) As Boolean lblUpload.Text = "Excel öffnen..." lblUpload.Visible = True @@ -684,10 +684,6 @@ Public Class usrCntlTCeZOLL_EZA - MsgBox(startRows) - - - ' Inhalt durchlaufen @@ -717,8 +713,13 @@ Public Class usrCntlTCeZOLL_EZA 'myArray(i_soll2 - startRows + 1, 4) lblUpload.Text = "Aggregieren..." - ' Dim DT = aggregierenTrendxol(myArray) '--> !!BEschreibung!! , TNR, Orig, Curr - Dim DT = aggregierenTrendxolTNR(myArray) '--> TNR, Orig, Curr + Dim DT As DataTable = Nothing + If splitTNR Then + DT = aggregierenTrendxolTNR(myArray) '--> TNR, Orig, Curr + Else + aggregierenTrendxol(myArray) '--> !!BEschreibung!! , TNR, Orig, Curr + End If + Dim cnt = 0 @@ -759,11 +760,9 @@ Public Class usrCntlTCeZOLL_EZA - - TC_ANM.POSITIONSDATEN.Add(POSITION) - cnt += 1 - Next + cnt += 1 + Next 'For i As Integer = 1 To endRows - startRows + 1 Step 1 ' Dim POSITION As New TELOTEC_Worker.cTelotec_Positionsdaten @@ -921,7 +920,6 @@ Public Class usrCntlTCeZOLL_EZA For Each grp In amountGrpByDates 'Dim row As New DataRow 'MsgBox("" & grp.Params.Orig & " " & grp.Params.Description & " " & grp.Params.Tnr & " " & grp.Params.Curr & "= " & grp.SumQTY & " " & grp.SumAmount & "") - DT_AGG.Rows.Add({grp.Params.Description, grp.Params.Tnr, grp.Params.Curr, grp.Params.Orig, grp.SumQTY, grp.SumAmount}) Next @@ -1028,7 +1026,7 @@ Public Class usrCntlTCeZOLL_EZA Select New With { Key .Params = groupKeys, .SumQTY = Group.Sum(Function(x) x.Field(Of Integer)("I")), - .Desc = "zB: " & Group.Max(Function(x) (x.Field(Of String)("D") & ", " & x.Field(Of String)("D"))), + .Desc = "zB: " & Group.Min(Function(x) (x.Field(Of String)("D") & ", " & x.Field(Of String)("F"))) & " / " & Group.Max(Function(x) (x.Field(Of String)("D") & ", " & x.Field(Of String)("F"))) & ", etc.", .SumAmount = Group.Sum(Function(x) x.Field(Of Decimal)("M"))} ' .SumQTY = Group.Sum(Function(x) x.Field(Of Integer)("I"))} 'row.Field(Of String)("D") & ", " & row.Field(Of String)("F") @@ -1040,6 +1038,7 @@ Public Class usrCntlTCeZOLL_EZA For Each grp In amountGrpByDates 'Dim row As New DataRow 'MsgBox("" & grp.Params.Orig & " " & grp.Params.Description & " " & grp.Params.Tnr & " " & grp.Params.Curr & "= " & grp.SumQTY & " " & grp.SumAmount & "") + MsgBox(grp.SumQTY) DT_AGG.Rows.Add({grp.Desc, grp.Params.Tnr, grp.Params.Curr, grp.Params.Orig, grp.SumQTY, grp.SumAmount}) Next @@ -1157,8 +1156,14 @@ Public Class usrCntlTCeZOLL_EZA End If End Sub - Private Sub DynamicAutomotiveXLSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DynamicAutomotiveXLSToolStripMenuItem.Click - importExcel_trendyol() + Private Sub DynamicAutomotiveXLSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DynamicAutomotiveXLSToolStripMenuItem.Click, ToolStripMenuItem2.Click + If sender Is DynamicAutomotiveXLSToolStripMenuItem Then + importExcel_trendyol(True) + Else + importExcel_trendyol(False) + End If End Sub + + End Class diff --git a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.Designer.vb b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.Designer.vb index 1bdd05ef..f6c20279 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.Designer.vb +++ b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.Designer.vb @@ -24,19 +24,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.pnl = New System.Windows.Forms.Panel() - Me.Button1 = New System.Windows.Forms.Button() - Me.Label36 = New System.Windows.Forms.Label() - Me.txtEigenmasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtRohmasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label37 = New System.Windows.Forms.Label() - Me.Label38 = New System.Windows.Forms.Label() - Me.Label39 = New System.Windows.Forms.Label() - Me.Label35 = New System.Windows.Forms.Label() - Me.Label34 = New System.Windows.Forms.Label() - Me.MyDatagridview2 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnAnhart = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnAnhReferenz = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnAnhDatum = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Panel3 = New System.Windows.Forms.Panel() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.clmnOrigin = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnTarifnummer = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -47,6 +35,19 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.clmnEigenmasse = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnPreis = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnWaehrung = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Button1 = New System.Windows.Forms.Button() + Me.MyDatagridview2 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnAnhart = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAnhReferenz = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAnhDatum = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Label36 = New System.Windows.Forms.Label() + Me.Label34 = New System.Windows.Forms.Label() + Me.txtEigenmasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label35 = New System.Windows.Forms.Label() + Me.txtRohmasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label39 = New System.Windows.Forms.Label() + Me.Label37 = New System.Windows.Forms.Label() + Me.Label38 = New System.Windows.Forms.Label() Me.Label33 = New System.Windows.Forms.Label() Me.txtContainerNr3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtContainerNr2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -127,9 +128,15 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.Label10 = New System.Windows.Forms.Label() Me.Label31 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() + Me.Label40 = New System.Windows.Forms.Label() + Me.Label41 = New System.Windows.Forms.Label() + Me.Label42 = New System.Windows.Forms.Label() + Me.txtPosPraeferenz = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPosVerfahrenscode = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnl.SuspendLayout() - CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel3.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -139,17 +146,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'pnl ' Me.pnl.AutoScroll = True - Me.pnl.Controls.Add(Me.Button1) - Me.pnl.Controls.Add(Me.Label36) - Me.pnl.Controls.Add(Me.txtEigenmasse) - Me.pnl.Controls.Add(Me.txtRohmasse) - Me.pnl.Controls.Add(Me.Label37) - Me.pnl.Controls.Add(Me.Label38) - Me.pnl.Controls.Add(Me.Label39) - Me.pnl.Controls.Add(Me.Label35) - Me.pnl.Controls.Add(Me.Label34) - Me.pnl.Controls.Add(Me.MyDatagridview2) - Me.pnl.Controls.Add(Me.MyDatagridview1) + Me.pnl.Controls.Add(Me.Panel3) Me.pnl.Controls.Add(Me.Label33) Me.pnl.Controls.Add(Me.txtContainerNr3) Me.pnl.Controls.Add(Me.txtContainerNr2) @@ -219,160 +216,35 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.pnl.Size = New System.Drawing.Size(930, 979) Me.pnl.TabIndex = 0 ' - 'Button1 + 'Panel3 ' - Me.Button1.BackColor = System.Drawing.Color.White - Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button1.ForeColor = System.Drawing.Color.Black - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.Button1.Location = New System.Drawing.Point(481, 597) - Me.Button1.Margin = New System.Windows.Forms.Padding(2) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(131, 24) - Me.Button1.TabIndex = 73 - Me.Button1.Text = "nach Preis aufteilen" - Me.Button1.UseVisualStyleBackColor = False - ' - 'Label36 - ' - Me.Label36.ForeColor = System.Drawing.Color.Red - Me.Label36.Location = New System.Drawing.Point(243, 618) - Me.Label36.Name = "Label36" - Me.Label36.Size = New System.Drawing.Size(233, 13) - Me.Label36.TabIndex = 72 - Me.Label36.Text = "Eigenmasse muss kleiner als Rohmasse sein!" - Me.Label36.Visible = False - ' - 'txtEigenmasse - ' - Me.txtEigenmasse._DateTimeOnly = False - Me.txtEigenmasse._numbersOnly = True - Me.txtEigenmasse._numbersOnlyKommastellen = "2" - Me.txtEigenmasse._numbersOnlyTrennzeichen = True - Me.txtEigenmasse._Prozent = False - Me.txtEigenmasse._ShortDateNew = False - Me.txtEigenmasse._ShortDateOnly = False - Me.txtEigenmasse._TimeOnly = False - Me.txtEigenmasse._TimeOnly_Seconds = False - Me.txtEigenmasse._value = "0" - Me.txtEigenmasse._Waehrung = False - Me.txtEigenmasse._WaehrungZeichen = True - Me.txtEigenmasse.ForeColor = System.Drawing.Color.Red - Me.txtEigenmasse.Location = New System.Drawing.Point(243, 597) - Me.txtEigenmasse.MaxLength = 18 - Me.txtEigenmasse.MaxLineLength = -1 - Me.txtEigenmasse.MaxLines_Warning = "" - Me.txtEigenmasse.MaxLines_Warning_Label = Nothing - Me.txtEigenmasse.Name = "txtEigenmasse" - Me.txtEigenmasse.Size = New System.Drawing.Size(117, 20) - Me.txtEigenmasse.TabIndex = 70 - Me.txtEigenmasse.Text = "0,00" - ' - 'txtRohmasse - ' - Me.txtRohmasse._DateTimeOnly = False - Me.txtRohmasse._numbersOnly = True - Me.txtRohmasse._numbersOnlyKommastellen = "2" - Me.txtRohmasse._numbersOnlyTrennzeichen = True - Me.txtRohmasse._Prozent = False - Me.txtRohmasse._ShortDateNew = False - Me.txtRohmasse._ShortDateOnly = False - Me.txtRohmasse._TimeOnly = False - Me.txtRohmasse._TimeOnly_Seconds = False - Me.txtRohmasse._value = "0" - Me.txtRohmasse._Waehrung = False - Me.txtRohmasse._WaehrungZeichen = True - Me.txtRohmasse.ForeColor = System.Drawing.Color.Red - Me.txtRohmasse.Location = New System.Drawing.Point(359, 597) - Me.txtRohmasse.MaxLength = 18 - Me.txtRohmasse.MaxLineLength = -1 - Me.txtRohmasse.MaxLines_Warning = "" - Me.txtRohmasse.MaxLines_Warning_Label = Nothing - Me.txtRohmasse.Name = "txtRohmasse" - Me.txtRohmasse.Size = New System.Drawing.Size(117, 20) - Me.txtRohmasse.TabIndex = 71 - Me.txtRohmasse.Text = "0,00" - ' - 'Label37 - ' - Me.Label37.AutoSize = True - Me.Label37.Location = New System.Drawing.Point(240, 581) - Me.Label37.Name = "Label37" - Me.Label37.Size = New System.Drawing.Size(67, 13) - Me.Label37.TabIndex = 67 - Me.Label37.Text = "Eigenmasse:" - ' - 'Label38 - ' - Me.Label38.AutoSize = True - Me.Label38.Location = New System.Drawing.Point(356, 581) - Me.Label38.Name = "Label38" - Me.Label38.Size = New System.Drawing.Size(60, 13) - Me.Label38.TabIndex = 68 - Me.Label38.Text = "Rohmasse:" - ' - 'Label39 - ' - Me.Label39.Location = New System.Drawing.Point(129, 600) - Me.Label39.Name = "Label39" - Me.Label39.Size = New System.Drawing.Size(111, 13) - Me.Label39.TabIndex = 69 - Me.Label39.Text = "Gewicht:" - Me.Label39.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'Label35 - ' - Me.Label35.AutoSize = True - Me.Label35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label35.Location = New System.Drawing.Point(615, 618) - Me.Label35.Name = "Label35" - Me.Label35.Size = New System.Drawing.Size(73, 13) - Me.Label35.TabIndex = 66 - Me.Label35.Text = "Unterlagen:" - ' - 'Label34 - ' - Me.Label34.AutoSize = True - Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label34.Location = New System.Drawing.Point(3, 618) - Me.Label34.Name = "Label34" - Me.Label34.Size = New System.Drawing.Size(70, 13) - Me.Label34.TabIndex = 65 - Me.Label34.Text = "Positionen:" - ' - 'MyDatagridview2 - ' - Me.MyDatagridview2.AKTUALISIERUNGS_INTERVALL = -1 - Me.MyDatagridview2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.MyDatagridview2.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAnhart, Me.clmnAnhReferenz, Me.clmnAnhDatum}) - Me.MyDatagridview2.Location = New System.Drawing.Point(618, 634) - Me.MyDatagridview2.Name = "MyDatagridview2" - Me.MyDatagridview2.Size = New System.Drawing.Size(307, 324) - Me.MyDatagridview2.TabIndex = 64 - ' - 'clmnAnhart - ' - Me.clmnAnhart.HeaderText = "Art" - Me.clmnAnhart.Name = "clmnAnhart" - ' - 'clmnAnhReferenz - ' - Me.clmnAnhReferenz.HeaderText = "Referenz" - Me.clmnAnhReferenz.Name = "clmnAnhReferenz" - ' - 'clmnAnhDatum - ' - Me.clmnAnhDatum.HeaderText = "Datum" - Me.clmnAnhDatum.Name = "clmnAnhDatum" + Me.Panel3.Controls.Add(Me.txtPosVerfahrenscode) + Me.Panel3.Controls.Add(Me.txtPosPraeferenz) + Me.Panel3.Controls.Add(Me.Label42) + Me.Panel3.Controls.Add(Me.Label41) + Me.Panel3.Controls.Add(Me.Label40) + Me.Panel3.Controls.Add(Me.MyDatagridview1) + Me.Panel3.Controls.Add(Me.Button1) + Me.Panel3.Controls.Add(Me.MyDatagridview2) + Me.Panel3.Controls.Add(Me.Label36) + Me.Panel3.Controls.Add(Me.Label34) + Me.Panel3.Controls.Add(Me.txtEigenmasse) + Me.Panel3.Controls.Add(Me.Label35) + Me.Panel3.Controls.Add(Me.txtRohmasse) + Me.Panel3.Controls.Add(Me.Label39) + Me.Panel3.Controls.Add(Me.Label37) + Me.Panel3.Controls.Add(Me.Label38) + Me.Panel3.Location = New System.Drawing.Point(0, 205) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(927, 406) + Me.Panel3.TabIndex = 74 ' 'MyDatagridview1 ' Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnOrigin, Me.clmnTarifnummer, Me.clmnWarenbeschreibung, Me.clmnPackstuecke, Me.clmnPkArt, Me.clmnRohmasse, Me.clmnEigenmasse, Me.clmnPreis, Me.clmnWaehrung}) - Me.MyDatagridview1.Location = New System.Drawing.Point(3, 634) + Me.MyDatagridview1.Location = New System.Drawing.Point(3, 67) Me.MyDatagridview1.Name = "MyDatagridview1" Me.MyDatagridview1.Size = New System.Drawing.Size(609, 324) Me.MyDatagridview1.TabIndex = 62 @@ -422,10 +294,158 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.clmnWaehrung.HeaderText = "Wärung" Me.clmnWaehrung.Name = "clmnWaehrung" ' + 'Button1 + ' + Me.Button1.BackColor = System.Drawing.Color.White + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button1.ForeColor = System.Drawing.Color.Black + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.Button1.Location = New System.Drawing.Point(481, 30) + Me.Button1.Margin = New System.Windows.Forms.Padding(2) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(131, 24) + Me.Button1.TabIndex = 73 + Me.Button1.Text = "nach Preis aufteilen" + Me.Button1.UseVisualStyleBackColor = False + ' + 'MyDatagridview2 + ' + Me.MyDatagridview2.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview2.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnAnhart, Me.clmnAnhReferenz, Me.clmnAnhDatum}) + Me.MyDatagridview2.Location = New System.Drawing.Point(618, 67) + Me.MyDatagridview2.Name = "MyDatagridview2" + Me.MyDatagridview2.Size = New System.Drawing.Size(307, 161) + Me.MyDatagridview2.TabIndex = 64 + ' + 'clmnAnhart + ' + Me.clmnAnhart.HeaderText = "Art" + Me.clmnAnhart.Name = "clmnAnhart" + ' + 'clmnAnhReferenz + ' + Me.clmnAnhReferenz.HeaderText = "Referenz" + Me.clmnAnhReferenz.Name = "clmnAnhReferenz" + ' + 'clmnAnhDatum + ' + Me.clmnAnhDatum.HeaderText = "Datum" + Me.clmnAnhDatum.Name = "clmnAnhDatum" + ' + 'Label36 + ' + Me.Label36.ForeColor = System.Drawing.Color.Red + Me.Label36.Location = New System.Drawing.Point(243, 51) + Me.Label36.Name = "Label36" + Me.Label36.Size = New System.Drawing.Size(233, 13) + Me.Label36.TabIndex = 72 + Me.Label36.Text = "Eigenmasse muss kleiner als Rohmasse sein!" + Me.Label36.Visible = False + ' + 'Label34 + ' + Me.Label34.AutoSize = True + Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label34.Location = New System.Drawing.Point(3, 51) + Me.Label34.Name = "Label34" + Me.Label34.Size = New System.Drawing.Size(70, 13) + Me.Label34.TabIndex = 65 + Me.Label34.Text = "Positionen:" + ' + 'txtEigenmasse + ' + Me.txtEigenmasse._DateTimeOnly = False + Me.txtEigenmasse._numbersOnly = True + Me.txtEigenmasse._numbersOnlyKommastellen = "2" + Me.txtEigenmasse._numbersOnlyTrennzeichen = True + Me.txtEigenmasse._Prozent = False + Me.txtEigenmasse._ShortDateNew = False + Me.txtEigenmasse._ShortDateOnly = False + Me.txtEigenmasse._TimeOnly = False + Me.txtEigenmasse._TimeOnly_Seconds = False + Me.txtEigenmasse._value = "0" + Me.txtEigenmasse._Waehrung = False + Me.txtEigenmasse._WaehrungZeichen = True + Me.txtEigenmasse.ForeColor = System.Drawing.Color.Red + Me.txtEigenmasse.Location = New System.Drawing.Point(243, 30) + Me.txtEigenmasse.MaxLength = 18 + Me.txtEigenmasse.MaxLineLength = -1 + Me.txtEigenmasse.MaxLines_Warning = "" + Me.txtEigenmasse.MaxLines_Warning_Label = Nothing + Me.txtEigenmasse.Name = "txtEigenmasse" + Me.txtEigenmasse.Size = New System.Drawing.Size(117, 20) + Me.txtEigenmasse.TabIndex = 70 + Me.txtEigenmasse.Text = "0,00" + ' + 'Label35 + ' + Me.Label35.AutoSize = True + Me.Label35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label35.Location = New System.Drawing.Point(615, 51) + Me.Label35.Name = "Label35" + Me.Label35.Size = New System.Drawing.Size(73, 13) + Me.Label35.TabIndex = 66 + Me.Label35.Text = "Unterlagen:" + ' + 'txtRohmasse + ' + Me.txtRohmasse._DateTimeOnly = False + Me.txtRohmasse._numbersOnly = True + Me.txtRohmasse._numbersOnlyKommastellen = "2" + Me.txtRohmasse._numbersOnlyTrennzeichen = True + Me.txtRohmasse._Prozent = False + Me.txtRohmasse._ShortDateNew = False + Me.txtRohmasse._ShortDateOnly = False + Me.txtRohmasse._TimeOnly = False + Me.txtRohmasse._TimeOnly_Seconds = False + Me.txtRohmasse._value = "0" + Me.txtRohmasse._Waehrung = False + Me.txtRohmasse._WaehrungZeichen = True + Me.txtRohmasse.ForeColor = System.Drawing.Color.Red + Me.txtRohmasse.Location = New System.Drawing.Point(359, 30) + Me.txtRohmasse.MaxLength = 18 + Me.txtRohmasse.MaxLineLength = -1 + Me.txtRohmasse.MaxLines_Warning = "" + Me.txtRohmasse.MaxLines_Warning_Label = Nothing + Me.txtRohmasse.Name = "txtRohmasse" + Me.txtRohmasse.Size = New System.Drawing.Size(117, 20) + Me.txtRohmasse.TabIndex = 71 + Me.txtRohmasse.Text = "0,00" + ' + 'Label39 + ' + Me.Label39.Location = New System.Drawing.Point(129, 33) + Me.Label39.Name = "Label39" + Me.Label39.Size = New System.Drawing.Size(111, 13) + Me.Label39.TabIndex = 69 + Me.Label39.Text = "Gewicht:" + Me.Label39.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'Label37 + ' + Me.Label37.AutoSize = True + Me.Label37.Location = New System.Drawing.Point(240, 14) + Me.Label37.Name = "Label37" + Me.Label37.Size = New System.Drawing.Size(67, 13) + Me.Label37.TabIndex = 67 + Me.Label37.Text = "Eigenmasse:" + ' + 'Label38 + ' + Me.Label38.AutoSize = True + Me.Label38.Location = New System.Drawing.Point(356, 14) + Me.Label38.Name = "Label38" + Me.Label38.Size = New System.Drawing.Size(60, 13) + Me.Label38.TabIndex = 68 + Me.Label38.Text = "Rohmasse:" + ' 'Label33 ' Me.Label33.Enabled = False - Me.Label33.Location = New System.Drawing.Point(835, 477) + Me.Label33.Location = New System.Drawing.Point(835, 887) Me.Label33.Name = "Label33" Me.Label33.Size = New System.Drawing.Size(68, 13) Me.Label33.TabIndex = 61 @@ -447,7 +467,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtContainerNr3._WaehrungZeichen = True Me.txtContainerNr3.Enabled = False Me.txtContainerNr3.ForeColor = System.Drawing.Color.Black - Me.txtContainerNr3.Location = New System.Drawing.Point(793, 260) + Me.txtContainerNr3.Location = New System.Drawing.Point(793, 670) Me.txtContainerNr3.MaxLength = 11 Me.txtContainerNr3.MaxLineLength = -1 Me.txtContainerNr3.MaxLines_Warning = "" @@ -472,7 +492,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtContainerNr2._WaehrungZeichen = True Me.txtContainerNr2.Enabled = False Me.txtContainerNr2.ForeColor = System.Drawing.Color.Black - Me.txtContainerNr2.Location = New System.Drawing.Point(793, 241) + Me.txtContainerNr2.Location = New System.Drawing.Point(793, 651) Me.txtContainerNr2.MaxLength = 11 Me.txtContainerNr2.MaxLineLength = -1 Me.txtContainerNr2.MaxLines_Warning = "" @@ -497,7 +517,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtContainerNr1._WaehrungZeichen = True Me.txtContainerNr1.Enabled = False Me.txtContainerNr1.ForeColor = System.Drawing.Color.Black - Me.txtContainerNr1.Location = New System.Drawing.Point(793, 222) + Me.txtContainerNr1.Location = New System.Drawing.Point(793, 632) Me.txtContainerNr1.MaxLength = 11 Me.txtContainerNr1.MaxLineLength = -1 Me.txtContainerNr1.MaxLines_Warning = "" @@ -510,7 +530,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' Me.Label32.Enabled = False Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label32.Location = New System.Drawing.Point(733, 225) + Me.Label32.Location = New System.Drawing.Point(733, 635) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(103, 13) Me.Label32.TabIndex = 22 @@ -532,7 +552,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATBPk2._WaehrungZeichen = True Me.txtVP_ATBPk2.Enabled = False Me.txtVP_ATBPk2.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATBPk2.Location = New System.Drawing.Point(550, 260) + Me.txtVP_ATBPk2.Location = New System.Drawing.Point(550, 670) Me.txtVP_ATBPk2.MaxLength = 5 Me.txtVP_ATBPk2.MaxLineLength = -1 Me.txtVP_ATBPk2.MaxLines_Warning = "" @@ -557,7 +577,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATBPk1._WaehrungZeichen = True Me.txtVP_ATBPk1.Enabled = False Me.txtVP_ATBPk1.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATBPk1.Location = New System.Drawing.Point(550, 241) + Me.txtVP_ATBPk1.Location = New System.Drawing.Point(550, 651) Me.txtVP_ATBPk1.MaxLength = 5 Me.txtVP_ATBPk1.MaxLineLength = -1 Me.txtVP_ATBPk1.MaxLines_Warning = "" @@ -582,7 +602,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATBNr2._WaehrungZeichen = False Me.txtVP_ATBNr2.Enabled = False Me.txtVP_ATBNr2.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATBNr2.Location = New System.Drawing.Point(495, 260) + Me.txtVP_ATBNr2.Location = New System.Drawing.Point(495, 670) Me.txtVP_ATBNr2.MaxLength = 4 Me.txtVP_ATBNr2.MaxLineLength = -1 Me.txtVP_ATBNr2.MaxLines_Warning = "" @@ -607,7 +627,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATBNr1._WaehrungZeichen = False Me.txtVP_ATBNr1.Enabled = False Me.txtVP_ATBNr1.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATBNr1.Location = New System.Drawing.Point(495, 241) + Me.txtVP_ATBNr1.Location = New System.Drawing.Point(495, 651) Me.txtVP_ATBNr1.MaxLength = 4 Me.txtVP_ATBNr1.MaxLineLength = -1 Me.txtVP_ATBNr1.MaxLines_Warning = "" @@ -619,7 +639,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label15 ' Me.Label15.Enabled = False - Me.Label15.Location = New System.Drawing.Point(250, 263) + Me.Label15.Location = New System.Drawing.Point(250, 673) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(103, 13) Me.Label15.TabIndex = 28 @@ -642,7 +662,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATB2._WaehrungZeichen = False Me.txtVP_ATB2.Enabled = False Me.txtVP_ATB2.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATB2.Location = New System.Drawing.Point(359, 260) + Me.txtVP_ATB2.Location = New System.Drawing.Point(359, 670) Me.txtVP_ATB2.MaxLength = 21 Me.txtVP_ATB2.MaxLineLength = -1 Me.txtVP_ATB2.MaxLines_Warning = "" @@ -654,7 +674,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label19 ' Me.Label19.Enabled = False - Me.Label19.Location = New System.Drawing.Point(250, 244) + Me.Label19.Location = New System.Drawing.Point(250, 654) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(103, 13) Me.Label19.TabIndex = 23 @@ -677,7 +697,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVP_ATB1._WaehrungZeichen = False Me.txtVP_ATB1.Enabled = False Me.txtVP_ATB1.ForeColor = System.Drawing.Color.Black - Me.txtVP_ATB1.Location = New System.Drawing.Point(359, 241) + Me.txtVP_ATB1.Location = New System.Drawing.Point(359, 651) Me.txtVP_ATB1.MaxLength = 21 Me.txtVP_ATB1.MaxLineLength = -1 Me.txtVP_ATB1.MaxLines_Warning = "" @@ -702,7 +722,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtVPReferenz._WaehrungZeichen = True Me.txtVPReferenz.Enabled = False Me.txtVPReferenz.ForeColor = System.Drawing.Color.Black - Me.txtVPReferenz.Location = New System.Drawing.Point(417, 222) + Me.txtVPReferenz.Location = New System.Drawing.Point(417, 632) Me.txtVPReferenz.MaxLength = 28 Me.txtVPReferenz.MaxLineLength = -1 Me.txtVPReferenz.MaxLines_Warning = "" @@ -719,7 +739,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.cboVPArt.DropDownWidth = 350 Me.cboVPArt.Enabled = False Me.cboVPArt.FormattingEnabled = True - Me.cboVPArt.Location = New System.Drawing.Point(359, 222) + Me.cboVPArt.Location = New System.Drawing.Point(359, 632) Me.cboVPArt.Name = "cboVPArt" Me.cboVPArt.Size = New System.Drawing.Size(59, 21) Me.cboVPArt.TabIndex = 20 @@ -728,7 +748,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' Me.Label22.Enabled = False Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label22.Location = New System.Drawing.Point(250, 225) + Me.Label22.Location = New System.Drawing.Point(250, 635) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(103, 13) Me.Label22.TabIndex = 19 @@ -751,7 +771,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtGesRohmasse._WaehrungZeichen = True Me.txtGesRohmasse.Enabled = False Me.txtGesRohmasse.ForeColor = System.Drawing.Color.Black - Me.txtGesRohmasse.Location = New System.Drawing.Point(694, 474) + Me.txtGesRohmasse.Location = New System.Drawing.Point(694, 884) Me.txtGesRohmasse.MaxLength = 18 Me.txtGesRohmasse.MaxLineLength = -1 Me.txtGesRohmasse.MaxLines_Warning = "" @@ -765,7 +785,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label29 ' Me.Label29.Enabled = False - Me.Label29.Location = New System.Drawing.Point(580, 477) + Me.Label29.Location = New System.Drawing.Point(580, 887) Me.Label29.Name = "Label29" Me.Label29.Size = New System.Drawing.Size(111, 13) Me.Label29.TabIndex = 53 @@ -837,7 +857,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.sbBestimmungsBundesland._value = "" Me.sbBestimmungsBundesland.Enabled = False Me.sbBestimmungsBundesland.FormattingEnabled = True - Me.sbBestimmungsBundesland.Location = New System.Drawing.Point(694, 358) + Me.sbBestimmungsBundesland.Location = New System.Drawing.Point(694, 768) Me.sbBestimmungsBundesland.Name = "sbBestimmungsBundesland" Me.sbBestimmungsBundesland.Size = New System.Drawing.Size(214, 21) Me.sbBestimmungsBundesland.TabIndex = 45 @@ -929,14 +949,14 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.cboGeschaeftsArt.DropDownWidth = 350 Me.cboGeschaeftsArt.Enabled = False Me.cboGeschaeftsArt.FormattingEnabled = True - Me.cboGeschaeftsArt.Location = New System.Drawing.Point(145, 493) + Me.cboGeschaeftsArt.Location = New System.Drawing.Point(145, 903) Me.cboGeschaeftsArt.Name = "cboGeschaeftsArt" Me.cboGeschaeftsArt.Size = New System.Drawing.Size(214, 21) Me.cboGeschaeftsArt.TabIndex = 56 ' 'Label28 ' - Me.Label28.Location = New System.Drawing.Point(7, 303) + Me.Label28.Location = New System.Drawing.Point(7, 713) Me.Label28.Name = "Label28" Me.Label28.Size = New System.Drawing.Size(135, 13) Me.Label28.TabIndex = 36 @@ -958,7 +978,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.sbAdrZollstelle.INVISIBLE_COLUMNS = Nothing Me.sbAdrZollstelle.key_visible = False Me.sbAdrZollstelle.KEYPARAM = Nothing - Me.sbAdrZollstelle.Location = New System.Drawing.Point(145, 300) + Me.sbAdrZollstelle.Location = New System.Drawing.Point(145, 710) Me.sbAdrZollstelle.Name = "sbAdrZollstelle" Me.sbAdrZollstelle.searchActive = True Me.sbAdrZollstelle.Size = New System.Drawing.Size(214, 20) @@ -972,7 +992,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label26 ' Me.Label26.Enabled = False - Me.Label26.Location = New System.Drawing.Point(-25, 477) + Me.Label26.Location = New System.Drawing.Point(-25, 887) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(167, 13) Me.Label26.TabIndex = 51 @@ -982,7 +1002,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label27 ' Me.Label27.Enabled = False - Me.Label27.Location = New System.Drawing.Point(7, 496) + Me.Label27.Location = New System.Drawing.Point(7, 906) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(135, 13) Me.Label27.TabIndex = 55 @@ -1005,7 +1025,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtWarenort._WaehrungZeichen = True Me.txtWarenort.Enabled = False Me.txtWarenort.ForeColor = System.Drawing.Color.Black - Me.txtWarenort.Location = New System.Drawing.Point(145, 387) + Me.txtWarenort.Location = New System.Drawing.Point(145, 797) Me.txtWarenort.MaxLength = 17 Me.txtWarenort.MaxLineLength = -1 Me.txtWarenort.MaxLines_Warning = "" @@ -1022,7 +1042,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.cboZahlungsweise.DropDownWidth = 350 Me.cboZahlungsweise.Enabled = False Me.cboZahlungsweise.FormattingEnabled = True - Me.cboZahlungsweise.Location = New System.Drawing.Point(145, 474) + Me.cboZahlungsweise.Location = New System.Drawing.Point(145, 884) Me.cboZahlungsweise.Name = "cboZahlungsweise" Me.cboZahlungsweise.Size = New System.Drawing.Size(214, 21) Me.cboZahlungsweise.TabIndex = 52 @@ -1052,7 +1072,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label17 ' Me.Label17.Enabled = False - Me.Label17.Location = New System.Drawing.Point(7, 428) + Me.Label17.Location = New System.Drawing.Point(7, 838) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(135, 13) Me.Label17.TabIndex = 49 @@ -1067,7 +1087,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.cboVerkehrszweigInland.DropDownWidth = 350 Me.cboVerkehrszweigInland.Enabled = False Me.cboVerkehrszweigInland.FormattingEnabled = True - Me.cboVerkehrszweigInland.Location = New System.Drawing.Point(145, 425) + Me.cboVerkehrszweigInland.Location = New System.Drawing.Point(145, 835) Me.cboVerkehrszweigInland.Name = "cboVerkehrszweigInland" Me.cboVerkehrszweigInland.Size = New System.Drawing.Size(140, 21) Me.cboVerkehrszweigInland.TabIndex = 50 @@ -1075,7 +1095,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label16 ' Me.Label16.Enabled = False - Me.Label16.Location = New System.Drawing.Point(7, 390) + Me.Label16.Location = New System.Drawing.Point(7, 800) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(135, 13) Me.Label16.TabIndex = 46 @@ -1086,7 +1106,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.lorry_motion Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(399, 328) + Me.pic.Location = New System.Drawing.Point(399, 738) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(154, 50) Me.pic.TabIndex = 47 @@ -1161,7 +1181,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.sbBestimmungsland.INVISIBLE_COLUMNS = Nothing Me.sbBestimmungsland.key_visible = False Me.sbBestimmungsland.KEYPARAM = Nothing - Me.sbBestimmungsland.Location = New System.Drawing.Point(694, 339) + Me.sbBestimmungsland.Location = New System.Drawing.Point(694, 749) Me.sbBestimmungsland.Name = "sbBestimmungsland" Me.sbBestimmungsland.searchActive = True Me.sbBestimmungsland.Size = New System.Drawing.Size(214, 20) @@ -1174,7 +1194,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' 'Label11 ' - Me.Label11.Location = New System.Drawing.Point(575, 342) + Me.Label11.Location = New System.Drawing.Point(575, 752) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(116, 13) Me.Label11.TabIndex = 42 @@ -1183,7 +1203,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' 'Label12 ' - Me.Label12.Location = New System.Drawing.Point(7, 341) + Me.Label12.Location = New System.Drawing.Point(7, 751) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(135, 13) Me.Label12.TabIndex = 40 @@ -1205,7 +1225,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.sbVersendungsLand.INVISIBLE_COLUMNS = Nothing Me.sbVersendungsLand.key_visible = False Me.sbVersendungsLand.KEYPARAM = Nothing - Me.sbVersendungsLand.Location = New System.Drawing.Point(145, 338) + Me.sbVersendungsLand.Location = New System.Drawing.Point(145, 748) Me.sbVersendungsLand.Name = "sbVersendungsLand" Me.sbVersendungsLand.searchActive = True Me.sbVersendungsLand.Size = New System.Drawing.Size(214, 20) @@ -1218,7 +1238,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' 'Label9 ' - Me.Label9.Location = New System.Drawing.Point(556, 303) + Me.Label9.Location = New System.Drawing.Point(556, 713) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(135, 13) Me.Label9.TabIndex = 38 @@ -1240,7 +1260,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.sbEingangZollstelleID.INVISIBLE_COLUMNS = Nothing Me.sbEingangZollstelleID.key_visible = False Me.sbEingangZollstelleID.KEYPARAM = Nothing - Me.sbEingangZollstelleID.Location = New System.Drawing.Point(694, 300) + Me.sbEingangZollstelleID.Location = New System.Drawing.Point(694, 710) Me.sbEingangZollstelleID.Name = "sbEingangZollstelleID" Me.sbEingangZollstelleID.searchActive = True Me.sbEingangZollstelleID.Size = New System.Drawing.Size(214, 20) @@ -1276,9 +1296,9 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.Panel1.Controls.Add(Me.cboArtGrenzUeberschreitung) Me.Panel1.Controls.Add(Me.Label23) Me.Panel1.Enabled = False - Me.Panel1.Location = New System.Drawing.Point(3, 406) + Me.Panel1.Location = New System.Drawing.Point(3, 816) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(930, 21) + Me.Panel1.Size = New System.Drawing.Size(933, 21) Me.Panel1.TabIndex = 48 ' 'txtKennzeichenInland @@ -1414,9 +1434,9 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.Panel2.Controls.Add(Me.Label24) Me.Panel2.Controls.Add(Me.Label30) Me.Panel2.Enabled = False - Me.Panel2.Location = New System.Drawing.Point(0, 520) + Me.Panel2.Location = New System.Drawing.Point(0, 930) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(930, 41) + Me.Panel2.Size = New System.Drawing.Size(933, 41) Me.Panel2.TabIndex = 60 ' 'cboLieferbedingungSchluessel @@ -1544,7 +1564,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtRechnungspreisWaehrung.INVISIBLE_COLUMNS = Nothing Me.txtRechnungspreisWaehrung.key_visible = False Me.txtRechnungspreisWaehrung.KEYPARAM = Nothing - Me.txtRechnungspreisWaehrung.Location = New System.Drawing.Point(833, 493) + Me.txtRechnungspreisWaehrung.Location = New System.Drawing.Point(833, 903) Me.txtRechnungspreisWaehrung.Name = "txtRechnungspreisWaehrung" Me.txtRechnungspreisWaehrung.searchActive = True Me.txtRechnungspreisWaehrung.Size = New System.Drawing.Size(75, 20) @@ -1571,7 +1591,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.txtRechnungspreis._WaehrungZeichen = True Me.txtRechnungspreis.Enabled = False Me.txtRechnungspreis.ForeColor = System.Drawing.Color.Black - Me.txtRechnungspreis.Location = New System.Drawing.Point(694, 493) + Me.txtRechnungspreis.Location = New System.Drawing.Point(694, 903) Me.txtRechnungspreis.MaxLength = 70 Me.txtRechnungspreis.MaxLineLength = -1 Me.txtRechnungspreis.MaxLines_Warning = "" @@ -1584,7 +1604,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label21 ' Me.Label21.Enabled = False - Me.Label21.Location = New System.Drawing.Point(556, 496) + Me.Label21.Location = New System.Drawing.Point(556, 906) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(135, 13) Me.Label21.TabIndex = 57 @@ -1593,7 +1613,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg ' 'Label10 ' - Me.Label10.Location = New System.Drawing.Point(533, 361) + Me.Label10.Location = New System.Drawing.Point(533, 771) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(158, 13) Me.Label10.TabIndex = 44 @@ -1603,7 +1623,7 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label31 ' Me.Label31.Enabled = False - Me.Label31.Location = New System.Drawing.Point(611, 263) + Me.Label31.Location = New System.Drawing.Point(611, 673) Me.Label31.Name = "Label31" Me.Label31.Size = New System.Drawing.Size(103, 13) Me.Label31.TabIndex = 32 @@ -1612,12 +1632,88 @@ Partial Class usrCntlTCeZOLL_EZA_Allg 'Label25 ' Me.Label25.Enabled = False - Me.Label25.Location = New System.Drawing.Point(611, 244) + Me.Label25.Location = New System.Drawing.Point(611, 654) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(103, 13) Me.Label25.TabIndex = 27 Me.Label25.Text = "Pk." ' + 'Label40 + ' + Me.Label40.Location = New System.Drawing.Point(618, 262) + Me.Label40.Name = "Label40" + Me.Label40.Size = New System.Drawing.Size(116, 13) + Me.Label40.TabIndex = 74 + Me.Label40.Text = "Präferenz:" + ' + 'Label41 + ' + Me.Label41.Location = New System.Drawing.Point(618, 287) + Me.Label41.Name = "Label41" + Me.Label41.Size = New System.Drawing.Size(116, 13) + Me.Label41.TabIndex = 76 + Me.Label41.Text = "Verfahrenscode:" + ' + 'Label42 + ' + Me.Label42.AutoSize = True + Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label42.Location = New System.Drawing.Point(618, 240) + Me.Label42.Name = "Label42" + Me.Label42.Size = New System.Drawing.Size(169, 13) + Me.Label42.TabIndex = 78 + Me.Label42.Text = "Auf jede Position anwenden:" + ' + 'txtPosPraeferenz + ' + Me.txtPosPraeferenz._DateTimeOnly = False + Me.txtPosPraeferenz._numbersOnly = True + Me.txtPosPraeferenz._numbersOnlyKommastellen = "" + Me.txtPosPraeferenz._numbersOnlyTrennzeichen = False + Me.txtPosPraeferenz._Prozent = False + Me.txtPosPraeferenz._ShortDateNew = False + Me.txtPosPraeferenz._ShortDateOnly = False + Me.txtPosPraeferenz._TimeOnly = False + Me.txtPosPraeferenz._TimeOnly_Seconds = False + Me.txtPosPraeferenz._value = Nothing + Me.txtPosPraeferenz._Waehrung = False + Me.txtPosPraeferenz._WaehrungZeichen = False + Me.txtPosPraeferenz.Enabled = False + Me.txtPosPraeferenz.ForeColor = System.Drawing.Color.Black + Me.txtPosPraeferenz.Location = New System.Drawing.Point(719, 259) + Me.txtPosPraeferenz.MaxLength = 3 + Me.txtPosPraeferenz.MaxLineLength = -1 + Me.txtPosPraeferenz.MaxLines_Warning = "" + Me.txtPosPraeferenz.MaxLines_Warning_Label = Nothing + Me.txtPosPraeferenz.Name = "txtPosPraeferenz" + Me.txtPosPraeferenz.Size = New System.Drawing.Size(137, 20) + Me.txtPosPraeferenz.TabIndex = 79 + ' + 'txtPosVerfahrenscode + ' + Me.txtPosVerfahrenscode._DateTimeOnly = False + Me.txtPosVerfahrenscode._numbersOnly = True + Me.txtPosVerfahrenscode._numbersOnlyKommastellen = "" + Me.txtPosVerfahrenscode._numbersOnlyTrennzeichen = False + Me.txtPosVerfahrenscode._Prozent = False + Me.txtPosVerfahrenscode._ShortDateNew = False + Me.txtPosVerfahrenscode._ShortDateOnly = False + Me.txtPosVerfahrenscode._TimeOnly = False + Me.txtPosVerfahrenscode._TimeOnly_Seconds = False + Me.txtPosVerfahrenscode._value = Nothing + Me.txtPosVerfahrenscode._Waehrung = False + Me.txtPosVerfahrenscode._WaehrungZeichen = False + Me.txtPosVerfahrenscode.Enabled = False + Me.txtPosVerfahrenscode.ForeColor = System.Drawing.Color.Black + Me.txtPosVerfahrenscode.Location = New System.Drawing.Point(719, 284) + Me.txtPosVerfahrenscode.MaxLength = 4 + Me.txtPosVerfahrenscode.MaxLineLength = -1 + Me.txtPosVerfahrenscode.MaxLines_Warning = "" + Me.txtPosVerfahrenscode.MaxLines_Warning_Label = Nothing + Me.txtPosVerfahrenscode.Name = "txtPosVerfahrenscode" + Me.txtPosVerfahrenscode.Size = New System.Drawing.Size(137, 20) + Me.txtPosVerfahrenscode.TabIndex = 80 + ' 'usrCntlTCeZOLL_EZA_Allg ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1628,8 +1724,10 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Me.Size = New System.Drawing.Size(930, 979) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel3.ResumeLayout(False) + Me.Panel3.PerformLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MyDatagridview2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() @@ -1743,4 +1841,10 @@ Partial Class usrCntlTCeZOLL_EZA_Allg Friend WithEvents Label37 As Label Friend WithEvents Label38 As Label Friend WithEvents Label39 As Label + Friend WithEvents Panel3 As Panel + Friend WithEvents txtPosVerfahrenscode As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPosPraeferenz As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label42 As Label + Friend WithEvents Label41 As Label + Friend WithEvents Label40 As Label End Class diff --git a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.resx b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.resx index 653ef663..7d56fc98 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.resx +++ b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - True @@ -189,4 +180,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.vb b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.vb index b279f3ca..5d746578 100644 --- a/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.vb +++ b/SDL/ZOLLSYSTEM/TELOTEC/eZOLL/EZA/usrCntlTCeZOLL_EZA_Allg.vb @@ -399,6 +399,10 @@ Public Class usrCntlTCeZOLL_EZA_Allg PACK.Pack_Nr = row.Cells("clmnPackstuecke").Value POS.PACKSTUECKE.Add(PACK) + POS.Item_Pref = If(txtPosPraeferenz._value <> "", txtPosPraeferenz._value, Nothing) + POS.Item_ProcCd = If(txtPosVerfahrenscode._value <> "", txtPosVerfahrenscode._value, Nothing) + + POS.DOC_CERTS.Clear() For Each rowDoc As DataGridViewRow In MyDatagridview2.Rows If rowDoc.Index - 1 = MyDatagridview2.Rows.Count - 1 Then Exit For @@ -422,7 +426,13 @@ Public Class usrCntlTCeZOLL_EZA_Allg MyDatagridview1.Rows.Clear() For Each POS In TEL_ANM.POSITIONSDATEN - MyDatagridview1.Rows.Add({POS.Item_Orig, POS.Item_ComCd, POS.Item_GdsDes, "", "", "", "", POS.Item_ItVal, "EUR"}) + Dim Pk_Nr = "" + Dim Pk_Kind = "PK" + If POS.PACKSTUECKE IsNot Nothing AndAlso POS.PACKSTUECKE.Count > 0 Then + Pk_Nr = If(POS.PACKSTUECKE(0).Pack_Nr, "") + Pk_Kind = If(POS.PACKSTUECKE(0).Pack_Kind, "") + End If + MyDatagridview1.Rows.Add({POS.Item_Orig, POS.Item_ComCd, POS.Item_GdsDes, Pk_Nr, Pk_Kind, "", "", POS.Item_ItVal, "EUR"}) Next End Sub