| | |
| | | return infoList; |
| | | } |
| | | /** |
| | | * 近七日到货情况 |
| | | * 近七日到货情况-改成近15日 |
| | | * @return |
| | | */ |
| | | @Override |
| | |
| | | param.getFacrotyCodeList().add(code);//查询指定厂区 |
| | | } |
| | | Date date = new Date(); |
| | | Date startDate = DateUtil.addDaysToDate(date,-7); |
| | | Date startDate = DateUtil.addDaysToDate(date,-15); |
| | | //看板大屏近7日到货情况日期 0表示当天当前推7天,-1表示本月初1号-7号 |
| | | String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode(); |
| | | if(StringUtils.equals(flag,"-1")){ |
| | | startDate =DateUtil.getBeginDayOfMonth(0); |
| | | date = DateUtil.addDaysToDate(startDate,7); |
| | | date = DateUtil.addDaysToDate(startDate,15); |
| | | } |
| | | param.setNcCreateDateFrom(DateUtil.getShortTime(startDate)); |
| | | param.setNcCreateDateThrough(DateUtil.getShortTime(date)); |
| | | List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//查询出库量 |
| | | for (int i = 0; i < 7; i++) { |
| | | for (int i = 0; i < 15; i++) { |
| | | LastSevenDaysOrderVo model = new LastSevenDaysOrderVo(); |
| | | Date td = DateUtil.addDaysToDate(date,-i); |
| | | model.setDateStr(DateUtil.getShortTime(td)); |