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

webitm-fin/src/ibase/webitm/ejb/fin/adv/MiscValConf.java

@@ -74,7 +74,8 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 			finCommon = new FinCommon();
 			//			genericUtility = new GenericUtility();
 			itmDBAccessEJB = new ITMDBAccessEJB();
-			if(conn == null){
+			if(conn == null)
+			{
 				connDriver = new ConnDriver();
 				//Changes and Commented By Bhushan on 06-06-2016 :START
 				//conn = connDriver.getConnectDB("DriverITM");
@@ -85,7 +86,7 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 				isLocalConn = true;
 			}
 
-			sql =" select confirmed,site_code from MISC_VOUCHER  where tran_id = ?";
+			sql ="select confirmed,site_code from MISC_VOUCHER  where tran_id = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
 			rs = pstmt.executeQuery();
@@ -137,7 +138,8 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 				{
 					if(errString.indexOf("CONFSUCCES") > -1)
 					{
-						if(isLocalConn){
+						if(isLocalConn)
+						{
 							System.out.println("Transaction commited111.............from MiscValConf");
 							conn.commit();
 						}
@@ -2329,7 +2331,7 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 							return errString;
 						}
 						///*
-						if(!("O".equalsIgnoreCase((String)glTraceMap.get("sundry_type"))))
+						if(!("0".equalsIgnoreCase((String)glTraceMap.get("sundry_type"))))
 						{
 							sundryBalMap.put("tran_date",mischdrMap.get("tran_date"));
 							sundryBalMap.put("eff_date ",mischdrMap.get("eff_date"));
@@ -2429,7 +2431,10 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 			glTraceMap.put("fin_entity",(mischdrMap.get("fin_entity") == null ? "":mischdrMap.get("fin_entity")));
 			glTraceMap.put("site_code",(mischdrMap.get("site_code") == null ? "":mischdrMap.get("site_code")));
 			glTraceMap.put("sundry_type",(mischdrMap.get("sundry_type") == null ? "":mischdrMap.get("sundry_type")));
-			glTraceMap.put("sundry_code",(mischdrMap.get("sundry_code") == null ? "":mischdrMap.get("sundry_code")));
+			 //Changed By PriyankaC  sundry_code__pay to be set for gltrace update on 17SEp2019 [Start].
+			//glTraceMap.put("sundry_code",(mischdrMap.get("sundry_code") == null ? "":mischdrMap.get("sundry_code")));
+			glTraceMap.put("sundry_code",(mischdrMap.get("sundry_code__pay") == null ? "":mischdrMap.get("sundry_code__pay")));
+		    //Changed By PriyankaC  sundry_code__pay to be set for gltrace update on 17SEp2019 [End].
 			glTraceMap.put("acct_code",(mischdrMap.get("acct_code__ap") == null ? "":mischdrMap.get("acct_code__ap")));
 			glTraceMap.put("cctr_code",(mischdrMap.get("cctr_code__ap") == null ? " ":mischdrMap.get("cctr_code__ap")));
 			glTraceMap.put("emp_code",(mischdrMap.get("emp_code") == null ? "":mischdrMap.get("emp_code")));
@@ -2535,9 +2540,14 @@ public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,Mi
 			sundryCodePay =(String)mischdrMap.get("sundry_code__pay");
 			sundryType =(String)mischdrMap.get("sundry_type");
 			sundryTypePay =(String)mischdrMap.get("sundry_type__pay");
-
-			if(!((sundryCode.equalsIgnoreCase(sundryCodePay)) ||(sundryType.equalsIgnoreCase(sundryTypePay))))
-			{
+            // Changed By PriyankaC on 04Sep2019.[Starts]
+			System.out.println(" sundry_type__pay :" +sundryType +" sundryTypePay :"+sundryTypePay);
+			System.out.println("SundryCodePAy != SundryCode :" +sundryCode +" sundryCodePay :"+sundryCodePay);
+			//if(!((sundryCode.trim().equalsIgnoreCase(sundryCodePay)) ||(sundryType.trim().equalsIgnoreCase(sundryTypePay))))
+			if((!sundryCode.trim().equalsIgnoreCase(sundryCodePay.trim())) || (!sundryType.trim().equalsIgnoreCase(sundryTypePay.trim())))
+		   // Changed By PriyankaC on 04Sep2019.[END]
+			{
+				System.out.println("SundryCode :" +sundryCode +" sundryCodePay :"+sundryCodePay);
 				rem = "liability transfered to " + sundryCodePay;
 				glTraceMap.put("sundry_type",(mischdrMap.get("sundry_type") == null ? "":mischdrMap.get("sundry_type")));
 				glTraceMap.put("sundry_code",(mischdrMap.get("sundry_code") == null ? "":mischdrMap.get("sundry_code")));