diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 0bea8739..a770c956 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -145,4 +145,16 @@ public class ReportController { return R.failed(e.getMessage()); } } + + /** + * 工作令加工进度表 + */ + @GetMapping("/findWorkOrderSchedule") + public R findWorkOrderSchedule(@RequestParam(required = false) Map paramMap){ + try{ + return R.ok(reportService.findWorkOrderSchedule(paramMap)); + }catch (Exception e){ + return R.failed(e.getMessage()); + } + } } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index 3fd8e2e0..7eef62d6 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -50,4 +50,11 @@ public interface ReportMapper { * @return 返回值 */ List> findOperatorScheduleReport(Map paramMap); + + /** + * 工作令加工进度表 + * @param paramMap 参数 + * @return 返回值 + */ + List> findWorkOrderSchedule(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index e5629f41..efd29558 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -54,4 +54,11 @@ public interface ReportService { * @return 返回值 */ List> findOperatorScheduleReport(Map paramMap); + + /** + * 工作令加工进度表 + * @param paramMap 参数 + * @return 返回值 + */ + List> findWorkOrderSchedule(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 347768d1..1ca86db7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -313,6 +313,14 @@ public class ReportServiceImpl implements ReportService { paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage()); return reportMapper.findOperatorScheduleReport(paramMap); } + + @Override + public List> findWorkOrderSchedule(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site",site); + paramMap.put("locale",LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.findWorkOrderSchedule(paramMap); + } } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index ee0b511a..82eef934 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -668,4 +668,96 @@ + + \ No newline at end of file