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

Import UnitCode of basisQuantity to product.

Browse Source 
I don't know which node is the better one to read the unitCode:
grossPriceProductTradePrice or netPriceProductTradePrice. I have chosen the last one.
This commit is contained in:
Sebastian Sieber
2020-11-24 09:46:12 +01:00
parent cda1cd1c24
commit 1e78866040
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -788,8 +788,7 @@ public class ZUGFeRDImporter {
List<Node> nodeList = getLineItemNodes(); List<Node> nodeList = getLineItemNodes();
List<Item> lineItemList = new ArrayList<>(); List<Item> lineItemList = new ArrayList<>();
for (Node n: nodeList for (Node n: nodeList) {
) {
Item lineItem = new Item(null, null, null); Item lineItem = new Item(null, null, null);
lineItem.setProduct(new Product(null,null,null,null)); lineItem.setProduct(new Product(null,null,null,null));
@@ -803,13 +802,21 @@ public class ZUGFeRDImporter {
node = getNodeByName(nn.getChildNodes(), "ram:NetPriceProductTradePrice"); node = getNodeByName(nn.getChildNodes(), "ram:NetPriceProductTradePrice");
if (node != null) { if (node != null) {
node = getNodeByName(node.getChildNodes(), "ram:ChargeAmount"); NodeList tradeAgreementChildren = node.getChildNodes();
lineItem.setPrice(tryBigDecimal(getNodeValue(node))); node = getNodeByName(tradeAgreementChildren, "ram:ChargeAmount");
lineItem.setPrice(tryBigDecimal(getNodeValue(node)));
node = getNodeByName(tradeAgreementChildren, "ram:BasisQuantity");
if(node.getAttributes()!=null) {
Node unitCodeAttribute = node.getAttributes().getNamedItem("unitCode");
if(unitCodeAttribute != null) {
lineItem.getProduct().setUnit(unitCodeAttribute.getNodeValue());
}
}
} }
node = getNodeByName(nn.getChildNodes(), "ram:GrossPriceProductTradePrice"); node = getNodeByName(nn.getChildNodes(), "ram:GrossPriceProductTradePrice");
if (node != null) { if (node != null) {
node = getNodeByName(node.getChildNodes(), "ram:ChargeAmount"); node = getNodeByName(node.getChildNodes(), "ram:ChargeAmount");
lineItem.setGrossPrice(tryBigDecimal(getNodeValue(node))); lineItem.setGrossPrice(tryBigDecimal(getNodeValue(node)));
} }
break; break;