Closed connection conn to prevent dirty connection.

Mohammed/Sales Contract1/SalesContractAmendmentIC.java

@@ -1162,21 +1162,28 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 		} 
 		finally 
 		{
-			try {
+			try 
+			{
+				if (rs != null) 
+				{
+					rs.close();
+					rs = null;
+				}
+
+				if (pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+
 				if (conn != null)
 				{
-					if (rs != null) 
-					{
-						rs.close();
-						rs = null;
-					}
-					if (pstmt != null)
-					{
-						pstmt.close();
-						pstmt = null;
-					}
+					conn.close();
+					conn = null;
 				}
-			} catch (Exception d) {
+			} 
+			catch (Exception d) 
+			{
 				d.printStackTrace();
 				throw new ITMException(d);
 			}
@@ -1247,7 +1254,9 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 		String unitRate="";
 		String errString = "";
 		java.sql.Date ld_tax_date = null, ld_pl_date = null, ld_pord_date = null, ld_dsp_date = null, ld_eff_from = null, ld_valid_upto = null;
+		Connection conn=null;
 		try {
+			conn = getConnection();
 			switch(objContext)
 			{
 			case "1":
@@ -1565,9 +1574,14 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 					setItem(dom, 1, "remarks3_o", remarks3);
 					setItem(dom, 1, "remarks3", remarks3);
 					setItem(dom, 1, "eff_from_o", ld_eff_from);
+					//Commented by Gagan B. on 13-APR-26 for setting proper validity Dates when creating SCA transaction from SQA 
 //					setItem(dom, 1, "eff_from", ld_eff_from);
+					
 					setItem(dom, 1, "valid_upto_o", ld_valid_upto);
-					setItem(dom, 1, "valid_upto", ld_valid_upto);
+					
+					//Commented by Gagan B. on 13-APR-26 for setting proper validity Dates when creating SCA transaction from SQA
+//					setItem(dom, 1, "valid_upto", ld_valid_upto);
+					
 					setItem(dom, 1, "site_code__ship", siteCodeShip);
 					setItem(dom, 1, "curr_code", currCode);
 					break;
@@ -1819,7 +1833,8 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 							" no_art, pack_code	, dsp_date, item_code, " +
 							" item_descr , rel_qty	, unit__std	, conv__qty_stduom, " +
 							" unit, unit__rate	, conv__rtuom_stduom , item_flg , " +
-							" eff_from	, valid_upto " +
+							" eff_from	, valid_upto , " +
+							" remarks " +
 							" from 	scontractdet " +
 							" where contract_no = ? and line_no = ?";
 
@@ -1855,6 +1870,7 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 						ls_item_flg = rs.getString("item_flg");
 						ld_eff_from1 = rs.getTimestamp("eff_from");
 						ld_valid_upto1 = rs.getTimestamp("valid_upto");
+						remarks = rs.getString("remarks");                //Added by Sakshi.p on 10/Apr/2026
 					}
 					setItem(dom, 1, "site_code_o", ls_site_code);
 					setItem(dom, 1, "site_code", ls_site_code);
@@ -1903,6 +1919,9 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 					setItem(dom, 1, "item_flg_o", ls_item_flg);
 					setItem(dom, 1, "eff_from_o", ld_eff_from1);
 					setItem(dom, 1, "valid_upto_o", ld_valid_upto1);
+					 
+					System.out.println("remarks++++"+remarks);
+                    setItem(dom, 1, "remarks", remarks);                        //Added By Sakshi.p on 10/Apr/2026
 
 					rs.close();
 					rs = null;
@@ -2369,21 +2388,28 @@ public class SalesContractAmendmentIC extends ValidatorEJB{
 		} 
 		finally 
 		{
-			try {
+			try 
+			{
+				if (rs != null) 
+				{
+					rs.close();
+					rs = null;
+				}
+
+				if (pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+
 				if (conn != null)
 				{
-					if (rs != null) 
-					{
-						rs.close();
-						rs = null;
-					}
-					if (pstmt != null)
-					{
-						pstmt.close();
-						pstmt = null;
-					}
+					conn.close();
+					conn = null;
 				}
-			} catch (Exception d) {
+			} 
+			catch (Exception d) 
+			{
 				d.printStackTrace();
 				throw new ITMException(d);
 			}