changes in fin_entity

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

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

@@ -472,14 +472,14 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 					if ("D".equalsIgnoreCase(detDrcrFlag))
 					{
 						sundryBalMap.put("dr_amt",detAmount);
-						sundryBalMap.put("cr_amt",0);
+						sundryBalMap.put("cr_amt","0");
 					}
 					else
 					{
 						sundryBalMap.put("cr_amt",detAmount);
-						sundryBalMap.put("dr_amt",0);
+						sundryBalMap.put("dr_amt","0");
 					}
-					sundryBalMap.put("adv_amt", 0);
+					sundryBalMap.put("adv_amt", "0");
 				
 					sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
 					//Fcommon = null;
@@ -871,7 +871,7 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 		ArrayList jdList = new ArrayList();
 		String tranIDSer  = "";
 		genericUtility = new GenericUtility();
-		String thisWin = "" ,keyStr = "",refId = "",link = "",amountStr = "";
+		String thisWin = "" ,keyStr = "",refId = "",link = "",amountStr = "",FinEntitySite="";
 		String revRefSer = "",tranType = "",confirm = "",empCodeAprv="";
 		String FinEnt ="",siteCode = "",siteCodeJv = "",siteCodeFor = "";
 		String	detSundryType = "",	detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = "";
@@ -951,8 +951,24 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 				return errString;
 			}
 			
-			
 			/*collecting data from ibca_pay_ctrl*/
+			sql =" select count(1) from ibca_pay_ctrl where site_code__from = ? and site_code__to = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,siteCode);
+			pstmt.setString(2,siteCodeFor);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				int cnt = rs.getInt(1);
+				if(cnt == 0)
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTIBCA5","","",conn);
+					return errString;
+				}
+			}
+			rs.close();	rs = null;
+			pstmt.close(); pstmt = null;
+			
 			sql =" select fin_entity__from,acct_code__rcp,acct_code__pay,auto_confirm,link_type"
 				+" from ibca_pay_ctrl where site_code__from = ? and site_code__to = ? " ;
 			pstmt = conn.prepareStatement(sql);
@@ -967,10 +983,8 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 				autoConf = rs.getString(4);
 				link = rs.getString(5);
 			}
-			rs.close();
-			rs = null;
-			pstmt.close();
-			pstmt = null;
+			rs.close();	rs = null;
+			pstmt.close(); pstmt = null;
 			
 			/* accounting effect for site code - start */
 			glTraceMap = new HashMap();	
@@ -1221,10 +1235,8 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 					pstmt1.close();
 					pstmt1 =null;
 				}
-				rs.close();
-				rs = null;
-				pstmt.close();
-				pstmt =null;
+				rs.close();	rs = null;
+				pstmt.close();pstmt =null;
 				System.out.println("keyStr :::"+keyStr);
 				
 				
@@ -1248,6 +1260,16 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTTRANID","","",conn);
 				}
+				sql =" select fin_entity from site where site_code = ? ";
+				pstmt =  conn.prepareStatement(sql);
+				pstmt.setString(1,siteCodeFor);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					FinEntitySite = rs.getString("fin_entity");					
+				}
+				rs.close();	rs = null;
+				pstmt.close();pstmt =null;
 				
 				sql = " insert into journal "
 				+" (tran_id, tran_date, eff_date, fin_entity, site_code, dr_amt, cr_amt , "
@@ -1259,7 +1281,8 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 				pstmt.setString(1,tranIDSer); //new generated tranId
 				pstmt.setTimestamp(2,revDt);
 				pstmt.setTimestamp(3,revDt);
-				pstmt.setString(4,(String)journalMap.get("fin_entity"));
+				//pstmt.setString(4,(String)journalMap.get("fin_entity"));
+				pstmt.setString(4,FinEntitySite);
 				//pstmt.setString(5,(String)journalMap.get("site_code"));
 				//changed at 12/08/11 by chandni 
 				pstmt.setString(5,siteCodeFor);
@@ -1285,7 +1308,7 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 				jMap.put("tran_date",revDt);
 				jMap.put("eff_date",revDt);
 				jMap.put("site_code",siteCodeFor);
-				jMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity")));
+				jMap.put("fin_entity",FinEntitySite);
 				jMap.put("ref_ser",revRefSer);
 				jMap.put("ref_no",tranId);
 				jMap.put("reversible","N");
@@ -1427,7 +1450,8 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 					//added at 12/08/11 by chandni 
 					glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date")));
 					glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date")));
-					glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity")));
+					//glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity")));
+					glTraceMap.put("fin_entity",FinEntitySite);
 					//glTraceMap.put("site_code",siteCode); // from header : siteCode
 					//changed at 12/08/11 by chandni 
 					glTraceMap.put("site_code",siteCodeFor); // from header : siteCode
@@ -1469,7 +1493,8 @@ public class JvConfirm  extends ActionHandlerEJB implements JvConfirmLocal,JvCon
 						sundryBalMap = new HashMap();
 						sundryBalMap.put("tran_date",journalMap.get("tran_date"));
 						sundryBalMap.put("eff_date ",journalMap.get("eff_date"));
-						sundryBalMap.put("fin_entity",journalMap.get("fin_entity"));
+						//sundryBalMap.put("fin_entity",journalMap.get("fin_entity"));
+						sundryBalMap.put("fin_entity",FinEntitySite);
 						//sundryBalMap.put("site_code",siteCode); // from header : siteCode
 						sundryBalMap.put("site_code",siteCodeFor); // from header : siteCode
 						sundryBalMap.put("sundry_type",detSundryType);