Commit 42190913 authored by steurwadkar's avatar steurwadkar

Changes made to handle set time stamp for eff from and valid upto in calculation method

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@176704 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 51aa5d9f
...@@ -156,9 +156,16 @@ public class PricelistGenEJB extends ValidatorEJB ...@@ -156,9 +156,16 @@ public class PricelistGenEJB extends ValidatorEJB
String var=eachSqlInput.toUpperCase().trim(); String var=eachSqlInput.toUpperCase().trim();
System.out.println("eachSqlInput.toUpperCase()["+var+"]"); System.out.println("eachSqlInput.toUpperCase()["+var+"]");
if(sqlInputDataMap.containsKey(var)) if(sqlInputDataMap.containsKey(var))
{
if( "EFF_FROM".equalsIgnoreCase(var) || "VALID_UPTO".equalsIgnoreCase(var) )
{
exprPsmt.setTimestamp(index++, getTimeStamp(sqlInputDataMap.get(var)));
}
else
{ {
exprPsmt.setString(index++, sqlInputDataMap.get(var)); exprPsmt.setString(index++, sqlInputDataMap.get(var));
} }
}
else else
{ {
exprPsmt.setString(index++, ""); exprPsmt.setString(index++, "");
......
...@@ -78,32 +78,26 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP ...@@ -78,32 +78,26 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
if(!"#text".equalsIgnoreCase(nodeName) && !"attribute".equals(nodeName)) if(!"#text".equalsIgnoreCase(nodeName) && !"attribute".equals(nodeName))
{ {
switch(nodeName) if("product_code".equalsIgnoreCase(nodeName))
{
case "product_code" :
{ {
if( eachDetail1Element.getFirstChild() != null) if( eachDetail1Element.getFirstChild() != null)
{ {
productCode = eachDetail1Element.getFirstChild().getNodeValue(); productCode = eachDetail1Element.getFirstChild().getNodeValue();
} }
break;
} }
case "eff_from" : else if("eff_from".equalsIgnoreCase(nodeName))
{ {
if( eachDetail1Element.getFirstChild() != null) if( eachDetail1Element.getFirstChild() != null)
{ {
effFrom = eachDetail1Element.getFirstChild().getNodeValue(); effFrom = eachDetail1Element.getFirstChild().getNodeValue();
} }
break;
} }
case "valid_upto" : else if("valid_upto".equalsIgnoreCase(nodeName))
{ {
if( eachDetail1Element.getFirstChild() != null) if( eachDetail1Element.getFirstChild() != null)
{ {
validUpto = eachDetail1Element.getFirstChild().getNodeValue(); validUpto = eachDetail1Element.getFirstChild().getNodeValue();
} }
break;
}
} }
} }
} }
...@@ -112,7 +106,7 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP ...@@ -112,7 +106,7 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
NodeList detail2NodeList = dom.getElementsByTagName("Detail2"); NodeList detail2NodeList = dom.getElementsByTagName("Detail2");
int detail2NodeListLen = detail2NodeList.getLength(); int detail2NodeListLen = detail2NodeList.getLength();
System.out.println("560101.detail2NodeListLen["+detail2NodeListLen+"]"); System.out.println("detail2NodeListLen["+detail2NodeListLen+"]");
for(int i=0; i<detail2NodeListLen; i++) for(int i=0; i<detail2NodeListLen; i++)
{ {
Node eachDetail2 = detail2NodeList.item(i); Node eachDetail2 = detail2NodeList.item(i);
...@@ -125,64 +119,54 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP ...@@ -125,64 +119,54 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
if(!"#text".equalsIgnoreCase(nodeName) && !"attribute".equals(nodeName)) if(!"#text".equalsIgnoreCase(nodeName) && !"attribute".equals(nodeName))
{ {
switch(nodeName) if("offer_free_qty".equalsIgnoreCase(nodeName))
{
case "offer_free_qty" :
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
freeQty = eachDetail2Element.getFirstChild().getNodeValue(); freeQty = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "offer_free_on" : else if("offer_free_on".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
freeOnQty = eachDetail2Element.getFirstChild().getNodeValue(); freeOnQty = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "disc_perc" : else if("disc_perc".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
discPerc = eachDetail2Element.getFirstChild().getNodeValue(); discPerc = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "price_list" : else if("price_list".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
priceListTar = eachDetail2Element.getFirstChild().getNodeValue(); priceListTar = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "price_list__parent" : else if("price_list__parent".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
priceListParent = eachDetail2Element.getFirstChild().getNodeValue(); priceListParent = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "list_type" : else if("list_type".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
listType = eachDetail2Element.getFirstChild().getNodeValue(); listType = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
} }
case "calc_method" : else if("calc_method".equalsIgnoreCase(nodeName))
{ {
if (eachDetail2Element.getFirstChild() != null) if (eachDetail2Element.getFirstChild() != null)
{ {
calcMethod = eachDetail2Element.getFirstChild().getNodeValue(); calcMethod = eachDetail2Element.getFirstChild().getNodeValue();
} }
break;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment