Changes in SalesReturnConf.java for DDUK

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

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

@@ -2495,7 +2495,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		StringBuffer commInfo = new StringBuffer();
 		ResultSet rs=null;
 		PreparedStatement pstmt=null;
-		String sql="",sql1="",sql2="",formatCode = "",mailFlag = "",attachFlag="",attachPath = "", sendTo="",copyTo="",bccTo="",subject="",bodyText="",emailAdd="",custName="",refundAmount="",
+		String sql="",sql1="",sql2="",formatCode = "",formatCodeCSR = "",mailFlag = "",attachFlag="",attachPath = "", sendTo="",copyTo="",bccTo="",subject="",bodyText="",emailAdd="",custName="",refundAmount="",
 		saleOrder="",currCode="",itemDescr="",loginSite="";
 					
 		EMail email = new EMail();
@@ -2508,9 +2508,12 @@ 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;
+			formatCode = loginSite+'_'+tranType;                     // Sending mail for customer.
+			formatCodeCSR = loginSite+'_'+tranType+'_'+"CSR";        // Sending mail for CSR team.
+			
 			System.out.println("formatCode=======["+formatCode+"]");	
-			if("Y".equalsIgnoreCase(mailFlag) && formatCode != null && formatCode.length() > 0 )
+			System.out.println("formatCode=======["+formatCodeCSR+"]");	
+			if("Y".equalsIgnoreCase(mailFlag) && formatCode!= null && formatCodeCSR!= null && formatCode.length() > 0 && formatCodeCSR.length() > 0 )
 			{
 				sql="select send_to,copy_to,blind_copy,subject,body_text from mail_format where format_code = ?";
 				pstmt = conn.prepareStatement(sql);
@@ -2531,6 +2534,28 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				System.out.println("bodyText-------"+bodyText);
 				System.out.println("formatCode-------"+formatCode);
 				
+				//manish
+				System.out.println("----------customer relationship-----------");
+				sql="select send_to,copy_to,blind_copy,subject,body_text from mail_format where format_code = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, formatCodeCSR);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					sendTo = checkNull(rs.getString(1));
+					copyTo = checkNull(rs.getString(2));
+					bccTo = checkNull(rs.getString(3));
+					subject = checkNull(rs.getString(4));
+					bodyText = checkNull(rs.getString(5));
+				}
+				rs.close();
+				pstmt.close();
+				rs=null;
+				pstmt=null;
+				System.out.println("bodyText-------"+bodyText);
+				System.out.println("formatCode-------"+formatCodeCSR);
+				//manish
+				
 				sql1 = "SELECT C.EMAIL_ADDR, C.CUST_NAME, I.INV_AMT, I.SALE_ORDER,  I.CURR_CODE FROM CUSTOMER C, INVOICE I" +
 				" WHERE C.CUST_CODE = I.CUST_CODE AND I.INVOICE_ID = ? ";
 				pstmt = conn.prepareStatement(sql1);