diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java index cdb6bc31..ae71e539 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java @@ -89,6 +89,11 @@ public class EquipmentAssetDetailsController { .orderByAsc("BELONG_WORKSHOP","TEAM","ASSET_CLASSES","ASSET_DESCRIPTION"); result = equipmentAssetDetailsService.page(frontPage.getPagePlus(), queryWrapper); + for (int i = 0; i < result.getRecords().size(); i++) { + EquipmentAssetDetails assetDetails = (EquipmentAssetDetails) result.getRecords().get(i); + assetDetails.setSEQ((frontPage.getPage() - 1) * frontPage.getRows() + i + 1); + result.getRecords().set(i,assetDetails); + } return R.ok(result); } 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 5dd8c64c..0f5cf728 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 @@ -442,6 +442,20 @@ public class ReportController { } } + /** + * 工作令有效生产报表 + * @param paramMap + * @return + */ + @GetMapping("/workOrderEffectiveProductionReport") + public R workOrderEffectiveProductionReport(@RequestParam(required = false) Map paramMap){ + try{ + return R.ok(reportService.workOrderEffectiveProductionReport(paramMap)); + }catch (Exception e){ + return R.failed(e.getMessage()); + } + } + /** * 工时统计报表 * @param paramMap 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 65e1560d..8b1ca79e 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 @@ -225,4 +225,11 @@ public interface ReportMapper { * @return */ List> qualityProblemsInfoReport(Map paramMap); + + /** + * 工作令有效生产报表 + * @param paramMap + * @return + */ + List> workOrderEffectiveProductionReport(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 cb251bed..649b4e4b 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 @@ -236,4 +236,11 @@ public interface ReportService { * @return */ List> qualityProblemsInfoReport(Map paramMap); + + /** + * 工作令有效生产报表 + * @param paramMap + * @return + */ + List> workOrderEffectiveProductionReport(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 c0be83ee..5ec4a9c3 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 @@ -1262,6 +1262,18 @@ public class ReportServiceImpl implements ReportService { paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); return reportMapper.assignedWorkersOrdersReport(paramMap); } + /** + * 工作令有效生产报表 + * @param paramMap + * @return + */ + @Override + public List> workOrderEffectiveProductionReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.workOrderEffectiveProductionReport(paramMap); + } /** * 工时统计报表 @@ -1381,6 +1393,8 @@ public class ReportServiceImpl implements ReportService { return qualityInspectionReport; } + + /** * 事业部质量看板数据接口 * @param user diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 8387316f..73002b5a 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2080,55 +2080,7 @@ + \ No newline at end of file