Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -r2f847927b50809577f6964aa36ec3f08500d69ed -re86caf3294d4569f05958f313f6749f2b5596b90 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 2f847927b50809577f6964aa36ec3f08500d69ed) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision e86caf3294d4569f05958f313f6749f2b5596b90) @@ -1000,7 +1000,7 @@ start = System.currentTimeMillis ( ); String siteIds = Arrays.toString ( sitesArray ).replace ( "[" , "" ).replace ( "]" , "" ); - String sql="update MIN_MAX_SITE_PREFERENCES set IS_SELECTED=0,PER_CAR=0 where site_id in ( "+ siteIds +" ) "; + String sql="update MIN_MAX_SITE_PREFERENCES set IS_SELECTED=0,PER_CAR=0,LEAD_TIME_STATUS='N' where site_id in ( "+ siteIds +" ) "; jdbcTemplate.update(sql); jdbcTemplate.batchUpdate ( "merge into MIN_MAX_SITE_PREFERENCES d " + @@ -4854,7 +4854,7 @@ String sql = (sites == null || sites.length == 0) ? "SELECT MM.LINE_ID as \"id\", MM.FIELD_ABBR as \"code\", 7 as \"leadTime\", 14 as \"orderCycle\", 1 as \"perCar\",1 as \"isSelected\", 1 as \"isOrderCycleEditOff\",1 as \"isLeadTimeEditOff\" FROM MIN_MAX_CALC_LINE MM where MM.active_flag = 1 order by mm.field_abbr asc" : "\n" + - "select c.line_id as \"id\",\n" + + "select c.line_id as \"id\", c.LEAD_TIME_STATUS \"leadTimeStatus\",\n" + " c.field_abbr as \"code\",\n" + " case\n" + " when nvl(c.lead_time_cnt,0)=0 then 7\n" + @@ -4905,18 +4905,19 @@ " else -1\n" + " end as \"isSelected\", 1 as \"isOrderCycleEditOff\",1 as \"isLeadTimeEditOff\" \n" + "from (\n" + - " select line_id,field_abbr,order_cycle_cnt,lead_time_cnt,per_car,is_selected\n" + + " select line_id,field_abbr,order_cycle_cnt,lead_time_cnt,per_car,is_selected, LEAD_TIME_STATUS\n" + " from\n" + " (select line_id,field_abbr\n" + " from min_max_calc_line l where l.active_flag=1) a\n" + " left outer join\n" + " (select distinct p.product_line_id,\n" + + " p.LEAD_TIME_STATUS as LEAD_TIME_STATUS,"+ " count(distinct p.lead_time) lead_time_cnt,\n" + " count(distinct order_cycle) order_cycle_cnt,\n" + " count(distinct p.per_car) per_car,\n" + " count(distinct p.is_selected) is_selected\n" + " from min_max_site_preferences p where site_id in (" + siteIds + ")\n" + - " group by product_line_id) b\n" + + " group by product_line_id,LEAD_TIME_STATUS) b\n" + " on a.line_id=b.product_line_id) c\n" + "order by c.field_abbr"; List> obj = jdbcTemplate.queryForList ( sql ); Index: src/main/java/com/napa/pulse/entity/pulseui/MinMaxSitePref.java =================================================================== diff -u -rdae1b70d13a4534e94802fb8b8321ad450fbc464 -re86caf3294d4569f05958f313f6749f2b5596b90 --- src/main/java/com/napa/pulse/entity/pulseui/MinMaxSitePref.java (.../MinMaxSitePref.java) (revision dae1b70d13a4534e94802fb8b8321ad450fbc464) +++ src/main/java/com/napa/pulse/entity/pulseui/MinMaxSitePref.java (.../MinMaxSitePref.java) (revision e86caf3294d4569f05958f313f6749f2b5596b90) @@ -24,6 +24,9 @@ @Column( name = "LEAD_TIME") Integer leadTime; + @Column( name = "LEAD_TIME_STATUS") + Character leadTimeStatus; + // @Column(name = "ORDER_CYCLE") // Integer orderCycle; Index: src/main/java/com/napa/pulse/service/impl/LeadTimeServiceImpl.java =================================================================== diff -u -rdae1b70d13a4534e94802fb8b8321ad450fbc464 -re86caf3294d4569f05958f313f6749f2b5596b90 --- src/main/java/com/napa/pulse/service/impl/LeadTimeServiceImpl.java (.../LeadTimeServiceImpl.java) (revision dae1b70d13a4534e94802fb8b8321ad450fbc464) +++ src/main/java/com/napa/pulse/service/impl/LeadTimeServiceImpl.java (.../LeadTimeServiceImpl.java) (revision e86caf3294d4569f05958f313f6749f2b5596b90) @@ -122,6 +122,7 @@ objPref.setLineId(obj.getLineId()); int leadTimeValue = fdLnGrCd.getVndrLeadTime() != null ? fdLnGrCd.getVndrLeadTime() : fdLnGrCd.getDcLeadTime() != null ? fdLnGrCd.getDcLeadTime() : 7; objPref.setLeadTime(leadTimeValue); + objPref.setLeadTimeStatus('Y'); mmspRepo.save(objPref); }