From c67c0cf5b535606edbfa0e9841f3ee8df1a21d07 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 2 Nov 2022 09:37:19 +0800 Subject: [PATCH] =?UTF-8?q?add=E6=9C=BA=E5=8F=B0=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E6=97=B6=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/ReportController.java | 14 ++ .../mesnac/anomaly/mapper/ReportMapper.java | 7 + .../mesnac/anomaly/service/ReportService.java | 8 + .../service/impl/ReportServiceImpl.java | 66 +++++++++ .../main/resources/mapper/ReportMapper.xml | 138 +++++++++++++++++- 5 files changed, 231 insertions(+), 2 deletions(-) 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 0f5cf728..904d05db 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 @@ -484,6 +484,20 @@ public class ReportController { } } + /** + * 机台已完工工时报表 + * @param + * @return + */ + @GetMapping("/machineFinishedTimeReport") + public R machineFinishedTimeReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.machineFinishedTimeReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 项目生产加工周期看板 * @param 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 8b1ca79e..c568b048 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 @@ -232,4 +232,11 @@ public interface ReportMapper { * @return */ List> workOrderEffectiveProductionReport(Map paramMap); + + /** + * 机台已完工工时报表 + * @param paramMap + * @return + */ + List> machineFinishedTimeReport(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 649b4e4b..2de20db1 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 @@ -243,4 +243,12 @@ public interface ReportService { * @return */ List> workOrderEffectiveProductionReport(Map paramMap); + + /** + * 工作令有效生产报表 + * @param paramMap + * @return + */ + List> machineFinishedTimeReport(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 166554eb..c31320be 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 @@ -1282,6 +1282,72 @@ public class ReportServiceImpl implements ReportService { return reportMapper.workOrderEffectiveProductionReport(paramMap); } + /** + * 机台已完工工时报表 + * @param paramMap + * @return + */ + @Override + public List> machineFinishedTimeReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + List> result = reportMapper.machineFinishedTimeReport(paramMap); + HashMap countMap = new HashMap<>(); + countMap.put("workCenterDescription","总计:"); + Float monthCapacity = 0.00f; + Float tardinessWork = 0.00f; + Float workHours1 = 0.00f; + Float workHours2 = 0.00f; + Float workHours3 = 0.00f; + Float workHours4 = 0.00f; + Float workHours5 = 0.00f; + Float workHours6 = 0.00f; + Float workHours7 = 0.00f; + Float workHours8 = 0.00f; + Float workHours9 = 0.00f; + Float workHours10 = 0.00f; + Float workHours11= 0.00f; + Float workHours12 = 0.00f; + Float totalWorkingHours = 0.00f; + for (Map map : result) { + if (!StringUtils.isBlank(map.get("monthCapacity"))){ + monthCapacity += Float.valueOf(String.valueOf(map.get("monthCapacity"))); + } + workHours1 += Float.valueOf(String.valueOf(map.get("workHours1"))); + workHours2 += Float.valueOf(String.valueOf(map.get("workHours2"))); + workHours3 += Float.valueOf(String.valueOf(map.get("workHours3"))); + workHours4 += Float.valueOf(String.valueOf(map.get("workHours4"))); + workHours5 += Float.valueOf(String.valueOf(map.get("workHours5"))); + workHours6 += Float.valueOf(String.valueOf(map.get("workHours6"))); + workHours7 += Float.valueOf(String.valueOf(map.get("workHours7"))); + workHours8 += Float.valueOf(String.valueOf(map.get("workHours8"))); + workHours9 += Float.valueOf(String.valueOf(map.get("workHours9"))); + workHours10 += Float.valueOf(String.valueOf(map.get("workHours10"))); + workHours11 += Float.valueOf(String.valueOf(map.get("workHours11"))); + workHours12 += Float.valueOf(String.valueOf(map.get("workHours12"))); + tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork"))); + totalWorkingHours += Float.valueOf(String.valueOf(map.get("totalWorkingHours"))); + } + countMap.put("tardinessWork",String.format("%.2f",tardinessWork)); + countMap.put("monthCapacity",String.format("%.2f",monthCapacity)); + countMap.put("workHours1",String.format("%.2f",workHours1)); + countMap.put("workHours2",String.format("%.2f",workHours2)); + countMap.put("workHours3",String.format("%.2f",workHours3)); + countMap.put("workHours4",String.format("%.2f",workHours4)); + countMap.put("workHours5",String.format("%.2f",workHours5)); + countMap.put("workHours6",String.format("%.2f",workHours6)); + countMap.put("workHours7",String.format("%.2f",workHours7)); + countMap.put("workHours8",String.format("%.2f",workHours8)); + countMap.put("workHours9",String.format("%.2f",workHours9)); + countMap.put("workHours10",String.format("%.2f",workHours10)); + countMap.put("workHours11",String.format("%.2f",workHours11)); + countMap.put("workHours12",String.format("%.2f",workHours12)); + countMap.put("totalWorkingHours",String.format("%.2f",totalWorkingHours)); + result.add(countMap); + return result; + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index b2c7ce60..a8a1baae 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2357,7 +2357,7 @@ GROUP BY wct.DESCRIPTION, WIP.USER_NAME ORDER BY wct.DESCRIPTION, WIP.USER_NAME - --质量问题统计表 SELECT zab.CREATED_DATE_TIME, zab.ABNORMAL_NO ABNORMAL_NO, @@ -2454,7 +2454,7 @@ SELECT zab.CREATED_DATE_TIME, znu2.FULL_NAME, dflt2.DATA_TAG, zabd.ROUTER_BO ORDER BY zab.CREATED_DATE_TIME DESC - --工作令有效生产报表 SELECT * FROM WORKORDER_EFFECTIVE_PRODUCTION_REPORT WIP WHERE 1=1 @@ -2471,5 +2471,139 @@ SELECT zab.CREATED_DATE_TIME, AND WIP.ITEM_DESCRIPTION like '%${itemDescription}%' + \ No newline at end of file