assign site code from dom in loginSiteCode if it is null

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

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

@@ -7,7 +7,6 @@
 ********************************************************/
 
 package ibase.webitm.ejb.dis;
-
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.sys.SysCommon;
 import ibase.system.config.ConnDriver;
@@ -113,6 +112,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 	}
 	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams)  throws RemoteException,ITMException
 	{
+		System.out.println("Val xmlString*** :: " + xmlString );
+		System.out.println("Val xmlString1******* :: " + xmlString1 );
+		System.out.println("Val xmlString2 ****:: " + xmlString2 );
 		Document dom = null;
 		Document dom1 = null;
 		Document dom2 = null;
@@ -353,6 +355,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		double lcQty = 0.0;
 		HashMap infoMap = null;
 		String valStr = null;
+		String siteCode3 = null;
 		try
 		{
 			ITMDBAccessEJB dbEjb = new ITMDBAccessEJB();
@@ -395,6 +398,11 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					if (currentColumn.trim().equals("itm_default") )			
 					{	
 						loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
+						siteCode3  = getAbsString(genericUtility.getColumnValue("site_code",dom));	  //added by ritesh on 09/07/13 start
+						if(loginSiteCode == null || loginSiteCode.trim().length() <= 0)						
+						{
+							loginSiteCode = siteCode3;
+						}																					//added by ritesh on 09/07/13 end												
 						//get login site description
 						sql = " select descr from site where site_code = ? ";
 						pstmt= conn.prepareStatement( sql );
@@ -410,9 +418,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						rs = null;
 						valueXmlString.append("<site_code protect =\"1\">").append("<![CDATA["+loginSiteCode.trim()+"]]>").append("</site_code>");
 						valueXmlString.append("<site_descr>").append("<![CDATA["+loginSiteDescr.trim()+"]]>").append("</site_descr>");
-						// 11/05/13 manoharan site_code__dlv set as site_code and made editable
-						valueXmlString.append("<site_code__dlv protect =\"0\">").append("<![CDATA["+loginSiteCode.trim()+"]]>").append("</site_code__dlv>");
-						// end 11/05/13 manoharan site_code__dlv set as site_code and made editable
+						
 						String currAppdate ="";
 						java.sql.Timestamp currDate = null;
 						currDate = new java.sql.Timestamp(System.currentTimeMillis()) ;
@@ -5271,7 +5277,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								}
 							}
 						}
-						if( childNodeName.equalsIgnoreCase( "site_code" ) || childNodeName.equalsIgnoreCase( "site_code__dlv" ))
+						if( childNodeName.equalsIgnoreCase( "site_code" ) )
 						{
 							mVal = genericUtility.getColumnValue( childNodeName, dom ); //dw_edit.GetItemString(dw_edit.GetRow(),fldname)           
 							 
@@ -8304,7 +8310,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		String sqlStr = "select ( case when t.qc_rqd <> ' ' then t.qc_rqd else t.QC_REQD end) QC_REQD "
 						+" from ( select ( case when s.QC_REQD is null then ' ' else s.QC_REQD end ) qc_rqd, m.QC_REQD "
 						+" 	from siteitem s, item m " 
-						+" where s.site_code = ? "
+						+"  where s.site_code = ? "
 						+"	and s.item_code = ? "
 						+"	and s.item_code = m.item_code) t ";