Replace ApprovedRate.java

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

@@ -33,8 +33,8 @@ public class ApprovedRate extends ValidatorEJB {
         ResultSet rs = null;
         LinkedHashMap<String, ArrayList<String>> quotationRatesMap = new LinkedHashMap<>();
         int count = 0;
-        String customerCode = "" , quotNo = "" , addDate = "" ,aprvRate = "" , quantity="";
-        String sql = "select cust_code , quot_no , created_date , item_code , approved_rate , quantity from item_rate_hist where item_code= ?  AND created_date IS NOT NULL ORDER BY  created_date desc limit 5";
+        String customerCode = "" , quotNo = "" , addDate = "" ,aprvRate = "" , quantity="" , customerName="" , itemDescr="";
+        String sql = "SELECT irh.cust_code, c.cust_name, irh.quot_no, irh.created_date, irh.item_code, irh.item_descr, irh.approved_rate, irh.quantity FROM item_rate_hist irh LEFT JOIN customer c ON irh.cust_code = c.cust_code WHERE irh.item_code = ? AND irh.created_date IS NOT NULL ORDER BY irh.created_date DESC LIMIT 5";
         try {
             BaseLogger.log("3", getUserInfo(), null, "Fetching last 5 quotation rates for item_code: " + itemCode);
 
@@ -47,9 +47,11 @@ public class ApprovedRate extends ValidatorEJB {
             {
                 ArrayList<String> quotationDetails = new ArrayList<>();
                 customerCode = checkNull(rs.getString("cust_code"));
+                customerName= checkNull(rs.getString("cust_name"));
                 quotNo = checkNull(rs.getString("quot_no"));
                 addDate = checkNull(rs.getString("created_date"));
                 itemCode =  checkNull(rs.getString("item_code"));
+                itemDescr= checkNull(rs.getString("item_descr"));
                 aprvRate = checkNull(rs.getString("approved_rate"));
                 quantity = checkNull(rs.getString("quantity"));
   
@@ -59,9 +61,11 @@ public class ApprovedRate extends ValidatorEJB {
                 String formattedAddDate = displayFormat.format(addDateUtil);
 
                 quotationDetails.add(customerCode);
+                quotationDetails.add(customerName);
                 quotationDetails.add(quotNo);
                 quotationDetails.add(formattedAddDate);
                 quotationDetails.add(itemCode);
+                quotationDetails.add(itemDescr);
                 quotationDetails.add(aprvRate);
                 quotationDetails.add(quantity);