AppCustom/MultiTool
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve filtering for document numbers

Browse Source
This commit is contained in:
Jonathan Jenne 2022-04-20 15:18:31 +02:00
parent 095838490f
commit 31e0835914
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MultiTool.Common/Winline/WinlineData.vb
View File

@ -735,34 +735,43 @@ Namespace Winline
oYear = Config.GetWinLineYear(pOptions.Year) oYear = Config.GetWinLineYear(pOptions.Year)
End If End If
Dim oTypeConstraint Dim oTypeConstraint, oTypeNumberColumn As String
Select Case pDocumentType Select Case pDocumentType
Case DocumentType.OutgoingOffer Case DocumentType.OutgoingOffer
oTypeConstraint = $"T.c137 = 2 AND c139 = 1 AND " oTypeConstraint = $"T.c137 = 2 AND c139 = 1 AND "
oTypeNumberColumn = "T.c043"
Case DocumentType.OutgoingOrder Case DocumentType.OutgoingOrder
oTypeConstraint = $"T.c137 = 2 AND c139 = 2 AND " oTypeConstraint = $"T.c137 = 2 AND c139 = 2 AND "
oTypeNumberColumn = "T.c044"
Case DocumentType.OutgoingDeliveryNote Case DocumentType.OutgoingDeliveryNote
oTypeConstraint = $"T.c137 = 2 AND (c139 = 3 OR c139 = -3) AND " oTypeConstraint = $"T.c137 = 2 AND (c139 = 3 OR c139 = -3) AND "
oTypeNumberColumn = "T.c045"
Case DocumentType.OutgoingInvoice Case DocumentType.OutgoingInvoice
oTypeConstraint = $"T.c137 = 2 AND c139 = 4 AND " oTypeConstraint = $"T.c137 = 2 AND c139 = 4 AND "
oTypeNumberColumn = "T.c055"
Case DocumentType.IncomingOffer Case DocumentType.IncomingOffer
oTypeConstraint = $"T.c137 = 3 AND c139 = 1 AND " oTypeConstraint = $"T.c137 = 3 AND c139 = 1 AND "
oTypeNumberColumn = "T.c043"
Case DocumentType.IncomingOrder Case DocumentType.IncomingOrder
oTypeConstraint = $"T.c137 = 3 AND c139 = 2 AND " oTypeConstraint = $"T.c137 = 3 AND c139 = 2 AND "
oTypeNumberColumn = "T.c044"
Case DocumentType.IncomingDeliveryNote Case DocumentType.IncomingDeliveryNote
oTypeConstraint = $"T.c137 = 3 AND c139 = 3 AND " oTypeConstraint = $"T.c137 = 3 AND c139 = 3 AND "
oTypeNumberColumn = "T.c045"
Case DocumentType.IncomingInvoice Case DocumentType.IncomingInvoice
oTypeConstraint = $"T.c137 = 3 AND c139 = 4 AND " oTypeConstraint = $"T.c137 = 3 AND c139 = 4 AND "
oTypeNumberColumn = "T.c055"
Case Else Case Else
oTypeConstraint = "" oTypeConstraint = ""
oTypeNumberColumn = ""
End Select End Select
Dim oAccountConstraint = "" Dim oAccountConstraint = ""
@ -789,11 +798,20 @@ Namespace Winline
End If End If
Dim oDocNumberConstraint = "" Dim oDocNumberConstraint = ""
If pOptions.DocNumberFrom <> String.Empty Then If pDocumentType <> DocumentType.Undefined Then
oDocNumberConstraint &= $"T.c044 >= '{pOptions.DocNumberFrom}' AND " If pOptions.DocNumberFrom <> String.Empty Then
End If oDocNumberConstraint &= $"{oTypeNumberColumn} >= '{pOptions.DocNumberFrom}' AND "
If pOptions.DocNumberTo <> String.Empty Then End If
oDocNumberConstraint &= $"T.c044 <= '{pOptions.DocNumberTo}' AND " If pOptions.DocNumberTo <> String.Empty Then
oDocNumberConstraint &= $"{oTypeNumberColumn} <= '{pOptions.DocNumberTo}' AND "
End If
Else
oDocNumberConstraint &= $"
(T.c043 >= '{pOptions.DocNumberFrom}' AND T.c043 <= '{pOptions.DocNumberTo}') OR
(T.c044 >= '{pOptions.DocNumberFrom}' AND T.c044 <= '{pOptions.DocNumberTo}') OR
(T.c045 >= '{pOptions.DocNumberFrom}' AND T.c045 <= '{pOptions.DocNumberTo}') OR
(T.c055 >= '{pOptions.DocNumberFrom}' AND T.c055 <= '{pOptions.DocNumberTo}')
"
End If End If
' Build the constraint so that the default view will show all documents that do not have an exported ' Build the constraint so that the default view will show all documents that do not have an exported

4
MultiTool.Form/frmExportMain.vb
View File

@ -213,6 +213,10 @@ Public Class frmExportMain
.Year = oYear .Year = oYear
}) })
If oDocuments Is Nothing Then
FormHelper.ShowWarning("There was an error in the Query.")
End If
GridControlDocuments.DataSource = oDocuments GridControlDocuments.DataSource = oDocuments
txtResults.Caption = String.Format("{0} Ergebnisse", oDocuments.Count) txtResults.Caption = String.Format("{0} Ergebnisse", oDocuments.Count)