Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -ra5c82baecde560d6c2b181169cde3af585cb89f3 -rcb8249f40652e2536a4f90e77bddc5f527f275d2 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision a5c82baecde560d6c2b181169cde3af585cb89f3) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision cb8249f40652e2536a4f90e77bddc5f527f275d2) @@ -542,7 +542,7 @@ includeHubSpokeOrderOption , includeHubSpokeReturnOption , null , applicationPartsOnly ,leadTime ); } - BigDecimal createNewSession(User user, Boolean perCarOrder, Boolean includeFleets, Boolean includeSystems, + private BigDecimal createNewSession(User user, Boolean perCarOrder, Boolean includeFleets, Boolean includeSystems, Boolean includeSpecials, Boolean includeObsoletes, Boolean includeOverstocks, Boolean includeSupersede, Boolean includeKeylinesOrders, Boolean includeKeylinesReturns, Boolean includeLessThanStdPkg, Double includeWeekSupplyOption, String weekSupplyOptionName, Boolean useInvestmentCollections, Boolean provideStoreDepth, Boolean includeSoldNotStocked, Boolean includeNewNumbers, Boolean orderAllSkus, Boolean returnAllSKUs, @@ -661,6 +661,7 @@ LOGGER.info ( "Create new session| the row is created " + row ); if ( row > 0 ) { + LOGGER.info ( "Create new session|keyholder for sessionId " + "keyHolder " + keyHolder.getKey() ); final BigDecimal sessionId = (BigDecimal) keyHolder.getKey ( ); LOGGER.info ( "Create new session|keyholder for sessionId " + sessionId + "keyHolder " + keyHolder ); @@ -4984,14 +4985,14 @@ return sj.toString ( ); } -// @Override -// public List> getMinMaxSessionUnselectedProducts (int sessionId, Integer siteId ) { -// return jdbcTemplate.queryForList ( "select mmcl.LINE_ID as \"id\", mmcl.FIELD_ABBR as \"code\", 'false' as \"line\", 14 as \"orderCycle\",7 as \"leadTime\" , 'false' as \"perCar\", 'true' as \"isStockEditOff\" from MIN_MAX_CALC_LINE mmcl \n" + -// "where mmcl.ACTIVE_FLAG = 1 and mmcl.LINE_ID in (\n" + -// "select LINE_ID from MIN_MAX_CALC_LINE where LINE_ID not in (select PRODUCT_LINE_ID from MIN_MAX_SESSION_PROD_LINE where SESSION_ID = " + sessionId + " and site_id= "+ siteId + " )\n" + -// "and ACTIVE_FLAG = 1\n" + -// ") order by mmcl.FIELD_ABBR" ); -// } + @Override + public List> getMinMaxSessionUnselectedProducts (int sessionId, Integer siteId ) { + return jdbcTemplate.queryForList ( "select mmcl.LINE_ID as \"id\", mmcl.FIELD_ABBR as \"code\", 'false' as \"line\", 14 as \"orderCycle\",7 as \"leadTime\" , 'false' as \"perCar\", 'true' as \"isStockEditOff\" from MIN_MAX_CALC_LINE mmcl \n" + + "where mmcl.ACTIVE_FLAG = 1 and mmcl.LINE_ID in (\n" + + "select LINE_ID from MIN_MAX_CALC_LINE where LINE_ID not in (select PRODUCT_LINE_ID from MIN_MAX_SESSION_PROD_LINE where SESSION_ID = " + sessionId + " and site_id= "+ siteId + " )\n" + + "and ACTIVE_FLAG = 1\n" + + ") order by mmcl.FIELD_ABBR" ); + } @Override public ActionResult requestFinalizeSession ( int sessionId , RequestDatesDTO[] requestDatesArr , String messageText ,