Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -rc961aafb116c98bab6fed37cf5a34cddb696931d -raf9601866041e2d892cbdffda8d5433536565663 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision c961aafb116c98bab6fed37cf5a34cddb696931d) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision af9601866041e2d892cbdffda8d5433536565663) @@ -3173,6 +3173,9 @@ case "reviewed": sortingStmt1 = "order by a.REVIEWED " + sortingOrder + " "; break; + case "onHandCount": + sortingStmt1 = "order by nvl (a.on_hand , 0) " + sortingOrder + " "; + break; case "perCar": sortingStmt1 = "order by c.per_car " + sortingOrder + " "; break; @@ -3225,23 +3228,22 @@ String sql = "WITH min_max_data as (\n" + " SELECT a.site_id, a.REVIEWED, d.site_short_name , c.field_abbr , c.group_code , c.per_car , c.part_number , a.min_stocking_qty as newmin , a.max_stocking_qty as newmax , a.initial_stocking_dt ,\n" + - " a.curr_min as currmin, a.curr_max as currmax , c.product_desc ,\n" + + " a.curr_min as currmin, a.curr_max as currmax , c.product_desc , nvl (a.on_hand , 0) as onHandCount ,\n" + salesCode + " as saleshistory , c.top_app , (a.curr_max * c.golden_price) as currentinv ,\n" + " (a.max_stocking_qty * c.golden_price) as recommended, " + " ((a.max_stocking_qty * c.golden_price)-(a.curr_max * c.golden_price)) as changeval, ROW_NUMBER() over (" + sortingStmt1 + ") RN\n" + " FROM " + ( isFinalized ? "session_site_product_finalized" : "session_site_product" ) + " a, product c, site d\n" + " WHERE session_id = " + sessionId + " AND a.site_id IN (SELECT site_id FROM session_site WHERE session_Id = " + sessionId + " ) " + " AND a.product_id = c.product_id\n" + " AND a.site_id = d.site_id" + minMaxGroupCode + minMaxLineAbbr + minMaxSiteIds + minMaxSkusFilterStmt + minMaxReviewedStmt + sortingStmt2 + minMaxSaleshistory + ")\n" + - " SELECT site_id \"siteId\" , site_short_name \"siteName\" , field_abbr \"line\", group_code \"group\", nvl(REVIEWED,0) \"reviewed\",per_car \"perCar\" ," + + " SELECT site_id \"siteId\" , site_short_name \"siteName\" , field_abbr \"line\", group_code \"group\", nvl(REVIEWED,0) \"reviewed\", onHandCount \"onHandCount\" , per_car \"perCar\" ," + " part_number \"partNumber\",\n" + " newmin \"newMin\",newmax \"newMax\", initial_stocking_dt \"firstStockDate\",\n" + " currmin \"currMin\", currmax \"currMax\", product_desc \"partDescription\",\n" + " saleshistory \"salesHistory\", top_app \"topApp\", currentinv \"currentInv\",\n" + " recommended \"recommended\", changeval \"change\"\n" + " from min_max_data \n"; - // System.out.println("Main Query" +sql); // continuation of main query if ( exportType.length ( ) == 0 ) { int startRowNumber = ( ( pageNumber - 1 ) * numberOfRecordsPerPage ) + 1; Index: src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java =================================================================== diff -u -rf9a91382cb8475c83ae4815b3e3a839ffbe74235 -raf9601866041e2d892cbdffda8d5433536565663 --- src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java (.../ExportServiceImpl.java) (revision f9a91382cb8475c83ae4815b3e3a839ffbe74235) +++ src/main/java/com/napa/pulse/service/impl/ExportServiceImpl.java (.../ExportServiceImpl.java) (revision af9601866041e2d892cbdffda8d5433536565663) @@ -622,6 +622,7 @@ cell.setCellStyle(styles[6]); createCell(row, rs.getInt("currMin"), cellNum++, styles); createCell(row, rs.getInt("currMax"), cellNum++, styles); + createCell(row, rs.getInt("onHandCount"), cellNum++, styles); createCell(row, rs.getInt("perCar"), cellNum++, styles); createCell(row, rs.getString("partDescription"), cellNum++, styles); createCell(row, rs.getString("topApp"), cellNum++, styles);