Bug fixing

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

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java

@@ -1129,10 +1129,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				total = total + advAmt;
 				System.out.println("LINE NO 874"+total);
 				//System.out.println("total in adv"+total);
-				acct = (String)RcpHdrMap.get("acct_code__adv");
-				cctr = (String)RcpHdrMap.get("cctr_code__adv");
+				acct = (String)RcpHdrMap.get("acct_code__adv")==null?"":(String)RcpHdrMap.get("acct_code__adv");
+				cctr = (String)RcpHdrMap.get("cctr_code__adv")==null?"":(String)RcpHdrMap.get("cctr_code__adv");
 				exch = (Double)RcpHdrMap.get("exch_rate");
-
+				
 
 				if(rcpClubPost.equals("Y"))
 				{
@@ -1947,7 +1947,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			System.out.println("ERROR......................"+errString);
 			if(errString != null && errString.trim().length() > 0)
 			{
-				//return errString;
+				return errString;
 			}
 			else
 			{
@@ -1962,7 +1962,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
 			rs = pstmt.executeQuery();
-			while(rs.next())
+			if(rs.next())
 			{
 				refNo = rs.getString(1);
 				amount = rs.getDouble(2);
@@ -1989,7 +1989,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
 			rs = pstmt.executeQuery();
-			while(rs.next())
+			if(rs.next())
 			{
 				refNo = rs.getString(1);
 				amount = rs.getDouble(2);
@@ -2015,19 +2015,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			pstmt.close();
 			pstmt = null;
 
-			if(errString == null && errString.trim().length() == 0)
+			if(errString == null || errString.trim().length() == 0)
 			{
-				if(Math.abs(debit - credit) >= 1)
+				/*if(Math.abs(debit - credit) >= 1)
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTAMTMIS","","",conn);
-				}
+					return errString;
+				}*/
+				errString = finCommon.checkGlTranDrCr("RCP",tranId,conn);
 
 			}
 
-			if(errString == null || errString.trim().length() == 0)
+			if(errString != null && errString.trim().length() > 0)
 			{
-
-
+				return errString;
 			}
 
 
@@ -2168,6 +2169,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			if((Double)RcpHdrMap.get("bill_amt") == 0 && (Double)RcpHdrMap.get("adv_amt") == 0 && (Double)RcpHdrMap.get("net_amt") != 0)
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTRCPT11","","",conn);
+				return errString;
 			}
 
 			tranId = (String)RcpHdrMap.get("tran_id");
@@ -2191,6 +2193,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				errString = itmDBAccessEJB.getErrorString("","VTIBCA5","","",conn);
 				//return errString;
 			}
+			
 
 			sql =" SELECT count(*) FROM rcpacct,receipt  WHERE ( rcpacct.tran_id = receipt.tran_id ) and  ( rcpacct.curr_code <> receipt.curr_code ) and  ( ( receipt.tran_id = ? ) )";
 			pstmt = conn.prepareStatement(sql);
@@ -2210,7 +2213,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				errString = itmDBAccessEJB.getErrorString("","VTIBCA5","","",conn);
 				//return errString;
 			}
-
+			
 
 			/// if EPC in diff currency.
 			if((Double)RcpHdrMap.get("efundadj_amt")!= 0 && cnt1 > 0)
@@ -2320,7 +2323,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if((Double)RcpHdrMap.get("net_amt__bc") < 0 )
 				{
 					glTraceMap.put("dr_amt", 0.0);
-					glTraceMap.put("cr_amt", 0 - netAmountBc);
+					glTraceMap.put("cr_amt", -1 *  netAmountBc);
 				}
 
 				else{
@@ -2339,7 +2342,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if((Double)RcpHdrMap.get("net_amt") < 0 )
 				{
 					glTraceMap.put("dr_amt", 0.0);
-					glTraceMap.put("cr_amt", 0 - netAmt);
+					glTraceMap.put("cr_amt",  -1 * netAmt);
 				}
 
 				else{
@@ -2382,7 +2385,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if((Double)RcpHdrMap.get("net_amt__bc") < 0 )
 				{
 					sundryBalMap.put("dr_amt", 0.0);
-					sundryBalMap.put("cr_amt", 0 - netAmountBc );
+					sundryBalMap.put("cr_amt", -1 * netAmountBc );
 				}
 
 				else{
@@ -2398,7 +2401,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if((Double)RcpHdrMap.get("net_amt") < 0 )
 				{
 					sundryBalMap.put("dr_amt", 0.0);
-					sundryBalMap.put("cr_amt", 0 - netAmt);
+					sundryBalMap.put("cr_amt", -1 * netAmt);
 				}
 
 				else{
@@ -2438,7 +2441,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					bankTranLogMap.put("exch_rate", 1.0);
 					if((Double)RcpHdrMap.get("net_amt__bc") < 0 )
 					{
-						bankTranLogMap.put("amount",0 - (Double)RcpHdrMap.get("net_amt__bc"));
+						bankTranLogMap.put("amount", -1 * (Double)RcpHdrMap.get("net_amt__bc"));
 						bankTranLogMap.put("tran_type", "P");
 					}
 
@@ -2454,7 +2457,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					bankTranLogMap.put("exch_rate", exchRate);
 					if((Double)RcpHdrMap.get("net_amt") < 0 )
 					{
-						bankTranLogMap.put("amount",0 - netAmt);
+						bankTranLogMap.put("amount", -1 * netAmt);
 						bankTranLogMap.put("tran_type", "P");
 					}
 
@@ -2517,7 +2520,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				}else
 				{
 					glTraceMap.put("dr_amt", 0.0);
-					glTraceMap.put("cr_amt", 0 - (Double)RcpHdrMap.get("diff_amt__exch"));
+					glTraceMap.put("cr_amt", -1 * (Double)RcpHdrMap.get("diff_amt__exch"));
 					cnt1=2;
 				}
 
@@ -2575,7 +2578,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				receivablesMap.put("eff_date", new Timestamp(effDate.getTime()));
 				receivablesMap.put("tax_amt", 0);
 				receivablesMap.put("discount", 0);
-				receivablesMap.put("tot_amt", -1 * advAmt);
+				receivablesMap.put("tot_amt", -1 * ((Double)RcpHdrMap.get("adv_amt")));
 				receivablesMap.put("auto_rcp", "N");
 				receivablesMap.put("bank_code","");
 				receivablesMap.put("ref_type", "F");
@@ -2594,7 +2597,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				receivablesMap.put("cust_ref_date","");
 				receivablesMap.put("cust_ref_amt","");
 
-				System.out.println("In 1997 receivablesMap !!!!!!!!!!!!!!!!!!!!!!!!!!");			
+				System.out.println("In 1997 receivablesMap [" + receivablesMap + "]");			
 				errString = finCommon.gbfReceivablesUpd(receivablesMap,conn);
 				if(errString != null && errString.trim().length() > 0)
 				{
@@ -2615,10 +2618,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				sundryBalMap.put("exch_rate", exchRate);
 				sundryBalMap.put("dr_amt", 0.0);
 				sundryBalMap.put("cr_amt", 0.0);
-				sundryBalMap.put("adv_amt", advAmt);
+				sundryBalMap.put("adv_amt", ((Double)RcpHdrMap.get("adv_amt")));
 				contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
 				sundryBalMap.put("contact_code",contactCode );
-				System.out.println("In 2021 sundryBalMap !!!!!!!!!!!!!!!!!!!!!!!!!!");
+				System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]");
+				
 				errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
 				if(errString != null && errString.trim().length() > 0)
 				{
@@ -2851,7 +2855,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			for (int ctr =0; ctr < DetList.size(); ctr++)
 			{
 
-				System.out.println("no of times "+ctr);
+				//System.out.println("no of times "+ctr);
 				//DetMap = new HashMap();
 				DetMap = (HashMap) DetList.get(ctr);
 
@@ -2868,7 +2872,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				exchRate = (Double)detListMap.get("exch_rate");
 				partyDocRef = (String)detListMap.get("party_doc_ref");*/
 
-
+				sundryType = (String)DetMap.get("sundry_type")==null?"O":(String)DetMap.get("sundry_type");
+				sundryCode = (String)DetMap.get("sundry_code")== null?"":(String)DetMap.get("sundry_code");
 				glTraceMap = new HashMap();
 				glTraceMap.put("tran_date",new Timestamp(tranDate.getTime()));
 				glTraceMap.put("eff_date",new Timestamp(effDate.getTime()));
@@ -2893,7 +2898,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				}
 				else
 				{
-					glTraceMap.put("dr_amt",0 - amount);
+					glTraceMap.put("dr_amt", -1 *  amount);
 					glTraceMap.put("cr_amt",0.0);
 				}
 				glTraceMap.put("ref_type","F");
@@ -2901,11 +2906,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				glTraceMap.put("ref_id", tranId);
 				glTraceMap.put("remarks",remarks);
 				glTraceMap.put("party_doc_ref",partyDocRef);
-				System.out.println("848 glTraceUpdate Called..............");
+				System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]");
 				errString = finCommon.glTraceUpdate(glTraceMap,conn);
 				if(errString != null && errString.trim().length() > 0)
 				{
-					System.out.println("ERROR IN GLTRACE ...........");
+					System.out.println("ERROR IN GLTRACE ........... errString [" + errString + "]");
 
 					return errString;
 				}
@@ -2924,7 +2929,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					sundryBalMap.put("eff_date",new Timestamp(effDate.getTime()));
 					sundryBalMap.put("fin_entity", finEntity);
 					sundryBalMap.put("site_code", siteCode);
-					sundryBalMap.put("sundry_type", sundryType);
+					sundryBalMap.put("sundry_type", (String)glTraceMap.get("sundry_type"));
 					sundryBalMap.put("sundry_code", sundryCode);
 					sundryBalMap.put("acct_code", (String)DetMap.get("acct_code"));
 					sundryBalMap.put("cctr_code", (String)DetMap.get("cctr_code")==null?"":(String)DetMap.get("cctr_code"));
@@ -2939,7 +2944,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 					}
 					else
 					{
-						sundryBalMap.put("dr_amt", 0 - amount);
+						sundryBalMap.put("dr_amt", -1 *  amount);
 						sundryBalMap.put("cr_amt", 0.0);
 					}
 					sundryBalMap.put("adv_amt", 0.0);