louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBL updates

Browse Source
This commit is contained in:
Bharti
2024-11-21 15:39:00 +01:00
parent c30ce8d03a
commit 25392195f6
2 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
library/src/main/java/org/mustangproject/TradeParty.java
View File

@@ -89,26 +89,45 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
if ((deliveryLocation.item(deliveryLocationIndex).getAttributes() != null && if ((deliveryLocation.item(deliveryLocationIndex).getAttributes() != null &&
(deliveryLocation.item(deliveryLocationIndex).getAttributes().getNamedItem("schemeID") != null)) (deliveryLocation.item(deliveryLocationIndex).getAttributes().getNamedItem("schemeID") != null))
) { ) {
//SchemedID gid = new SchemedID().setScheme(nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID").getNodeValue()).setId(nodes.item(nodeIndex).getTextContent());
// addGlobalID(gid);
SchemedID sID = new SchemedID().setScheme(deliveryLocation.item(deliveryLocationIndex).getAttributes().getNamedItem("schemeID").getTextContent()); SchemedID sID = new SchemedID().setScheme(deliveryLocation.item(deliveryLocationIndex).getAttributes().getNamedItem("schemeID").getTextContent());
addGlobalID(sID); addGlobalID(sID);
//&& ((currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0110") && currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0100"))
} }
} }
if (deliveryLocation.item(deliveryLocationIndex).getLocalName().equals("Address")) { if (deliveryLocation.item(deliveryLocationIndex).getLocalName().equals("Address")) {
NodeList address = deliveryLocation.item(deliveryLocationIndex).getChildNodes(); NodeList address = currentNode.getChildNodes();
for (int addressIndex = 0; addressIndex < address.getLength(); addressIndex++) { for (int addressChildIndex = 0; addressChildIndex < address.getLength(); addressChildIndex++) {
if (address.item(addressIndex).getLocalName() != null) { if (address.item(addressChildIndex).getLocalName() != null) {
if (address.item(addressIndex).getLocalName().equals("StreetName")) { if (address.item(addressChildIndex).getLocalName().equals("StreetName")) {
//Node currentNode = partyID.item(partyIDIndex); setStreet(address.item(addressChildIndex).getTextContent());
setStreet(address.item(addressIndex).getTextContent()); }
if (address.item(addressChildIndex).getLocalName().equals("AdditionalStreetName")) {
setAdditionalAddress(address.item(addressChildIndex).getTextContent());
}
if (address.item(addressChildIndex).getLocalName().equals("CityName")) {
setLocation(address.item(addressChildIndex).getTextContent());
}
if (address.item(addressChildIndex).getLocalName().equals("PostalZone")) {
setZIP(address.item(addressChildIndex).getTextContent());
} }
} }
} }
} }
}
}
}
if (currentNode.getLocalName().equals("DeliveryParty")) {
NodeList deliveryParty = currentNode.getChildNodes();
for (int deliveryPartyChildIndex = 0; deliveryPartyChildIndex < deliveryParty.getLength(); deliveryPartyChildIndex++) {
if (deliveryParty.item(deliveryPartyChildIndex).getLocalName() != null) {
if (deliveryParty.item(deliveryPartyChildIndex).getLocalName().equals("PartyName")) {
NodeList partyName = deliveryParty.item(deliveryPartyChildIndex).getChildNodes();
for (int partyNameIndex = 0; partyNameIndex < partyName.getLength(); partyNameIndex++) {
if (partyName.item(partyNameIndex).getLocalName() != null) {
setName(partyName.item(partyNameIndex).getTextContent());
}
}
}
} }
} }
@@ -154,17 +173,20 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
if (partyID.item(partyIDIndex).getLocalName() != null) { if (partyID.item(partyIDIndex).getLocalName() != null) {
if (partyID.item(partyIDIndex).getLocalName().equals("ID")) { if (partyID.item(partyIDIndex).getLocalName().equals("ID")) {
Node currentNode = partyID.item(partyIDIndex); Node currentNode = partyID.item(partyIDIndex);
setID(currentNode.getTextContent());
if ((currentNode.getAttributes() != null && if ((currentNode.getAttributes() != null &&
(currentNode.getAttributes().getNamedItem("schemeID") != null)) (currentNode.getAttributes().getNamedItem("schemeID") != null))
) { ) {
//SchemedID gid = new SchemedID().setScheme(nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID").getNodeValue()).setId(nodes.item(nodeIndex).getTextContent()); //SchemedID gid = new SchemedID().setScheme(nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID").getNodeValue()).setId(nodes.item(nodeIndex).getTextContent());
// addGlobalID(gid); // addGlobalID(gid);
SchemedID sID = new SchemedID().setScheme(currentNode.getAttributes().getNamedItem("schemeID").getTextContent()); SchemedID sID = new SchemedID(currentNode.getAttributes().getNamedItem("schemeID").getTextContent(), currentNode.getTextContent());
addGlobalID(sID); addGlobalID(sID);
//&& ((currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0110") && currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0100")) //&& ((currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0110") && currentNode.getAttributes().getNamedItem("schemeID").getNodeValue().equals("0100"))
} }
else{
setID(currentNode.getTextContent());
}
} }
} }
@@ -297,35 +319,6 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
NodeList contact = nodes.item(nodeIndex).getChildNodes(); NodeList contact = nodes.item(nodeIndex).getChildNodes();
setContact(new Contact(contact)); setContact(new Contact(contact));
} }
if (currentUBLChild.equals("PostalTradeAddress")) {
NodeList postal = nodes.item(nodeIndex).getChildNodes();
for (int postalChildIndex = 0; postalChildIndex < postal.getLength(); postalChildIndex++) {
if (postal.item(postalChildIndex).getLocalName() != null) {
if (postal.item(postalChildIndex).getLocalName().equals("LineOne")) {
setStreet(postal.item(postalChildIndex).getTextContent());
}
if (postal.item(postalChildIndex).getLocalName().equals("LineTwo")) {
setAdditionalAddress(postal.item(postalChildIndex).getTextContent());
}
if (postal.item(postalChildIndex).getLocalName().equals("LineThree")) {
setAdditionalAddressExtension(postal.item(postalChildIndex).getTextContent());
}
if (postal.item(postalChildIndex).getLocalName().equals("CityName")) {
setLocation(postal.item(postalChildIndex).getTextContent());
}
if (postal.item(postalChildIndex).getLocalName().equals("PostcodeCode")) {
setZIP(postal.item(postalChildIndex).getTextContent());
}
if (postal.item(postalChildIndex).getLocalName().equals("CountryID")) {
setCountry(postal.item(postalChildIndex).getTextContent());
}
}
}
}
} }
} }
} }

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -295,7 +295,7 @@ public class ZUGFeRDInvoiceImporter {
XPath xpath = xpathFact.newXPath(); XPath xpath = xpathFact.newXPath();
XPathExpression xpr = xpath.compile("//*[local-name()=\"SellerTradeParty\"]|//*[local-name()=\"AccountingSupplierParty\"]/*"); XPathExpression xpr = xpath.compile("//*[local-name()=\"SellerTradeParty\"]|//*[local-name()=\"AccountingSupplierParty\"]/*");
NodeList SellerNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); NodeList SellerNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
XPathExpression shipEx = xpath.compile("//*[local-name()=\"ShipToTradeParty\"]|//*[local-name()=\"DeliveryLocation\"]"); XPathExpression shipEx = xpath.compile("//*[local-name()=\"ShipToTradeParty\"]|//*[local-name()=\"DeliveryLocation\"]|//*[local-name()=\"DeliveryParty\"]");
NodeList deliveryNodes = (NodeList) shipEx.evaluate(getDocument(), XPathConstants.NODESET); NodeList deliveryNodes = (NodeList) shipEx.evaluate(getDocument(), XPathConstants.NODESET);
if (deliveryNodes != null) { if (deliveryNodes != null) {
zpp.setDeliveryAddress(new TradeParty(deliveryNodes)); zpp.setDeliveryAddress(new TradeParty(deliveryNodes));