diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index abcdfea9..84902e59 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -3421,7 +3421,7 @@ Public Class frmMDMDatenverarbetiung left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] and inv.customer_number = cust.[customer_id] and trans.transaction_country = inv.country left join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - WHERE bills.[invoice_date] = '" & DateTimePicker2.Text & "' + WHERE bills.[invoice_date] = '" & DateTimePicker2.Text & "' GROUP BY cust.customer_id, cust.customer_name, Adressen.AdressenNr HAVING (((cust.customer_id) Is Not Null) AND ((Adressen.AdressenNr) Is Null)) OR (((cust.customer_id) Is Not Null) AND ((Adressen.AdressenNr) Is Not Null) AND (((SELECT Offerten.OffertenNr FROM Offerten WHERE (((Offerten.KundenNr)=isnull(Adressen.[AdressenNr],0)) AND ((Offerten.OffertenNr)=23)))) Is Null)))as a", "FMZOLL")) @@ -3431,8 +3431,7 @@ Public Class frmMDMDatenverarbetiung Return False End If - - Dim falscheLeistungsnummern As Integer = CInt((New SQL).getValueTxtBySql("select count (*) from (Select trans.device_product_type, trans.transaction_country,trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name, + Dim sqlStringfalscheLeistungsNr = "select count (*) from (Select trans.device_product_type, trans.transaction_country,trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name, sum(trans.transaction_gross_amount) As [Summe Transaction Amount ( EUR )], sum(trans.msts_fee_amount) As [Summe Admin Fee Amount ( EUR )], sum(trans.msts_fee_amount) As [Summe Fees And Costs Amount ( EUR )], @@ -3444,32 +3443,26 @@ Public Class frmMDMDatenverarbetiung Left Join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] And inv.customer_number = cust.[customer_id] And trans.transaction_country = inv.country Left Join tblMSELeistungen ON trans.device_product_type = tblMSELeistungen.[Card Type] And trans.transaction_country = tblMSELeistungen.[Transaction Country] WHERE((trans.transaction_gross_amount <> 0) And tblMSELeistungen.LeistungsNr Is Null) And bills.[invoice_date] = '" & DateTimePicker2.Text & "' - GROUP by trans.device_product_type, trans.transaction_country, trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name) as a", "FMZOLL")) + GROUP by trans.device_product_type, trans.transaction_country, trans.transaction_product_name, trans.transaction_product_id, cust.[customer_id], trans.partner_haulier_id, cust.customer_name) as a" + + Dim falscheLeistungsnummern As Integer = CInt((New SQL).getValueTxtBySql(sqlStringfalscheLeistungsNr, "FMZOLL")) If falscheLeistungsnummern > 0 Then - - pruefData_MSE = False - MsgBox("Es fehlen " & falscheLeistungsnummern & " Leistungsnummern!" & vbNewLine & "Diese Leistungssnummern (von Rechnung " & DateTimePicker2.Text & ") müssen nachgetragen werden. (bitte an Administrator wenden, tblMSELeistungen).") - Return False - - End If - - Dim fehlendeTransactionen As Integer = 0 - - fehlendeTransactionen = CInt((New SQL).getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & DateTimePicker2.Text & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL")) - - - If fehlendeTransactionen > 0 Then - pruefData_MSE = False - Dim hint As String = "" - If fehlendeTransactionen > 500 Then - hint = "Batch-Nr: " - hint &= SQL.getValueTxtBySql("select distinct(trans.batch_seq_nr) FROM [VERAG].[dbo].[tblMSESettlements] as settle INNER JOIN [VERAG].[dbo].[tblMSETransactions] as trans on trans.transaction_id = settle.transaction_id where [invoice_date] = '" & DateTimePicker2.Text & "' AND trans.[transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL") + If Not SQL.doSQL("update [VERAG].[dbo].[tblMSETransactions] set device_product_type = 'HUGO SIM renewal cost' where transaction_product_id = 453 and transaction_product_name like 'HUGO SIM renewal cost%'", "FMZOLL") Then + MsgBox("Fehler beim Setzen der HUGO SIM renewal cost") + Return False End If - MsgBox("Es fehlen " & fehlendeTransactionen & " Transaktionen in der Datenbank!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) - End If + falscheLeistungsnummern = CInt((New SQL).getValueTxtBySql(sqlStringfalscheLeistungsNr, "FMZOLL")) + If falscheLeistungsnummern > 0 Then + pruefData_MSE = False + MsgBox("Es fehlen " & falscheLeistungsnummern & " Leistungsnummern!" & vbNewLine & "Diese Leistungssnummern (von Rechnung " & DateTimePicker2.Text & ") müssen nachgetragen werden. (bitte an Administrator wenden, tblMSELeistungen).") + Return False + End If + + + End If Dim nichtAufAbgerechnetGesetzteTransactionen As Integer = 0 @@ -3485,6 +3478,22 @@ Public Class frmMDMDatenverarbetiung MsgBox("Es sind " & nichtAufAbgerechnetGesetzteTransactionen & " Transaktionen in der Datenbank, die noch nicht auf VERRECHNET gesetzt sind!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen aktualisiert werden. (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) End If + + 'das muss die letzte Prüfung sein, da uU eine Transaktion fehlen kann! + Dim fehlendeTransactionen As Integer = 0 + + fehlendeTransactionen = CInt((New SQL).getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & DateTimePicker2.Text & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL")) + + If fehlendeTransactionen > 0 Then + pruefData_MSE = False + Dim hint As String = "" + If fehlendeTransactionen > 500 Then + hint = "Batch-Nr: " + hint &= SQL.getValueTxtBySql("select distinct(trans.batch_seq_nr) FROM [VERAG].[dbo].[tblMSESettlements] as settle INNER JOIN [VERAG].[dbo].[tblMSETransactions] as trans on trans.transaction_id = settle.transaction_id where [invoice_date] = '" & DateTimePicker2.Text & "' AND trans.[transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions]) ", "FMZOLL") + End If + MsgBox("Es fehlen " & fehlendeTransactionen & " Transaktionen in der Datenbank!" & vbNewLine & "Diese Transaktionen (von Rechnung " & DateTimePicker2.Text & ") müssen nachgeladen werden (bitte an Administrator wenden)." & IIf(hint <> "", vbNewLine & hint, "")) + End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_MSE = False diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index d423eeac..db598015 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -45,6 +45,8 @@ Partial Class usrCntlMDMAuswertungen Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label12 = New System.Windows.Forms.Label() + Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.rbtUeberfaelligeBestKd = New System.Windows.Forms.RadioButton() Me.rbtUeberfaelligeBestAlleKd = New System.Windows.Forms.RadioButton() Me.PictureBox1 = New System.Windows.Forms.PictureBox() @@ -58,13 +60,16 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.cbxArchiv = New System.Windows.Forms.CheckBox() Me.Label14 = New System.Windows.Forms.Label() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.Label16 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label22 = New System.Windows.Forms.Label() + Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.Label19 = New System.Windows.Forms.Label() Me.datBenachrichtigungBis = New System.Windows.Forms.DateTimePicker() @@ -97,6 +102,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label29 = New System.Windows.Forms.Label() Me.datIDSVon = New System.Windows.Forms.DateTimePicker() Me.GroupBox8 = New System.Windows.Forms.GroupBox() + Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtOrt = New System.Windows.Forms.TextBox() Me.lbl = New System.Windows.Forms.Label() Me.cbxLand = New System.Windows.Forms.CheckBox() @@ -111,9 +117,19 @@ Partial Class usrCntlMDMAuswertungen Me.Button11 = New System.Windows.Forms.Button() Me.Label34 = New System.Windows.Forms.Label() Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() Me.tbIDS = New System.Windows.Forms.TabPage() + Me.Label60 = New System.Windows.Forms.Label() + Me.GroupBox18 = New System.Windows.Forms.GroupBox() + Me.Label57 = New System.Windows.Forms.Label() + Me.Label58 = New System.Windows.Forms.Label() + Me.ProgressBar2 = New System.Windows.Forms.ProgressBar() + Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.Label59 = New System.Windows.Forms.Label() + Me.Button17 = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Label44 = New System.Windows.Forms.Label() Me.GroupBox13 = New System.Windows.Forms.GroupBox() @@ -141,6 +157,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label41 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label56 = New System.Windows.Forms.Label() Me.GroupBox17 = New System.Windows.Forms.GroupBox() @@ -165,23 +182,6 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() - Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.GroupBox18 = New System.Windows.Forms.GroupBox() - Me.Label57 = New System.Windows.Forms.Label() - Me.Label58 = New System.Windows.Forms.Label() - Me.ProgressBar2 = New System.Windows.Forms.ProgressBar() - Me.TextBox2 = New System.Windows.Forms.TextBox() - Me.Label59 = New System.Windows.Forms.Label() - Me.Button17 = New System.Windows.Forms.Button() - Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -201,6 +201,7 @@ Partial Class usrCntlMDMAuswertungen CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() Me.tbIDS.SuspendLayout() + Me.GroupBox18.SuspendLayout() Me.TabPage2.SuspendLayout() Me.GroupBox13.SuspendLayout() Me.GroupBox10.SuspendLayout() @@ -214,7 +215,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox15.SuspendLayout() Me.GroupBox14.SuspendLayout() Me.pnl.SuspendLayout() - Me.GroupBox18.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -457,6 +457,50 @@ Partial Class usrCntlMDMAuswertungen Me.Label12.TabIndex = 16 Me.Label12.Text = "SDL-Leistung:" ' + 'cboUeberfaelligeBestLeistung + ' + Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing + Me.cboUeberfaelligeBestLeistung._allowFreiText = False + Me.cboUeberfaelligeBestLeistung._value = "" + Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 + Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 + Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True + Me.cboUeberfaelligeBestLeistung.IntegralHeight = False + Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) + Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" + Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) + Me.cboUeberfaelligeBestLeistung.TabIndex = 15 + ' + 'kdUeberfaelligeBest + ' + Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False + Me.kdUeberfaelligeBest._AllowSetValue = True + Me.kdUeberfaelligeBest._autoSizeGross = False + Me.kdUeberfaelligeBest._display_Name1 = False + Me.kdUeberfaelligeBest._displayAVISO_Email = False + Me.kdUeberfaelligeBest._displayFullName = False + Me.kdUeberfaelligeBest._displayWoelflKd = False + Me.kdUeberfaelligeBest._hideIfListEmpty = True + Me.kdUeberfaelligeBest._loadKdData = False + Me.kdUeberfaelligeBest._searchName1 = True + Me.kdUeberfaelligeBest._UseFIRMA = "" + Me.kdUeberfaelligeBest._ValueKdAndName = True + Me.kdUeberfaelligeBest.dgvpos = "LEFT" + Me.kdUeberfaelligeBest.KdName = "" + Me.kdUeberfaelligeBest.KdNr = "-1" + Me.kdUeberfaelligeBest.kdNrField = Nothing + Me.kdUeberfaelligeBest.KdNrNullInt = Nothing + Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) + Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" + Me.kdUeberfaelligeBest.nurAktive = True + Me.kdUeberfaelligeBest.searchActive = True + Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) + Me.kdUeberfaelligeBest.TabIndex = 14 + Me.kdUeberfaelligeBest.TIMER_SEARCH = True + Me.kdUeberfaelligeBest.usrcntl = Nothing + ' 'rbtUeberfaelligeBestKd ' Me.rbtUeberfaelligeBestKd.AutoSize = True @@ -590,6 +634,34 @@ Partial Class usrCntlMDMAuswertungen Me.Label14.TabIndex = 16 Me.Label14.Text = "SDL-Leistung:" ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = True + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.KdName = "" + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox1.TabIndex = 14 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' 'PictureBox2 ' Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image) @@ -600,6 +672,22 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox2.TabIndex = 11 Me.PictureBox2.TabStop = False ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownHeight = 350 + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 250 + Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.IntegralHeight = False + Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox1.TabIndex = 15 + ' 'Label15 ' Me.Label15.AutoSize = True @@ -666,6 +754,34 @@ Partial Class usrCntlMDMAuswertungen Me.Label22.TabIndex = 17 Me.Label22.Text = "Kunde:" ' + 'KdSearchBox2 + ' + Me.KdSearchBox2._AlleFirmenCLUSTER = False + Me.KdSearchBox2._AllowSetValue = True + Me.KdSearchBox2._autoSizeGross = False + Me.KdSearchBox2._display_Name1 = False + Me.KdSearchBox2._displayAVISO_Email = False + Me.KdSearchBox2._displayFullName = False + Me.KdSearchBox2._displayWoelflKd = False + Me.KdSearchBox2._hideIfListEmpty = True + Me.KdSearchBox2._loadKdData = False + Me.KdSearchBox2._searchName1 = True + Me.KdSearchBox2._UseFIRMA = "" + Me.KdSearchBox2._ValueKdAndName = True + Me.KdSearchBox2.dgvpos = "LEFT" + Me.KdSearchBox2.KdName = "" + Me.KdSearchBox2.KdNr = "-1" + Me.KdSearchBox2.kdNrField = Nothing + Me.KdSearchBox2.KdNrNullInt = Nothing + Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) + Me.KdSearchBox2.Name = "KdSearchBox2" + Me.KdSearchBox2.nurAktive = True + Me.KdSearchBox2.searchActive = True + Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox2.TabIndex = 14 + Me.KdSearchBox2.TIMER_SEARCH = True + Me.KdSearchBox2.usrcntl = Nothing + ' 'PictureBox3 ' Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.cards @@ -991,6 +1107,17 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox8.TabIndex = 23 Me.GroupBox8.TabStop = False ' + 'cboIDSDateType + ' + Me.cboIDSDateType._allowedValuesFreiText = Nothing + Me.cboIDSDateType._allowFreiText = False + Me.cboIDSDateType._value = "" + Me.cboIDSDateType.FormattingEnabled = True + Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) + Me.cboIDSDateType.Name = "cboIDSDateType" + Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) + Me.cboIDSDateType.TabIndex = 27 + ' 'txtOrt ' Me.txtOrt.Location = New System.Drawing.Point(201, 87) @@ -1163,6 +1290,22 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox5.TabIndex = 11 Me.PictureBox5.TabStop = False ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.DropDownHeight = 350 + Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox2.DropDownWidth = 250 + Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.IntegralHeight = False + Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox2.TabIndex = 17 + ' 'Label36 ' Me.Label36.AutoSize = True @@ -1184,6 +1327,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Text = "WÖLFL" Me.TabPage3.UseVisualStyleBackColor = True ' + 'UsrCntlWoelfl_IM_CSVRg1 + ' + Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White + Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) + Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" + Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 + ' 'tbIDS ' Me.tbIDS.Controls.Add(Me.Label60) @@ -1200,6 +1351,84 @@ Partial Class usrCntlMDMAuswertungen Me.tbIDS.Text = "IDS" Me.tbIDS.UseVisualStyleBackColor = True ' + 'Label60 + ' + Me.Label60.AutoSize = True + Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label60.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label60.Location = New System.Drawing.Point(9, 162) + Me.Label60.Name = "Label60" + Me.Label60.Size = New System.Drawing.Size(284, 17) + Me.Label60.TabIndex = 25 + Me.Label60.Text = "IDS Dieselabrechnungsdaten einlesen" + ' + 'GroupBox18 + ' + Me.GroupBox18.Controls.Add(Me.Label57) + Me.GroupBox18.Controls.Add(Me.Label58) + Me.GroupBox18.Controls.Add(Me.ProgressBar2) + Me.GroupBox18.Controls.Add(Me.TextBox2) + Me.GroupBox18.Controls.Add(Me.Label59) + Me.GroupBox18.Controls.Add(Me.Button17) + Me.GroupBox18.Location = New System.Drawing.Point(6, 182) + Me.GroupBox18.Name = "GroupBox18" + Me.GroupBox18.Size = New System.Drawing.Size(297, 134) + Me.GroupBox18.TabIndex = 24 + Me.GroupBox18.TabStop = False + ' + 'Label57 + ' + Me.Label57.Location = New System.Drawing.Point(133, 19) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(158, 49) + Me.Label57.TabIndex = 23 + Me.Label57.Text = "Liest die .CSV Datei von IDS ein und sichert die Daten in der Datenbank." + ' + 'Label58 + ' + Me.Label58.Location = New System.Drawing.Point(220, 103) + Me.Label58.Name = "Label58" + Me.Label58.Size = New System.Drawing.Size(69, 13) + Me.Label58.TabIndex = 22 + Me.Label58.Text = "0%" + Me.Label58.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'ProgressBar2 + ' + Me.ProgressBar2.Location = New System.Drawing.Point(6, 74) + Me.ProgressBar2.Name = "ProgressBar2" + Me.ProgressBar2.Size = New System.Drawing.Size(283, 23) + Me.ProgressBar2.TabIndex = 20 + ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.Color.White + Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox2.Location = New System.Drawing.Point(78, 103) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(106, 13) + Me.TextBox2.TabIndex = 19 + ' + 'Label59 + ' + Me.Label59.AutoSize = True + Me.Label59.Location = New System.Drawing.Point(3, 103) + Me.Label59.Name = "Label59" + Me.Label59.Size = New System.Drawing.Size(69, 13) + Me.Label59.TabIndex = 18 + Me.Label59.Text = "Einarbeitung:" + ' + 'Button17 + ' + Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button17.Location = New System.Drawing.Point(6, 19) + Me.Button17.Name = "Button17" + Me.Button17.Size = New System.Drawing.Size(121, 49) + Me.Button17.TabIndex = 4 + Me.Button17.Text = "Einlesen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Datei auswählen ..." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + Me.Button17.UseVisualStyleBackColor = True + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.Label44) @@ -1483,6 +1712,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.Text = "MSE" Me.TabPage4.UseVisualStyleBackColor = True ' + 'UsrCntlMSE_KonvertCSV1 + ' + Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White + Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) + Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" + Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 + ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label56) @@ -1742,243 +1979,6 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'UsrCntlWoelfl_IM_CSVRg1 - ' - Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White - Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) - Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" - Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 - ' - 'UsrCntlMSE_KonvertCSV1 - ' - Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White - Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) - Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" - Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.DropDownHeight = 350 - Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox2.DropDownWidth = 250 - Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.IntegralHeight = False - Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox2.TabIndex = 17 - ' - 'cboUeberfaelligeBestLeistung - ' - Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing - Me.cboUeberfaelligeBestLeistung._allowFreiText = False - Me.cboUeberfaelligeBestLeistung._value = "" - Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 - Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 - Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True - Me.cboUeberfaelligeBestLeistung.IntegralHeight = False - Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) - Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" - Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) - Me.cboUeberfaelligeBestLeistung.TabIndex = 15 - ' - 'kdUeberfaelligeBest - ' - Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False - Me.kdUeberfaelligeBest._AllowSetValue = True - Me.kdUeberfaelligeBest._autoSizeGross = False - Me.kdUeberfaelligeBest._display_Name1 = False - Me.kdUeberfaelligeBest._displayAVISO_Email = False - Me.kdUeberfaelligeBest._displayFullName = False - Me.kdUeberfaelligeBest._displayWoelflKd = False - Me.kdUeberfaelligeBest._hideIfListEmpty = True - Me.kdUeberfaelligeBest._loadKdData = False - Me.kdUeberfaelligeBest._searchName1 = True - Me.kdUeberfaelligeBest._UseFIRMA = "" - Me.kdUeberfaelligeBest._ValueKdAndName = True - Me.kdUeberfaelligeBest.dgvpos = "LEFT" - Me.kdUeberfaelligeBest.KdName = "" - Me.kdUeberfaelligeBest.KdNr = "-1" - Me.kdUeberfaelligeBest.kdNrField = Nothing - Me.kdUeberfaelligeBest.KdNrNullInt = Nothing - Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) - Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" - Me.kdUeberfaelligeBest.nurAktive = True - Me.kdUeberfaelligeBest.searchActive = True - Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) - Me.kdUeberfaelligeBest.TabIndex = 14 - Me.kdUeberfaelligeBest.TIMER_SEARCH = True - Me.kdUeberfaelligeBest.usrcntl = Nothing - ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = True - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.KdName = "" - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox1.TabIndex = 14 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownHeight = 350 - Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox1.DropDownWidth = 250 - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.IntegralHeight = False - Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox1.TabIndex = 15 - ' - 'KdSearchBox2 - ' - Me.KdSearchBox2._AlleFirmenCLUSTER = False - Me.KdSearchBox2._AllowSetValue = True - Me.KdSearchBox2._autoSizeGross = False - Me.KdSearchBox2._display_Name1 = False - Me.KdSearchBox2._displayAVISO_Email = False - Me.KdSearchBox2._displayFullName = False - Me.KdSearchBox2._displayWoelflKd = False - Me.KdSearchBox2._hideIfListEmpty = True - Me.KdSearchBox2._loadKdData = False - Me.KdSearchBox2._searchName1 = True - Me.KdSearchBox2._UseFIRMA = "" - Me.KdSearchBox2._ValueKdAndName = True - Me.KdSearchBox2.dgvpos = "LEFT" - Me.KdSearchBox2.KdName = "" - Me.KdSearchBox2.KdNr = "-1" - Me.KdSearchBox2.kdNrField = Nothing - Me.KdSearchBox2.KdNrNullInt = Nothing - Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) - Me.KdSearchBox2.Name = "KdSearchBox2" - Me.KdSearchBox2.nurAktive = True - Me.KdSearchBox2.searchActive = True - Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox2.TabIndex = 14 - Me.KdSearchBox2.TIMER_SEARCH = True - Me.KdSearchBox2.usrcntl = Nothing - ' - 'cboIDSDateType - ' - Me.cboIDSDateType._allowedValuesFreiText = Nothing - Me.cboIDSDateType._allowFreiText = False - Me.cboIDSDateType._value = "" - Me.cboIDSDateType.FormattingEnabled = True - Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) - Me.cboIDSDateType.Name = "cboIDSDateType" - Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) - Me.cboIDSDateType.TabIndex = 27 - ' - 'GroupBox18 - ' - Me.GroupBox18.Controls.Add(Me.Label57) - Me.GroupBox18.Controls.Add(Me.Label58) - Me.GroupBox18.Controls.Add(Me.ProgressBar2) - Me.GroupBox18.Controls.Add(Me.TextBox2) - Me.GroupBox18.Controls.Add(Me.Label59) - Me.GroupBox18.Controls.Add(Me.Button17) - Me.GroupBox18.Location = New System.Drawing.Point(6, 182) - Me.GroupBox18.Name = "GroupBox18" - Me.GroupBox18.Size = New System.Drawing.Size(297, 134) - Me.GroupBox18.TabIndex = 24 - Me.GroupBox18.TabStop = False - ' - 'Label57 - ' - Me.Label57.Location = New System.Drawing.Point(133, 19) - Me.Label57.Name = "Label57" - Me.Label57.Size = New System.Drawing.Size(158, 49) - Me.Label57.TabIndex = 23 - Me.Label57.Text = "Liest die .CSV Datei von IDS ein und sichert die Daten in der Datenbank." - ' - 'Label58 - ' - Me.Label58.Location = New System.Drawing.Point(220, 103) - Me.Label58.Name = "Label58" - Me.Label58.Size = New System.Drawing.Size(69, 13) - Me.Label58.TabIndex = 22 - Me.Label58.Text = "0%" - Me.Label58.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'ProgressBar2 - ' - Me.ProgressBar2.Location = New System.Drawing.Point(6, 74) - Me.ProgressBar2.Name = "ProgressBar2" - Me.ProgressBar2.Size = New System.Drawing.Size(283, 23) - Me.ProgressBar2.TabIndex = 20 - ' - 'TextBox2 - ' - Me.TextBox2.BackColor = System.Drawing.Color.White - Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TextBox2.Location = New System.Drawing.Point(78, 103) - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(106, 13) - Me.TextBox2.TabIndex = 19 - ' - 'Label59 - ' - Me.Label59.AutoSize = True - Me.Label59.Location = New System.Drawing.Point(3, 103) - Me.Label59.Name = "Label59" - Me.Label59.Size = New System.Drawing.Size(69, 13) - Me.Label59.TabIndex = 18 - Me.Label59.Text = "Einarbeitung:" - ' - 'Button17 - ' - Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button17.Location = New System.Drawing.Point(6, 19) - Me.Button17.Name = "Button17" - Me.Button17.Size = New System.Drawing.Size(121, 49) - Me.Button17.TabIndex = 4 - Me.Button17.Text = "Einlesen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Datei auswählen ..." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) - Me.Button17.UseVisualStyleBackColor = True - ' - 'Label60 - ' - Me.Label60.AutoSize = True - Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label60.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label60.Location = New System.Drawing.Point(9, 162) - Me.Label60.Name = "Label60" - Me.Label60.Size = New System.Drawing.Size(284, 17) - Me.Label60.TabIndex = 25 - Me.Label60.Text = "IDS Dieselabrechnungsdaten einlesen" - ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2019,6 +2019,8 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.PerformLayout() Me.tbIDS.ResumeLayout(False) Me.tbIDS.PerformLayout() + Me.GroupBox18.ResumeLayout(False) + Me.GroupBox18.PerformLayout() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() Me.GroupBox13.ResumeLayout(False) @@ -2044,8 +2046,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox14.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - Me.GroupBox18.ResumeLayout(False) - Me.GroupBox18.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 5d94a621..962fa7d2 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1415,6 +1415,10 @@ Public Class usrCntlMDMAuswertungen Me.Cursor = Cursors.Default End Sub + + Private Sub UsrCntlMSE_KonvertCSV1_Load(sender As Object, e As EventArgs) Handles UsrCntlMSE_KonvertCSV1.Load + + End Sub End Class