From 9051058a2ee82173df1f854c78e7ef040dac1aca Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 13 Dec 2023 15:00:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20add=E8=B4=A8=E9=87=8F=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionReportController.java | 19 ++++- .../controller/QualityReportController.java | 74 +++++++++++++++++++ .../report/mapper/GeneralReportMapper.java | 40 ++++++++++ .../service/IProductionReportService.java | 14 ++++ .../report/service/IQualityReportService.java | 44 +++++++++++ .../impl/ProductionReportServiceImpl.java | 20 +++++ .../impl/QualityReportServiceImpl.java | 65 ++++++++++++++++ .../mapper/report/GeneralReportMapper.xml | 27 +++++++ 8 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java index 9e95a42..9b6afc3 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; /** - * PDA管理Controller + * 生产报表Controller * * @author Yinq * @date 2023-11-21 @@ -33,5 +33,22 @@ public class ProductionReportController extends BaseController { return success(list); } + /** + * 查询生产执行报表 + */ + @GetMapping("/productionExecutionReportList") + public AjaxResult productionExecutionReportList(@RequestParam(required = false) Map hashMap) { + List> list = productionReportService.productionExecutionReportList(hashMap); + return success(list); + } + + /** + * 查询在制品查询报表 + */ + @GetMapping("/WIPInquiryReportList") + public AjaxResult WIPInquiryReportList(@RequestParam(required = false) Map hashMap) { + List> list = productionReportService.WIPInquiryReportList(hashMap); + return success(list); + } } diff --git a/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java new file mode 100644 index 0000000..cf0e2a8 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java @@ -0,0 +1,74 @@ +package com.aucma.report.controller; + +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.report.service.IQualityReportService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 质量报表Controller + * + * @author Yinq + * @date 2023-11-21 + */ +@RestController +@RequestMapping("/report/qualityReport") +public class QualityReportController extends BaseController { + @Autowired + private IQualityReportService qualityReportService; + + + /** + * 质量缺陷统计分析 + * @param hashMap + * @return + */ + @GetMapping("/qualityDefectsStatisticalAnalysisList") + public AjaxResult qualityDefectsStatisticalAnalysisList(@RequestParam(required = false) Map hashMap) { + List> list = qualityReportService.qualityDefectsStatisticalAnalysisList(hashMap); + return success(list); + } + + /** + * 少错件报表 + * @param hashMap + * @return + */ + @GetMapping("/fewerMistakesReportList") + public AjaxResult fewerMistakesReportList(@RequestParam(required = false) Map hashMap) { + List> list = qualityReportService.fewerMistakesReportList(hashMap); + return success(list); + } + + + /** + * 质量问题前80报表 + * @param hashMap + * @return + */ + @GetMapping("/qualityIssuesReportList") + public AjaxResult qualityIssuesReportList(@RequestParam(required = false) Map hashMap) { + List> list = qualityReportService.qualityIssuesReportList(hashMap); + return success(list); + } + + /** + * 产品追溯报表 + * @param hashMap + * @return + */ + @GetMapping("/productTraceabilityReportList") + public AjaxResult productTraceabilityReportList(@RequestParam(required = false) Map hashMap) { + List> list = qualityReportService.productTraceabilityReportList(hashMap); + return success(list); + } + +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java index 7dac0b0..7dbe2b5 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java @@ -21,7 +21,47 @@ public interface GeneralReportMapper { List> inventoryRateReportList(Map hashMap); + /** + * 查询生产执行报表 + * @param hashMap + * @return + */ + List> productionExecutionReportList(Map hashMap); + + /** + * 查询在制品查询报表 + * @param hashMap + * @return + */ + List> WIPInquiryReportList(Map hashMap); + + /** + * 质量缺陷统计分析 + * @param hashMap + * @return + */ + List> qualityDefectsStatisticalAnalysisList(Map hashMap); + /** + * 少错件报表 + * @param hashMap + * @return + */ + List> fewerMistakesReportList(Map hashMap); + + /** + * 质量问题前80报表 + * @param hashMap + * @return + */ + List> qualityIssuesReportList(Map hashMap); + + /** + * 产品追溯报表 + * @param hashMap + * @return + */ + List> productTraceabilityReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java index c991127..9d5f2c4 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java @@ -21,4 +21,18 @@ public interface IProductionReportService List> inventoryRateReportList(Map hashMap); + /** + * 查询生产执行报表 + * @param hashMap + * @return + */ + List> productionExecutionReportList(Map hashMap); + + + /** + * 查询在制品查询报表 + * @param hashMap + * @return + */ + List> WIPInquiryReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java new file mode 100644 index 0000000..4535fb0 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java @@ -0,0 +1,44 @@ +package com.aucma.report.service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * PDA管理Service接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface IQualityReportService +{ + + + /** + * 质量缺陷统计分析 + * @param hashMap + * @return + */ + List> qualityDefectsStatisticalAnalysisList(Map hashMap); + + /** + * 少错件报表 + * @param hashMap + * @return + */ + List> fewerMistakesReportList(Map hashMap); + + /** + * 质量问题前80报表 + * @param hashMap + * @return + */ + List> qualityIssuesReportList(Map hashMap); + + /** + * 产品追溯报表 + * @param hashMap + * @return + */ + List> productTraceabilityReportList(Map hashMap); +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java index 6ce2035..12ace3a 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -29,5 +29,25 @@ public class ProductionReportServiceImpl implements IProductionReportService { return reportMapper.inventoryRateReportList(hashMap); } + /** + * 查询生产执行报表 + * @param hashMap + * @return + */ + @Override + public List> productionExecutionReportList(Map hashMap) { + return reportMapper.productionExecutionReportList(hashMap); + } + + /** + * 查询在制品查询报表 + * @param hashMap + * @return + */ + @Override + public List> WIPInquiryReportList(Map hashMap) { + return reportMapper.WIPInquiryReportList(hashMap); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java new file mode 100644 index 0000000..4c07669 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java @@ -0,0 +1,65 @@ +package com.aucma.report.service.impl; + +import com.aucma.report.mapper.GeneralReportMapper; +import com.aucma.report.service.IProductionReportService; +import com.aucma.report.service.IQualityReportService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * PDA管理Service业务层处理 + * + * @author Yinq + * @date 2023-11-21 + */ +@Service +public class QualityReportServiceImpl implements IQualityReportService { + @Autowired + private GeneralReportMapper reportMapper; + + /** + * 质量缺陷统计分析 + * @param hashMap + * @return + */ + @Override + public List> qualityDefectsStatisticalAnalysisList(Map hashMap) { + return reportMapper.qualityDefectsStatisticalAnalysisList(hashMap); + } + + /** + * 少错件报表 + * @param hashMap + * @return + */ + @Override + public List> fewerMistakesReportList(Map hashMap) { + return reportMapper.fewerMistakesReportList(hashMap); + } + + /** + * 质量问题前80报表 + * @param hashMap + * @return + */ + @Override + public List> qualityIssuesReportList(Map hashMap) { + return reportMapper.qualityIssuesReportList(hashMap); + } + + + /** + * 产品追溯报表 + * @param hashMap + * @return + */ + @Override + public List> productTraceabilityReportList(Map hashMap) { + return reportMapper.productTraceabilityReportList(hashMap); + } + +} diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 0da8f1a..e08fa52 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -36,5 +36,32 @@ ORDER BY ORDER_RATE + + + + + + + + +