change in Item change : set rate__stduom and rate__clg

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93519 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SReturnForm.java

@@ -1182,6 +1182,13 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						{
 							valueXmlString.append("<rate protect =\"0\">").append("<![CDATA["+ (sRate == null || sRate.trim().length() == 0 ? "0" : sRate ) + "]]>").append("</rate>");
 							setNodeValue( dom, "rate", sRate );
+							//added by kunal on 20/AUG/13 called rate item change
+							reStr = itemChanged(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
+							pos = reStr.indexOf("<Detail2>");
+							reStr = reStr.substring(pos + 9);
+							pos = reStr.indexOf("</Detail2>");
+							reStr = reStr.substring(0,pos);
+							valueXmlString.append(reStr);
 						}
 						else
 						{
@@ -1198,13 +1205,28 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							{
 								valueXmlString.append("<rate protect =\"1\">").append("<![CDATA[" + rate + "]]>").append("</rate>");
 								setNodeValue( dom, "rate", rate );
+								//added by kunal on 20/AUG/13 called rate item change
+								reStr = itemChanged(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
+								pos = reStr.indexOf("<Detail2>");
+								reStr = reStr.substring(pos + 9);
+								pos = reStr.indexOf("</Detail2>");
+								reStr = reStr.substring(0,pos);
+								valueXmlString.append(reStr);
 							}
 							else
 							{
 								valueXmlString.append("<rate protect =\"0\">").append("<![CDATA[" + rate + "]]>").append("</rate>");
 								setNodeValue( dom, "rate", rate );
+								//added by kunal on 20/AUG/13 called rate item change
+								reStr = itemChanged(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
+								pos = reStr.indexOf("<Detail2>");
+								reStr = reStr.substring(pos + 9);
+								pos = reStr.indexOf("</Detail2>");
+								reStr = reStr.substring(0,pos);
+								valueXmlString.append(reStr);
 							}
 						}
+						/* comment by kunal on 20/AUG/13
 						varValue = 	genericUtility.getColumnValue("conv__rtuom_stduom", dom);
 						varValue = varValue == null ?"0" : varValue.trim();
 						if (varValue == null || Double.parseDouble(varValue) <= 0)
@@ -1215,6 +1237,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							valueXmlString.append("<rate__stduom>").append("<![CDATA[" + rate + "]]>").append("</rate__stduom>");
 							setNodeValue( dom, "rate__stduom", rate );
 						}
+						*/
 						invoiceId = 	genericUtility.getColumnValue("invoice_id", dom);
 						retReplFlag = 	genericUtility.getColumnValue("ret_rep_flag", dom);
 						if ( !"P".equals( retReplFlag ) )
@@ -1391,6 +1414,8 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						}
 						rateStdUom = Double.parseDouble(sRate);
 						*/
+						//change done by kunal on 20/AUG/13 RATE CLAG NOT GET FROM DOM
+						/*
 						sRate = genericUtility.getColumnValue("rate__clg", dom);
 						if (sRate == null || sRate.equals("null"))
 						{
@@ -1398,10 +1423,17 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						}
 						
 						rateClg = Double.parseDouble(sRate);
+						*/
 						if (priceListClg == null || priceListClg.trim().length() == 0)
 						{
+							/*
 							valueXmlString.append("<rate__clg protect =\"0\">").append("<![CDATA[" + sRate + "]]>").append("</rate__clg>");
 							setNodeValue( dom, "rate__clg", sRate );
+							*/
+							//	change by kunal on 20/AUG/13
+							rateClg = 0;
+							valueXmlString.append("<rate__clg protect =\"0\">").append("<![CDATA[" + rateClg + "]]>").append("</rate__clg>");
+							setNodeValue( dom, "rate__clg", rateClg );
 						}
 						else
 						{
@@ -1409,11 +1441,15 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							if (!"B".equals(listType) && !"F".equals(listType))
 							{
 								
-								if (rateClg <= 0 && priceListClg.trim().length() > 0)
+								tranDate = tranDate == null ? ( new Timestamp( System.currentTimeMillis() ) ).toString() : tranDate;								
+								rateClg = distCommon.pickRate(priceListClg,tranDate,itemCode," ","L",qtyStdUom, conn);
+								System.out.println("rateClg from pick rate="+rateClg);
+								//change by kunal on 20/AUG/13 get rateClg from pick rate method  
+								/*if (rateClg <= 0 && priceListClg.trim().length() > 0)
 								{
 									tranDate = tranDate == null ? ( new Timestamp( System.currentTimeMillis() ) ).toString() : tranDate;								
 									rateClg = distCommon.pickRate(priceListClg,tranDate,itemCode," ","L",qtyStdUom, conn);
-								}
+								}*/
 							}
 						}
 						if (rateClg <= 0 && rate > 0)