Replace CostDetails.java

Quotation Amendment/src/ibase/webitm/ejb/vhb/msq1/CostDetails.java

 package ibase.webitm.ejb.vhb.msq1;
 
-
 import java.sql.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -32,19 +31,20 @@ public class CostDetails extends ValidatorEJB {
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String sql = "", item = "" , rmCost = "" , pmCost = "" , otherCosts = "" , effFrom = "" , validUpto = "" , costPerUnit = "" ;
+		String sql = "", descr="" ,item = "" , rmCost = "" , pmCost = "" , otherCosts = "" , effFrom = "" , validUpto = "" , costPerUnit = "" ;
 		List<List<String>> costList = new ArrayList<>();
 
 		try 
 		{
 			conn = getConnection();
-			sql = "SELECT item_code, rm_cost, pm_cost, other_costs, effective_from_date, valid_upto_date, cost_per_unit FROM costing_mst WHERE item_code = ? ORDER BY effective_from_date DESC";
+			sql = "SELECT cm.item_code, it.descr, cm.rm_cost, cm.pm_cost, cm.other_costs, cm.effective_from_date, cm.valid_upto_date, cm.cost_per_unit FROM costing_mst cm LEFT JOIN item it ON cm.item_code = it.item_code WHERE cm.item_code = ? ORDER BY effective_from_date DESC";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode.trim());
 			rs = pstmt.executeQuery();
 			while (rs.next()) 
 			{
 				item = checkNull(rs.getString("item_code"));
+				descr = checkNull(rs.getString("descr"));
 				rmCost = checkNull(rs.getString("rm_cost"));
 				pmCost = checkNull(rs.getString("pm_cost"));
 				otherCosts = checkNull(rs.getString("other_costs"));
@@ -52,7 +52,7 @@ public class CostDetails extends ValidatorEJB {
 				validUpto = checkNull(rs.getString("valid_upto_date"));
 				costPerUnit = checkNull(rs.getString("cost_per_unit"));
 
-				// Formatting dates for better display
+				
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
 				Date effFromDate = simpleDateFormat.parse(effFrom);
 				Date validUptoDate = simpleDateFormat.parse(validUpto);
@@ -63,6 +63,7 @@ public class CostDetails extends ValidatorEJB {
 
 				List<String> row = new ArrayList<>();
 				row.add(item);
+				row.add(descr);
 				row.add(rmCost);
 				row.add(pmCost);
 				row.add(otherCosts);
@@ -80,7 +81,7 @@ public class CostDetails extends ValidatorEJB {
 		}
 		finally
 		{
-			// Closing resources
+			
 			if (rs != null) {
 				rs.close();
 			}
@@ -100,25 +101,26 @@ public class CostDetails extends ValidatorEJB {
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String sql = "", item = "" ,  rate = "" , currCode = "" , effFrom = "" , validUpto = "" , prvNrv = "" ;
+		String sql = "", item = "" , descr="" ,   rate = "" , currCode = "" , effFrom = "" , validUpto = "" , prvNrv = "" ;
 		List<List<String>> priceList = new ArrayList<>();
 		try 
 		{
 			conn = getConnection();
-			sql = "SELECT item_code, rate, eff_from, valid_upto, curr_code, previous_nrv FROM pricelist WHERE item_code = ? ORDER BY eff_from DESC";
+			sql = "SELECT prt.item_code,it.descr,prt.rate, prt.eff_from, prt.valid_upto, prt.curr_code, prt.previous_nrv FROM pricelist prt left join item it on prt.item_code= it.item_code  WHERE prt.item_code = ? ORDER BY eff_from DESC";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode.trim());
 			rs = pstmt.executeQuery();
 			while (rs.next()) 
 			{
+				
 				item = checkNull(rs.getString("item_code"));
+				descr= checkNull(rs.getString("descr"));
 				rate = checkNull(rs.getString("rate"));
 				effFrom = checkNull(rs.getString("eff_from"));
 				validUpto = checkNull(rs.getString("valid_upto"));
 				currCode = checkNull(rs.getString("curr_code"));
 				prvNrv = checkNull(rs.getString("previous_nrv"));
 				
-				// Formatting dates for better display
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
 				Date effFromDate = simpleDateFormat.parse(effFrom);
 				Date validUptoDate = simpleDateFormat.parse(validUpto);
@@ -130,6 +132,7 @@ public class CostDetails extends ValidatorEJB {
 				List<String> row = new ArrayList<>();
 				
 				row.add(item);
+				row.add(descr);
 				row.add(rate);
 				row.add(formattedEffFrom);
 				row.add(formattedValidUpto);
@@ -145,7 +148,7 @@ public class CostDetails extends ValidatorEJB {
 		}
 		finally
 		{
-			// Closing resources
+			
 			if (rs != null) {
 				rs.close();
 			}
@@ -167,3 +170,4 @@ private String checkNull(String str)
 
 }
 
+