Changes in SalesReturnConf.java for DDUK

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

webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java

@@ -2536,7 +2536,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		PreparedStatement pstmt=null;
 		String sql="",sql1="",sql2="",formatCode = "",formatCodeCSR = "",mailFlag = "",attachFlag="",attachPath = "", sendTo="", sendToCSR="",
 		copyTo="", copyToCSR="",bccTo="", bccToCSR="",subject="", subjectCSR="",bodyText="", bodyTextCSR="",emailAdd="",custName="",refundAmount="",
-		saleOrder="",currCode="",itemDescr="",loginSite="",headImagePath = "",footImagePath = "" ;
+		saleOrder="",currCode="",itemDescr="",loginSite="",headImagePath = "",footImagePath = "",siteCodeforSorder = "" ;
 
 		EMail email = new EMail();
 		CommonWmsUtil commonWmsUtil = CommonWmsUtil.getInstance();
@@ -2550,9 +2550,25 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			mailFlag = checkNull(discommon.getDisparams("999999","DDWMS_MAIL_FLAG",conn));
 			attachFlag= checkNull(discommon.getDisparams("999999","DDWMS_ATTACHMENT_FLAG",conn));
 			System.out.println("mailFlag-------"+mailFlag);
-			formatCode = loginSite+'_'+tranType;                     // Sending mail for customer.
-			formatCodeCSR = loginSite+'_'+tranType+'_'+"CSR";        // Sending mail for CSR team.
 			
+			/*formatCode = loginSite+'_'+tranType;                     // Sending mail for customer.
+			formatCodeCSR = loginSite+'_'+tranType+'_'+"CSR";*/        // Sending mail for CSR team.
+			sql = "SELECT S.SITE_CODE FROM SORDER S, INVOICE I WHERE S.SALE_ORDER = I.SALE_ORDER AND I.INVOICE_ID = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, invoiceId);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				siteCodeforSorder = rs.getString(1);
+			}
+			rs.close();
+			pstmt.close();
+			rs=null;
+			pstmt=null;
+			System.out.println("Site Code for Sale Order["+siteCodeforSorder+"]");
+			
+			formatCode = siteCodeforSorder+'_'+tranType;                     
+			formatCodeCSR = siteCodeforSorder+'_'+tranType+'_'+"CSR";
 			
 			System.out.println("formatCode=======["+formatCode+"]");	
 			System.out.println("formatCode=======["+formatCodeCSR+"]");