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

model fix

Browse source
This commit is contained in:
Ralph Soika 2024-10-23 14:03:12 +02:00
parent 7217b76b43
commit 3f05aa98c7
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/xml/CargosoftXMLInvoiceImportService.java
View file

@ -702,7 +702,8 @@ public class CargosoftXMLInvoiceImportService {
childItemCol.appendItemValue("BillingText", val);
// handelt es sich um eine ATC Nummer?
// Änderung 22.10.2024 - jetzt auch auf 24DE prüfen
if (val.startsWith("ATC") || val.startsWith("24DE")) {
if (val.startsWith("ATC") || val.startsWith("24DE") || val.startsWith("25DE")
|| val.startsWith("26DE")) {
childItemCol.setItemValue("atc.number", val);
}
}

19
workflow/dwc/rechnungseingang-dwc-1.0.0.bpmn
View file

@ -753,7 +753,6 @@ var b= workitem.get("order.total")[0];
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[<item name="comment" ignore="true"/>
<item name="space">Controlling</item>
<ml-config name="status">suggest</ml-config>
<validation name="required">false</validation>
<taxonomy name="buchhaltung">
@ -4895,13 +4894,13 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_1" id="BPMNShape_ExclusiveGateway_1" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="220.0" y="180.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_60" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="187.0" y="219.0"/>
<dc:Bounds height="20.0" width="100.0" x="195.0" y="233.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_2" id="BPMNShape_EventBasedGateway_2" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="690.0" y="1020.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_65" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="653.0" y="1054.0"/>
<dc:Bounds height="20.0" width="100.0" x="665.0" y="1073.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_TextAnnotation_1">
@ -4937,7 +4936,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_4" id="BPMNShape_EventBasedGateway_4" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="1000.0" y="1780.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_80" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="968.0" y="1819.0"/>
<dc:Bounds height="20.0" width="100.0" x="975.0" y="1833.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_16" id="BPMNShape_IntermediateCatchEvent_26">
@ -4976,7 +4975,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_6" id="BPMNShape_ExclusiveGateway_6" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="1050.0" y="1020.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_32" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="1018.0" y="1054.0"/>
<dc:Bounds height="20.0" width="100.0" x="1025.0" y="1073.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_3" id="BPMNShape_IntermediateCatchEvent_5">
@ -4991,7 +4990,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_2" id="BPMNShape_ExclusiveGateway_2" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="1750.0" y="1780.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_11" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="1718.0" y="1819.0"/>
<dc:Bounds height="20.0" width="100.0" x="1725.0" y="1833.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_4" id="BPMNShape_IntermediateCatchEvent_9">
@ -5090,7 +5089,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_1" id="BPMNShape_EventBasedGateway_1" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="460.0" y="180.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_106" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="430.0" y="219.0"/>
<dc:Bounds height="20.0" width="100.0" x="435.0" y="233.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_19" id="BPMNShape_IntermediateCatchEvent_22">
@ -5276,7 +5275,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_3" id="BPMNShape_EventBasedGateway_3" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="790.0" y="270.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_189" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="756.0" y="306.0"/>
<dc:Bounds height="20.0" width="100.0" x="765.0" y="323.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_41" id="BPMNShape_IntermediateCatchEvent_46">
@ -5339,7 +5338,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_5" id="BPMNShape_ExclusiveGateway_5" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="1330.0" y="1780.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_40" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="1293.0" y="1819.0"/>
<dc:Bounds height="20.0" width="100.0" x="1305.0" y="1833.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="TextAnnotation_5" id="BPMNShape_TextAnnotation_6">
@ -5381,7 +5380,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_10" id="BPMNShape_ExclusiveGateway_10" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="380.0" y="840.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_284">
<dc:Bounds height="20.0" width="100.0" x="345.0" y="875.0"/>
<dc:Bounds height="20.0" width="100.0" x="355.0" y="893.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_65" id="BPMNShape_IntermediateCatchEvent_70">

22
workflow/dwc/rechnungseingang-sachrechnung-dwc-1.0.0.bpmn
View file

@ -4055,7 +4055,7 @@ result.isValid=true;
<anonymised>false</anonymised>
</taxonomy>
<model>
<version>rechnungseingang-de-1.2</version>
<version>rechnungseingang-dwc-1.0</version>
<task>5000</task>
<event>990</event>
</model>]]></imixs:value>
@ -4374,13 +4374,13 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_1" id="BPMNShape_ExclusiveGateway_1" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="288.0" y="81.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_60" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="256.0" y="120.0"/>
<dc:Bounds height="20.0" width="100.0" x="263.0" y="134.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_2" id="BPMNShape_EventBasedGateway_2" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="579.0" y="349.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_65" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="547.0" y="388.0"/>
<dc:Bounds height="20.0" width="100.0" x="554.0" y="402.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_TextAnnotation_1">
@ -4455,7 +4455,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_1" id="BPMNShape_EventBasedGateway_1" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="579.0" y="81.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_106" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="547.0" y="120.0"/>
<dc:Bounds height="20.0" width="100.0" x="554.0" y="134.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_19" id="BPMNShape_IntermediateCatchEvent_22">
@ -4509,7 +4509,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_4" id="BPMNShape_EventBasedGateway_4" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="705.0" y="703.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_16" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="673.0" y="742.0"/>
<dc:Bounds height="20.0" width="100.0" x="680.0" y="756.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_10" id="BPMNShape_IntermediateCatchEvent_15">
@ -4551,7 +4551,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_2" id="BPMNShape_ExclusiveGateway_2" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="1199.0" y="703.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_44" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="1167.0" y="742.0"/>
<dc:Bounds height="20.0" width="100.0" x="1174.0" y="756.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="Task_10" id="BPMNShape_Task_11">
@ -4617,7 +4617,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_3" id="BPMNShape_ExclusiveGateway_3" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="579.0" y="271.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_99" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="549.0" y="311.0"/>
<dc:Bounds height="20.0" width="100.0" x="554.0" y="324.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_9" id="BPMNShape_IntermediateCatchEvent_10">
@ -4710,7 +4710,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="EventBasedGateway_3" id="BPMNShape_EventBasedGateway_3" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="929.0" y="349.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_144" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="897.0" y="388.0"/>
<dc:Bounds height="20.0" width="100.0" x="904.0" y="402.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_33" id="BPMNShape_IntermediateCatchEvent_32">
@ -4737,7 +4737,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<bpmndi:BPMNShape bpmnElement="ExclusiveGateway_4" id="BPMNShape_ExclusiveGateway_4" isMarkerVisible="true">
<dc:Bounds height="50.0" width="50.0" x="579.0" y="583.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_156" labelStyle="BPMNLabelStyle_1">
<dc:Bounds height="20.0" width="100.0" x="547.0" y="622.0"/>
<dc:Bounds height="20.0" width="100.0" x="554.0" y="636.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateThrowEvent_6" id="BPMNShape_IntermediateThrowEvent_6">
@ -5320,8 +5320,8 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_83" id="BPMNEdge_SequenceFlow_84" sourceElement="BPMNShape_EventBasedGateway_1" targetElement="BPMNShape_IntermediateCatchEvent_43">
<bpmndi:BPMNLabel id="BPMNLabel_172"/>
<di:waypoint x="604.0" y="131.0"/>
<di:waypoint x="604.0" y="155.0"/>
<di:waypoint x="619.0" y="116.0"/>
<di:waypoint x="619.0" y="155.0"/>
<di:waypoint x="641.0" y="155.0"/>
<di:waypoint x="641.0" y="179.0"/>
<di:waypoint x="679.0" y="179.0"/>