Commit d050a129 authored by smestry's avatar smestry

Updated the java file to set the discount in SO and PO Wizard.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104454 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5064523f
...@@ -605,7 +605,7 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB ...@@ -605,7 +605,7 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
int noArt = 0; int noArt = 0;
String lineNoOrd = "",formNo = ""; String lineNoOrd = "",formNo = "", discount = "";
String lotNo = ""; String lotNo = "";
int domID = 0; int domID = 0;
...@@ -708,6 +708,13 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB ...@@ -708,6 +708,13 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
} }
//Changed by Manish on 02/02/16 for getting proper tax[end] //Changed by Manish on 02/02/16 for getting proper tax[end]
// Added by Sneha on 20-01-2017, to add discount field [Start]
else if(childNode != null && "discount".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
discount = childNode.getFirstChild().getNodeValue();
}
// Added by Sneha on 20-01-2017, to add discount field [End]
} }
domID++; domID++;
...@@ -780,7 +787,11 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB ...@@ -780,7 +787,11 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
xmlString.append("<rate><![CDATA[").append( rateWithOutTax ).append("]]></rate>"); xmlString.append("<rate><![CDATA[").append( rateWithOutTax ).append("]]></rate>");
//Changed by Samadhan on 25/06/2015 D15CKAT025 End //Changed by Samadhan on 25/06/2015 D15CKAT025 End
xmlString.append("<discount><![CDATA[0]]></discount>"); // Added by Sneha on 20-01-2017, to add discount field [Start]
//xmlString.append("<discount><![CDATA[0]]></discount>");
xmlString.append("<discount><![CDATA[").append(discount).append("]]></discount>");
// Added by Sneha on 20-01-2017, to add discount field [End]
// xmlString.append("<tax_amt><![CDATA[0]]></tax_amt>"); // xmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
// xmlString.append("<tot_amt><![CDATA[0]]></tot_amt>"); // xmlString.append("<tot_amt><![CDATA[0]]></tot_amt>");
xmlString.append("<dlv_qty><![CDATA[0]]></dlv_qty>"); xmlString.append("<dlv_qty><![CDATA[0]]></dlv_qty>");
......
...@@ -421,7 +421,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -421,7 +421,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
StringBuffer xmlStringDet = new StringBuffer(); StringBuffer xmlStringDet = new StringBuffer();
String lineNoCntr = "",lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = ""; String lineNoCntr = "",lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = "";
int domID = 0; int domID = 0;
double quantity = 0,rate = 0,rateStd = 0,rateClg = 0; double quantity = 0,rate = 0,rateStd = 0,rateClg = 0, discount = 0;
NodeList detail3NodeList =dom.getElementsByTagName("Detail3"); NodeList detail3NodeList =dom.getElementsByTagName("Detail3");
int detail3NodeListlen = detail3NodeList.getLength(); int detail3NodeListlen = detail3NodeList.getLength();
...@@ -499,6 +499,12 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -499,6 +499,12 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
{ {
lineNoCntr = checkNullAndTrim(childNode.getFirstChild().getNodeValue()); lineNoCntr = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
} }
// Added by Sneha on 20-01-2017, to add discount field [Start]
else if(childNode != null && "discount".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
discount = Double.parseDouble(childNode.getFirstChild().getNodeValue());
}
// Added by Sneha on 20-01-2017, to add discount field [End]
} }
domID++; domID++;
...@@ -520,6 +526,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -520,6 +526,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringDet.append("<unit__std><![CDATA[").append(unit).append("]]></unit__std>"); xmlStringDet.append("<unit__std><![CDATA[").append(unit).append("]]></unit__std>");
xmlStringDet.append("<item_flg><![CDATA[").append(itmFlag).append("]]></item_flg>\r\n"); xmlStringDet.append("<item_flg><![CDATA[").append(itmFlag).append("]]></item_flg>\r\n");
xmlStringDet.append("<rate><![CDATA[").append(rate).append("]]></rate>"); xmlStringDet.append("<rate><![CDATA[").append(rate).append("]]></rate>");
xmlStringDet.append("<discount><![CDATA[").append(discount).append("]]></discount>"); // Added by Sneha on 20-01-2017, to add discount field
xmlStringDet.append("<rate__std><![CDATA[").append(rateStd).append("]]></rate__std>"); xmlStringDet.append("<rate__std><![CDATA[").append(rateStd).append("]]></rate__std>");
xmlStringDet.append("<rate__clg><![CDATA[").append(rateClg).append("]]></rate__clg>"); xmlStringDet.append("<rate__clg><![CDATA[").append(rateClg).append("]]></rate__clg>");
xmlStringDet.append("<rate__stduom><![CDATA[").append(rate).append("]]></rate__stduom>"); xmlStringDet.append("<rate__stduom><![CDATA[").append(rate).append("]]></rate__stduom>");
......
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