Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update bp

Browse source
This commit is contained in:
Ralph Soika 2025-07-24 15:07:33 +02:00
parent fd668439c8
commit 259373053f
2 changed files with 127 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/BusinessPartnerService.java
View file

@ -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);

104
workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn
View file

@ -151,6 +151,8 @@
<bpmn2:flowNodeRef>IntermediateCatchEvent_62</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>gateway_Al0gGg</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>event_yPggjQ</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>event_EabQsQ</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>event_xe7WSQ</bpmn2:flowNodeRef>
</bpmn2:lane>
</bpmn2:laneSet>
<bpmn2:task id="Task_5000" imixs:processid="5300" name="Approval">
@ -557,6 +559,7 @@ function oeffnefenster (url) {
<bpmn2:outgoing>SequenceFlow_88</bpmn2:outgoing>
<bpmn2:incoming>sequenceFlow_W0RBHg</bpmn2:incoming>
<bpmn2:incoming>sequenceFlow_IZAXAQ</bpmn2:incoming>
<bpmn2:outgoing>sequenceFlow_lu5Suw</bpmn2:outgoing>
</bpmn2:task>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_15" imixs:activityid="90" name="Block payment">
<bpmn2:extensionElements>
@ -4373,6 +4376,87 @@ if (b>0 && (a!=b) ) {
<bpmn2:sequenceFlow id="sequenceFlow_OKqquA" sourceRef="event_KyRgng" targetRef="ExclusiveGateway_3">
<bpmn2:documentation id="documentation_5QrY0w"/>
</bpmn2:sequenceFlow>
<bpmn2:intermediateCatchEvent id="event_EabQsQ" imixs:activityid="11" name="Reject">
<bpmn2:extensionElements>
<imixs:item name="keylogtimeformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value>
</imixs:item>
<imixs:item name="keyarchive" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="txtmailsubject" type="xs:string">
<imixs:value/>
</imixs:item>
<imixs:item name="keyaccessmode" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="keyscheduledactivity" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfmailbody" type="xs:string">
<imixs:value/>
</imixs:item>
<imixs:item name="keyversion" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="keyaddwritefields" type="xs:string">
<imixs:value><![CDATA[$creator]]></imixs:value>
<imixs:value><![CDATA[$editor]]></imixs:value>
<imixs:value><![CDATA[process.manager]]></imixs:value>
</imixs:item>
<imixs:item name="numnextactivityid" type="xs:int">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="keyfollowup" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value>
</imixs:item>
<imixs:item name="keypublicresult" type="xs:string">
<imixs:value><![CDATA[1]]></imixs:value>
</imixs:item>
<imixs:item name="keylogdateformat" type="xs:string">
<imixs:value><![CDATA[2]]></imixs:value>
</imixs:item>
<imixs:item name="keyownershipfields" type="xs:string">
<imixs:value><![CDATA[$editor]]></imixs:value>
</imixs:item>
<imixs:item name="txtnextprocesstree" type="xs:string">
<imixs:value/>
</imixs:item>
<imixs:item name="numnextid" type="xs:int">
<imixs:value><![CDATA[5005]]></imixs:value>
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<item name="comment" ignore="true"/>
<validation name="required">false</validation>]]></imixs:value>
</imixs:item>
<imixs:item name="txtname" type="xs:string">
<imixs:value><![CDATA[Save]]></imixs:value>
</imixs:item>
<imixs:item name="keyownershipmode" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfresultlog" type="xs:string">
<imixs:value><![CDATA[Rejected]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>false</imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:documentation id="documentation_CcG8Hg"><![CDATA[Caching]]></bpmn2:documentation>
<bpmn2:incoming>sequenceFlow_lu5Suw</bpmn2:incoming>
<bpmn2:outgoing>sequenceFlow_48XW7w</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent>
<bpmn2:intermediateThrowEvent id="event_xe7WSQ" name="ABLEHNEN">
<bpmn2:linkEventDefinition id="linkEventDefinition_cQiCJA" name="Link Event Definition 5"/>
<bpmn2:documentation id="documentation_ew08aQ"/>
<bpmn2:incoming>sequenceFlow_48XW7w</bpmn2:incoming>
</bpmn2:intermediateThrowEvent>
<bpmn2:sequenceFlow id="sequenceFlow_lu5Suw" sourceRef="Task_3" targetRef="event_EabQsQ">
<bpmn2:documentation id="documentation_c9CGEw"/>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="sequenceFlow_48XW7w" sourceRef="event_EabQsQ" targetRef="event_xe7WSQ">
<bpmn2:documentation id="documentation_CCcQ8A"/>
</bpmn2:sequenceFlow>
</bpmn2:process>
<bpmn2:process id="process_2" name="Invoice receipt" processType="Public">
<bpmn2:documentation id="documentation_yUm3kA"/>
@ -5402,6 +5486,26 @@ if (b>0 && (a!=b) ) {
<di:waypoint x="1425.0" y="804.0"/>
<di:waypoint x="1425.0" y="850.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape bpmnElement="event_EabQsQ" id="BPMNShape_B9D0uQ">
<dc:Bounds height="36.0" width="36.0" x="1317.0" y="1417.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_KvjkAQ">
<dc:Bounds height="20.0" width="100.0" x="1285.0" y="1456.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="event_xe7WSQ" id="BPMNShape_XvsAEg">
<dc:Bounds height="36.0" width="36.0" x="1317.0" y="1327.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_xu0q3Q">
<dc:Bounds height="20.0" width="100.0" x="1285.0" y="1366.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_lu5Suw" id="BPMNEdge_pMNpig" sourceElement="BPMNShape_Task_9" targetElement="BPMNShape_B9D0uQ">
<di:waypoint x="1335.0" y="1590.0"/>
<di:waypoint x="1335.0" y="1453.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sequenceFlow_48XW7w" id="BPMNEdge_SFaKBQ" sourceElement="BPMNShape_B9D0uQ" targetElement="BPMNShape_XvsAEg">
<di:waypoint x="1335.0" y="1417.0"/>
<di:waypoint x="1335.0" y="1363.0"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>