change ref_no and tranSer

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

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

@@ -41,7 +41,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 
 		Connection conn = null;
 		String errString = "",retStr = "",sql = "",tranType = "",siteCode = "",sorderRtrStr = "",
-				refundReturnStr = "",invoiceId = "";	
+				refundReturnStr = "",invoiceId = "",tranIdCrn = "";	
 		String finparamCcterm = "", tranIdPayment = ""; //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
 		CommonWmsUtil common = new  CommonWmsUtil(); //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
 		
@@ -57,7 +57,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		String saleOrder="";
 		String ptcn="";
 		//Changed by samadhan on 16/6/2015 for status tracking update in magento system. end						
-				
+		Map<String,String> sreturnDetail = new HashMap<String,String>();		
 		try
 		{
 			conn = connDriver.getConnectDB("DriverITM");
@@ -66,7 +66,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			if(tranId.length() > 0)
 			{
 				//Check transaction type RF(Refund) or RP (Replacement)
-				sql = "SELECT TRAN_TYPE,SITE_CODE,INVOICE_ID FROM SRETURN WHERE TRAN_ID = ? ";
+				sql = "SELECT TRAN_TYPE,SITE_CODE,INVOICE_ID,TRAN_ID__CRN FROM SRETURN WHERE TRAN_ID = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,tranId);
 				rs = pstmt.executeQuery();
@@ -75,9 +75,11 @@ 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"));
 				}
 				System.out.println("TranType--------->>["+tranType+"]");
 				System.out.println("invoiceId--------->>["+invoiceId+"]");
+				System.out.println("TRAN_ID__CRN--------->>["+tranIdCrn+"]");
 				
 				//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start	
 				pstmt.close();
@@ -114,15 +116,20 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				rs.close();
 				//Changed by samadhan on 16/6/2015 for status tracking update in magento system. end	
 				errString = confirmSalesReturn("salesreturn_retn", tranId, xtraParams, "", conn);
-				
 				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("XTRA_PARAM",xtraParams);
+				System.out.println("After sreturnDetail---->>["+sreturnDetail+"]");				
 				if( (errString != null && errString.indexOf("VTSUCC1") > -1) )
 				{
 					//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))
 					{
-						sorderRtrStr =  saveSaleOrderDataNew(tranId,siteCode,xtraParams,conn);
+						sorderRtrStr =  saveSaleOrderDataNew(sreturnDetail,conn);
 						System.out.println("sorderRtrStr after saveSaleOrderData------->>["+sorderRtrStr+"]");
 						//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start						
 						if( "success".equalsIgnoreCase(sorderRtrStr))
@@ -137,7 +144,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 					}
 					else if("RF".equalsIgnoreCase(tranType))
 					{						
-						refundReturnStr = ReceivableToPayableTrf(tranId,invoiceId,siteCode,xtraParams, conn);
+						refundReturnStr = ReceivableToPayableTrf(sreturnDetail, conn);
 						System.out.println("After ReceivableToPayableTrf---->>["+refundReturnStr+"]");
 						if("success".equalsIgnoreCase(refundReturnStr))
 						{
@@ -151,7 +158,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 							conn.commit();	
 						}
 						
-						refundReturnStr = generateAutoPayment(tranId, invoiceId, xtraParams, conn);
+						refundReturnStr = generateAutoPayment(sreturnDetail, conn);
 						System.out.println("After refundReturnStr---->>["+refundReturnStr+"]");
 						
 						//Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
@@ -277,13 +284,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 	/*1. Function for transferring the negative receivables to payables.
 	2. The receivable is adjusted and a new record is inserted in to payables.
 	3. Record in inserted into receivables_adj */
-	public String ReceivableToPayableTrf(String tranId ,String invoiceId,String siteCode,String xtraParams, Connection conn) throws RemoteException,ITMException
+	public String ReceivableToPayableTrf(Map<String,String>sReturnDetailsMap, Connection conn) throws RemoteException,ITMException
 	{				
 		ITMDBAccessEJB itmdbAccess = null;
 		ValidatorEJB vdt=null;
 		PreparedStatement pstmt=null;
 		ResultSet rs = null;
-		
+		String tranId = "" ,invoiceId = "" , xtraParams = "",siteCode = "",tranIdCrn = "";
 		String sql  ="",userId = "",confirmed = "",errCode = "",errorString = "",
 				tranIdRecAdj = "",chgTerm = "",saleOrder = "",retString = "";		
 		String tranIdRec = "",currCode = "",custCode = "",acctCode = "",cctrCode = "",finEntity = "",
@@ -295,6 +302,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		boolean isError = false;
 		try
 		{
+			tranId = sReturnDetailsMap.get("TRAN_ID");
+			invoiceId = sReturnDetailsMap.get("INVOICE_ID");
+			siteCode = sReturnDetailsMap.get("SITE_CODE");
+			tranIdCrn = sReturnDetailsMap.get("TRAN_ID__CRN");
+			xtraParams = sReturnDetailsMap.get("XTRA_PARAM");			
+			
 			currDate = new Timestamp(System.currentTimeMillis());			
 			vdt=new ValidatorEJB();
 			Calendar currentDate = Calendar.getInstance();
@@ -372,10 +385,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				// select all necessary details from receivables 
 
 				sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,"
-						+ "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO IN "
-						+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) ";
+						+ "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO  = ?";
+						//+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) ";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, invoiceId);
+				pstmt.setString(1, tranIdCrn);
 				rs = pstmt.executeQuery();
 				if(rs.next())
 				{
@@ -463,9 +476,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 						+ "VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,? )"; 
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
-				pstmt.setString(2,refserPay);
+				pstmt.setString(2,tranSer);//refserPay
 				pstmt.setTimestamp(3,currDate);
-				pstmt.setString(4,invoiceId);
+				pstmt.setString(4,tranIdCrn);//invoiceId
 				pstmt.setTimestamp(5,refDate);				
 				pstmt.setString(6,currCode);
 				pstmt.setDouble(7, exchRate);
@@ -501,7 +514,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranIdRecAdj);
 				pstmt.setString(2,tranSer);
-				pstmt.setString(3,invoiceId);
+				pstmt.setString(3,tranIdCrn);//invoiceId
 
 				pstmt.setDouble(4, totAmt);
 				pstmt.setDouble(5, adjAmt);
@@ -564,7 +577,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 
 		return retString;
 	}
-	private String generateAutoPayment(String tranId,String invoiceId, String xtraParams,Connection conn) throws ITMException,Exception
+	private String generateAutoPayment(Map<String,String> sReturnDetailsMap,Connection conn) throws ITMException,Exception
 	{
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -572,7 +585,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 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;
@@ -582,6 +595,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		FinCommon fin=new FinCommon();
 		try		
 		{
+			System.out.println("In generateAutoPayment :"+sReturnDetailsMap); 
+			tranId = sReturnDetailsMap.get("TRAN_ID");
+			invoiceId = sReturnDetailsMap.get("INVOICE_ID");					
+			xtraParams = sReturnDetailsMap.get("XTRA_PARAM");
+			
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");  			
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
 			currDate = new java.sql.Timestamp(System.currentTimeMillis());
@@ -885,7 +903,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(refNoInvoice)+"]]></vouch_no>");
+			xmlString.append("<vouch_no><![CDATA["+checkNull(invoiceId)+"]]></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>");
@@ -1523,7 +1541,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		return "Error";
 	
 	}
-	private String saveSaleOrderDataNew (String tranId ,String siteCode,String xtraParams,Connection conn) throws ITMException,Exception
+	private String saveSaleOrderDataNew (Map <String,String>sreturnDetailMap,Connection conn) throws ITMException,Exception
 	{
 		System.out.println("-----------in saveSaleOrderDataNew-----------------------");		
 		
@@ -1532,6 +1550,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		PreparedStatement pstmt = null,pstmt1 = null;
 		applDate = genericUtility.getApplDateFormat();
 		dbDate = genericUtility.getDBDateFormat();
+		String tranId = "",siteCode = "",xtraParams = "";
 		String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "",
 			crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "",
 			tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "",
@@ -1547,6 +1566,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		java.sql.Timestamp orderDate = null,pordDate = null,taxDate = null,currDate = null;
 		
 		StringBuffer xmlBuffer = new StringBuffer();
+		tranId = sreturnDetailMap.get("TRAN_ID");
+		siteCode = sreturnDetailMap.get("SITE_CODE");
+		xtraParams = sreturnDetailMap.get("XTRA_PARAM");		
+		
 		chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));		
 		chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));