Index: TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb =================================================================== diff -u -r1903 -r1905 --- TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 1903) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 1905) @@ -582,7 +582,7 @@ PartExt07 = If(isBinnen, vItem.KleurBinnen, vItem.KleurBuiten) 'kleur PartExt08 = "WORDT VERVANGEN" 'decor PartExt01 = Label 'etiketlijn1 - PartExt02 = "" 'etiketlijn2 + PartExt02 = "WORDT VERVANGEN" 'etiketlijn2 PartExt03 = "" 'etiketlijn3 PartExt04 = "WORDT VERVANGEN" 'etiketlijn4 PartExt05 = "NoLabel" 'etiketinfo @@ -638,68 +638,60 @@ #Region "voorraad front" Public Sub voorraadFrontStelInitieleWaardenIn(vItem As IFrontVoorraadItem) - 'PartRef = "Zijkantplaat" 'rol/onderdeel - 'PartQty = "1" 'aantal - 'PartMat = "WORDT VERVANGEN" 'plaatmateriaal" - 'PartCalc = "WORDT VERVANGEN" 'barcode - 'PartRemark2 = "1" 'ladesequenty - 'PartRemark = "NoRework" 'dossiercode - 'PartExt09 = "" 'extrainfo - 'PartL = vItem.Diepte 'lengte - 'PartW = Configs.geefHoogteDataVoorraad(vItem.Hoogte) 'breedte - 'PartExt06 = "6,5" 'dikte - 'PartExt07 = If(isBinnen, vItem.KleurBinnen, vItem.KleurBuiten) 'kleur - 'PartExt08 = "WORDT VERVANGEN" 'decor - 'PartExt01 = Label 'etiketlijn1 - 'PartExt02 = "" 'etiketlijn2 - 'PartExt03 = "" 'etiketlijn3 - 'PartExt04 = "WORDT VERVANGEN" 'etiketlijn4 - 'PartExt05 = "NoLabel" 'etiketinfo - 'PartRemark3 = "NoRework" 'rework - 'PartGroup = "99999001" 'kar - 'PartLevel = DateTime.Now.ToString("yyyyMMdd") + "12" 'banding + PartRef = "Monster" 'rol/onderdeel + PartQty = "1" 'aantal + PartMat = "WORDT VERVANGEN" 'plaatmateriaal" + PartCalc = "WORDT VERVANGEN" 'barcode + PartRemark2 = "1" 'ladesequenty + PartRemark = "NoRework" 'dossiercode + PartExt09 = "" 'extrainfo + PartL = vItem.Breedte + 5 'lengte + PartW = Configs.geefHoogteDataVoorraad(vItem.Hoogte) 'breedte + PartExt06 = "9" 'dikte + PartExt07 = vItem.Materiaal 'kleur + PartExt08 = "WORDT VERVANGEN" 'decor + PartExt01 = Label 'etiketlijn1 + PartExt02 = "" 'etiketlijn2 + PartExt03 = "" 'etiketlijn3 + PartExt04 = "WORDT VERVANGEN" 'etiketlijn4 + PartExt05 = "NoLabel" 'etiketinfo + PartRemark3 = "NoRework" 'rework + PartGroup = "88888000" 'kar + PartLevel = DateTime.Now.ToString("yyyyMMdd") 'banding - 'PartMat = Configs.voorraadGeefPlaatmateriaal(If(isBinnen, vItem.KleurBinnen, vItem.KleurBuiten)) 'plaatmateriaal - 'PartExt08 = PartMat.Substring(0, PartMat.IndexOf(".")) + PartMat = Configs.voorraadGeefPlaatmateriaal(vItem.Materiaal) 'plaatmateriaal + PartExt08 = PartMat.Substring(0, PartMat.IndexOf(".")) End Sub Public Sub voorraadFrontGenereerBarcodeEnStelEtiketlijnIn(vItem As IFrontVoorraadItem, barcodeNummer As String) - ''barcodenummer opvullen met nullen (0076) - 'Do Until barcodeNummer.Length = 4 - ' barcodeNummer = "0" & barcodeNummer - 'Loop + 'barcodenummer opvullen met nullen (00076) + Do Until barcodeNummer.Length = 5 + barcodeNummer = "0" & barcodeNummer + Loop + 'breedte is altijd altijd 5 lang (*10 want eerste kommagetal moet erbij) + Dim breedte As String = CInt(vItem.Breedte * 10) + Do Until breedte.Length = 5 + breedte = "0" & breedte + Loop - ''barcode opbouwen - 'Dim barcode As String = "" - ''eerste letter (onderdeel) - 'barcode &= "Z" - ''tweede letter (breedte) - 'barcode &= hoogteLetter - ''derde letter (vast) - 'barcode &= "V" - ''cijfer (lengte) - 'barcode &= Configs.voorraadGeefCodeStemasB(Configs.voorraadGeefNettoLengte(PartL)) - ''letter voor rechts of links. Als het over een sifonlade gaat nemen we een andere letter. - 'If LinksOfRechts = LinksOfRechts.Links Then - ' 'Links - ' barcode &= If(Not isSifonlade, "L", "E") - 'Else - ' 'Rechts - ' barcode &= If(Not isSifonlade, "R", "F") - 'End If - ''eerste deel barcodeNummer - 'barcode &= barcodeNummer.Substring(0, 2) - ''tussenletter (vast) - 'barcode &= "A" - ''tweede deel barcodeNummer - 'barcode &= barcodeNummer.Substring(2) + 'barcode opbouwen + Dim barcode As String = "" + 'eerste letter (onderdeel) + barcode &= "F" 'Front + 'tweede letter (hoogte) + barcode &= vItem.Hoogte + 'derde letter (variabel) + barcode &= vItem.LetterBarcode + 'getal (lengte), altijd 5 lang + barcode &= breedte '02500 -> 18000 + 'vast deel barcode + barcode &= $"VS{barcodeNummer}" 'VS00000 -> VS09999 + 'aantal boringen + barcode &= $"D{vItem.Boringen}" 'D0 -> D9 - ''nieuwe barcode en etiketlijn4 instellen - 'PartCalc = barcode - 'PartExt04 = barcode - - ''Etiketlijn 2 op een hardcoded value instellen - 'PartExt02 = "0a/MAN(1)/KAR 1:1/1" + 'nieuwe barcode en etiketlijn4 instellen + PartCalc = barcode + PartExt04 = barcode End Sub #End Region Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb =================================================================== diff -u -r1904 -r1905 --- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1904) +++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.vb (.../FormFronten.vb) (revision 1905) @@ -43,6 +43,10 @@ btnProduceer.Enabled = enabledButton End Sub + Private Sub NumericUpDownAantal_ValueChanged(sender As Object, e As EventArgs) Handles NumericUpDownAantal.ValueChanged + btnProduceer.Text = $"Produceer ({NumericUpDownAantal.Value})" + End Sub + Private Sub BtnProduceer_Click(sender As Object, e As EventArgs) Handles btnProduceer.Click Try btnProduceer.Enabled = False @@ -53,4 +57,5 @@ updateVerwerkButtonStatus() End Try End Sub + End Class \ No newline at end of file Index: TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb =================================================================== diff -u -r1904 -r1905 --- TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1904) +++ TAOR rework/TAOR rework/formulieren/Specials/FormFronten.Designer.vb (.../FormFronten.Designer.vb) (revision 1905) @@ -24,6 +24,8 @@ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormFronten)) Me.Panel1 = New System.Windows.Forms.Panel() + Me.NumericUpDownBoringen = New System.Windows.Forms.NumericUpDown() + Me.Label8 = New System.Windows.Forms.Label() Me.NumericUpDownBreedte = New System.Windows.Forms.NumericUpDown() Me.btnProduceer = New System.Windows.Forms.Button() Me.TextBoxLetterBarcode = New System.Windows.Forms.TextBox() @@ -41,12 +43,10 @@ Me.Label1 = New System.Windows.Forms.Label() Me.lblVerwerking = New System.Windows.Forms.Label() Me.btnTerug = New System.Windows.Forms.Button() - Me.NumericUpDownBoringen = New System.Windows.Forms.NumericUpDown() - Me.Label8 = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout + CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).BeginInit CType(Me.NumericUpDownBreedte,System.ComponentModel.ISupportInitialize).BeginInit CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).BeginInit Me.SuspendLayout ' 'Panel1 @@ -76,6 +76,26 @@ Me.Panel1.Size = New System.Drawing.Size(1200, 665) Me.Panel1.TabIndex = 61 ' + 'NumericUpDownBoringen + ' + Me.NumericUpDownBoringen.Font = New System.Drawing.Font("Microsoft Sans Serif", 39.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.NumericUpDownBoringen.ForeColor = System.Drawing.SystemColors.ControlText + Me.NumericUpDownBoringen.Location = New System.Drawing.Point(792, 406) + Me.NumericUpDownBoringen.Maximum = New Decimal(New Integer() {9, 0, 0, 0}) + Me.NumericUpDownBoringen.Name = "NumericUpDownBoringen" + Me.NumericUpDownBoringen.Size = New System.Drawing.Size(344, 67) + Me.NumericUpDownBoringen.TabIndex = 116 + ' + 'Label8 + ' + Me.Label8.AutoSize = true + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Label8.Location = New System.Drawing.Point(601, 431) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(148, 31) + Me.Label8.TabIndex = 115 + Me.Label8.Text = "# boring en" + ' 'NumericUpDownBreedte ' Me.NumericUpDownBreedte.DecimalPlaces = 1 @@ -268,26 +288,6 @@ Me.btnTerug.Text = "Terug" Me.btnTerug.UseVisualStyleBackColor = true ' - 'NumericUpDownBoringen - ' - Me.NumericUpDownBoringen.Font = New System.Drawing.Font("Microsoft Sans Serif", 39.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.NumericUpDownBoringen.ForeColor = System.Drawing.SystemColors.ControlText - Me.NumericUpDownBoringen.Location = New System.Drawing.Point(792, 406) - Me.NumericUpDownBoringen.Maximum = New Decimal(New Integer() {9, 0, 0, 0}) - Me.NumericUpDownBoringen.Name = "NumericUpDownBoringen" - Me.NumericUpDownBoringen.Size = New System.Drawing.Size(344, 67) - Me.NumericUpDownBoringen.TabIndex = 116 - ' - 'Label8 - ' - Me.Label8.AutoSize = true - Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 20!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.Label8.Location = New System.Drawing.Point(601, 431) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(148, 31) - Me.Label8.TabIndex = 115 - Me.Label8.Text = "# boring en" - ' 'FormFronten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) @@ -300,9 +300,9 @@ Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.Panel1.ResumeLayout(false) Me.Panel1.PerformLayout + CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).EndInit CType(Me.NumericUpDownBreedte,System.ComponentModel.ISupportInitialize).EndInit CType(Me.NumericUpDownAantal,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.NumericUpDownBoringen,System.ComponentModel.ISupportInitialize).EndInit Me.ResumeLayout(false) End Sub Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r1904 -r1905 --- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1904) +++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1905) @@ -919,7 +919,7 @@ item.GenereerKantenbandData() Next Catch ex As Exception - throw new Exception("Kon fronten voorraad datas niet genereren.",ex) + throw new Exception($"Kon fronten voorraad datas niet genereren.{vbNewLine}{ex.Message}",ex) End Try End Sub @@ -928,8 +928,9 @@ For Each item As FrontVoorraadItem In frontVoorraadRepository.voorraadItems HoofdAansturingFrontVoorraad.OpslaanVoorraadItem(item) Next + ArdisTextMapper.stopArdisTextOpslag() Catch ex As Exception - throw new Exception("Kon fronten voorraad datas niet opslaan in de databanken.",ex) + throw new Exception($"Kon fronten voorraad datas niet opslaan in de databanken.{vbNewLine}{ex.Message}",ex) End Try End Sub