set vouch_no as credit note no.

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

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

@@ -74,12 +74,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				{
 					tranType = checkNull(rs.getString("TRAN_TYPE"));	
 					siteCode = checkNull(rs.getString("SITE_CODE"));
-					invoiceId = checkNull(rs.getString("INVOICE_ID"));
-					tranIdCrn = checkNull(rs.getString("TRAN_ID__CRN"));
+					invoiceId = checkNull(rs.getString("INVOICE_ID"));					
 				}
 				System.out.println("TranType--------->>["+tranType+"]");
-				System.out.println("invoiceId--------->>["+invoiceId+"]");
-				System.out.println("TRAN_ID__CRN--------->>["+tranIdCrn+"]");
+				System.out.println("invoiceId--------->>["+invoiceId+"]");				
 				
 				//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start	
 				pstmt.close();
@@ -119,12 +117,22 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				System.out.println("After confirmSalesReturn---->>["+errString+"]");
 				sreturnDetail.put("TRAN_ID",tranId);
 				sreturnDetail.put("INVOICE_ID",invoiceId);
-				sreturnDetail.put("SITE_CODE",siteCode);
-				sreturnDetail.put("TRAN_ID__CRN",tranIdCrn);
+				sreturnDetail.put("SITE_CODE",siteCode);				
 				sreturnDetail.put("XTRA_PARAM",xtraParams);
 				System.out.println("After sreturnDetail---->>["+sreturnDetail+"]");				
 				if( (errString != null && errString.indexOf("VTSUCC1") > -1) )
 				{
+					sql="SELECT TRAN_ID__CRN FROM SRETURN WHERE TRAN_ID = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, tranId);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						tranIdCrn = checkNull(rs.getString("TRAN_ID__CRN"));
+					}
+					pstmt.close();
+					rs.close();
+					sreturnDetail.put("TRAN_ID__CRN",tranIdCrn);
 					//if tran_type is RP then we need create new sale order		
 					//otherwise transfer receivable to payable and make unconfirmed payment.
 					if("RP".equalsIgnoreCase(tranType))
@@ -585,7 +593,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				returnStr = "",siteCode = "",finEntity = "",sundryType = "",bankCode = "",payMode = "Q",saleOrder = "",
 				tranIdMisc = "",tranSer = "",sundryName = "",refNoInvoice = "",chgUser = "",chgTerm ="",refNo = "",
 				retString = "",despId = "",tokenInfo = "",vpsTxId = "";	
-		String tranId = "",invoiceId = "",xtraParams = "";
+		String tranId = "",invoiceId = "",xtraParams = "",tranIdCrn = "";
 		String acctCodeBal= "",cctrCodeBal= "",acctCodeBc= "",cctrCodeBc= "",acctCodeCf= "",acctCodeCfAp= "",modName = "",
 				cctrCodeCf = "",cctrCodeCfAp = "",currCodeBc = "",wfStatus = "",bankName = "",xmlOutString = "",currCodeS="";
 		double exchRate = 0,advAmt = 0,holdAmt = 0,adjAmt = 0,totAmt = 0,payAmt = 0,netPayable = 0,excRateBc = 0,mexrate = 0;
@@ -595,11 +603,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		FinCommon fin=new FinCommon();
 		try		
 		{
-			System.out.println("In generateAutoPayment :"+sReturnDetailsMap); 
+			System.out.println("In generateAutoPayment@@ :"+sReturnDetailsMap); 
 			tranId = sReturnDetailsMap.get("TRAN_ID");
 			invoiceId = sReturnDetailsMap.get("INVOICE_ID");					
 			xtraParams = sReturnDetailsMap.get("XTRA_PARAM");
-			
+			tranIdCrn = sReturnDetailsMap.get("TRAN_ID__CRN");
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");  			
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
 			currDate = new java.sql.Timestamp(System.currentTimeMillis());
@@ -615,7 +623,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 					+ "FROM MISC_PAYABLES WHERE REF_NO = ?";
 
 			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, invoiceId);
+			pstmt.setString(1, tranIdCrn);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
@@ -903,7 +911,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			xmlString.append("<tran_id><![CDATA[]]></tran_id>");
 			xmlString.append("<tran_ser><![CDATA["+checkNull(tranSer)+"]]></tran_ser>");
 			xmlString.append("<line_no><![CDATA["+lineNo+"]]></line_no>");							
-			xmlString.append("<vouch_no><![CDATA["+checkNull(invoiceId)+"]]></vouch_no>");
+			xmlString.append("<vouch_no><![CDATA["+checkNull(tranIdCrn)+"]]></vouch_no>");
 			xmlString.append("<vouch_date><![CDATA[" + checkNull(currDateStr) + "]]></vouch_date>");//Added by Jaimin 25/07/2007
 			xmlString.append("<net_amt><![CDATA["+payAmt+"]]></net_amt>");
 			xmlString.append("<pay_amt><![CDATA["+payAmt+"]]></pay_amt>");