diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java
index b5bd30e..a18f938 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java
@@ -254,6 +254,21 @@ public class BusinessPartnerService {
return null;
}
+ /*
+ * Prüft ob es eine D oder K Nummer ist
+ */
+ public static boolean isCargosoftNumber(String str) {
+ if (str == null || str.isEmpty() || str.length() > 5) {
+ return false;
+ }
+ try {
+ Long.parseLong(str); // Versuche, den String in eine Zahl umzuwandeln
+ return true;
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ }
+
/**
* Diese Methode sucht Business Partner anhand einer Suchphrase
*
@@ -272,8 +287,15 @@ public class BusinessPartnerService {
// phrase = LuceneSearchService.escapeSearchTerm(phrase);
phrase = schemaService.normalizeSearchTerm(phrase);
String sQuery = "(type:\"workitem\" OR type:\"workitemarchive\") AND ($modelversion:businesspartner-*)";
- sQuery += " AND (" + phrase + "*)";
+ // ist nur eine Zahl eingegeben worden?
+ if (isCargosoftNumber(phrase)) {
+ sQuery += " AND ((k" + phrase + "*) OR (d" + phrase + "*) OR (bp" + phrase + "*))";
+
+ } else {
+ // normale Phrase
+ sQuery += " AND (" + phrase + "*)";
+ }
logger.finest("SearchQuery= " + sQuery);
searchResult = documentService.find(sQuery, MAX_SEARCH_RESULT, 0);
diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn b/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn
index e912747..9783ef1 100644
--- a/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn
+++ b/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn
@@ -151,6 +151,8 @@
IntermediateCatchEvent_62
gateway_Al0gGg
event_yPggjQ
+ event_EabQsQ
+ event_xe7WSQ
@@ -557,6 +559,7 @@ function oeffnefenster (url) {
SequenceFlow_88
sequenceFlow_W0RBHg
sequenceFlow_IZAXAQ
+ sequenceFlow_lu5Suw
@@ -4373,6 +4376,87 @@ if (b>0 && (a!=b) ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+false]]>
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+ sequenceFlow_lu5Suw
+ sequenceFlow_48XW7w
+
+
+
+
+ sequenceFlow_48XW7w
+
+
+
+
+
+
+
@@ -5402,6 +5486,26 @@ if (b>0 && (a!=b) ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+