Some changes as per PB code verification

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

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

@@ -498,8 +498,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				DetMap.put("amount", rs.getDouble("amount"));
 				DetMap.put("party_doc_ref", rs.getString("party_doc_ref"));
 				DetList.add(DetMap);
-				System.out.println(" receipt Acct Map..........");
-				System.out.println(DetList.toString());
+				//System.out.println(" receipt Acct Map..........");
+				System.out.println("DetList initial [" + DetList.toString() + "]");
 			}
 			rs.close();
 			rs = null;
@@ -516,7 +516,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				ADetMap.put("ref_ser", rs.getString("ref_ser"));
 				ADetMap.put("ref_no", rs.getString("ref_no"));
 				ADetMap.put("adj_amt", rs.getDouble("adj_amt"));
-
+				ADetMap.put("sundry_type", "C");
+				ADetMap.put("sundry_code", (String) RcpHdrMap.get("sundry_code"));
 				ADetMap.put("acct_code", rs.getString("acct_code"));
 				ADetMap.put("cctr_code", rs.getString("cctr_code"));
 
@@ -2491,7 +2492,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				glTraceMap.put("fin_entity", finEntity);
 				glTraceMap.put("site_code", siteCode);
 				glTraceMap.put("sundry_type", "O");
-				glTraceMap.put("sundry_code", bankCode);
+				glTraceMap.put("sundry_code", "");
 				glTraceMap.put("acct_code", (String)RcpHdrMap.get("acct_code__cf"));
 				if(acctCodeCf ==null || acctCodeCf.trim().length() == 0)
 				{
@@ -2574,7 +2575,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", 0- advAmt);
+				receivablesMap.put("tot_amt", -1 * advAmt);
 				receivablesMap.put("auto_rcp", "N");
 				receivablesMap.put("bank_code","");
 				receivablesMap.put("ref_type", "F");
@@ -2614,7 +2615,7 @@ 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", 0.0);
+				sundryBalMap.put("adv_amt", advAmt);
 				contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
 				sundryBalMap.put("contact_code",contactCode );
 				System.out.println("In 2021 sundryBalMap !!!!!!!!!!!!!!!!!!!!!!!!!!");
@@ -2844,17 +2845,17 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			hexchRate = (Double)RcpHdrMap.get("exch_rate");
 			remarks = (String)RcpHdrMap.get("remarks");
 
-			System.out.println("DetList SIZE "+DetList.size());
-			System.out.println("DetList SIZE "+DetList);
+			System.out.println("DetList SIZE ["+DetList.size() + "] DetList [" +DetList + "]");
+			
 
 			for (int ctr =0; ctr < DetList.size(); ctr++)
 			{
 
 				System.out.println("no of times "+ctr);
-				DetMap = new HashMap();
+				//DetMap = new HashMap();
 				DetMap = (HashMap) DetList.get(ctr);
 
-				System.out.println("DetMap SIZE "+DetMap);
+				System.out.println(" DetMap ctr [" + ctr + "] ["+DetMap + "]);
 
 				/* sundryType = (String)detListMap.get("sundry_type");
 				sundryCode = (String)detListMap.get("sundry_code");					
@@ -2990,7 +2991,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				pstmt.setString(2,refNo);
 				pstmt.setString(3,lineNoPef);
 				rs = pstmt.executeQuery();
-				while(rs.next())
+				if(rs.next())
 				{
 					totAmt = rs.getDouble("tot_amt");
 					adjAmt = rs.getDouble("adj_amt");
@@ -3006,6 +3007,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if(Math.abs(totAmt - adjAmt) < Math.abs(amount))
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
+					return errString;
 				}
 
 
@@ -3196,6 +3198,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 				if(Math.abs(amount - adjAmt) < Math.abs(amount))
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
+					return errString;
 				}