update - add质量报表

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<HashMap<String, Object>> list = productionReportService.productionExecutionReportList(hashMap);
+        return success(list);
+    }
+
+    /**
+     * 查询在制品查询报表
+     */
+    @GetMapping("/WIPInquiryReportList")
+    public AjaxResult WIPInquiryReportList(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> list = productionReportService.WIPInquiryReportList(hashMap);
+        return success(list);
+    }
 
 }

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<HashMap<String, Object>> list = qualityReportService.qualityDefectsStatisticalAnalysisList(hashMap);
+        return success(list);
+    }
+
+    /**
+     * 少错件报表
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/fewerMistakesReportList")
+    public AjaxResult fewerMistakesReportList(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> list = qualityReportService.fewerMistakesReportList(hashMap);
+        return success(list);
+    }
+
+
+    /**
+     * 质量问题前80报表
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/qualityIssuesReportList")
+    public AjaxResult qualityIssuesReportList(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> list = qualityReportService.qualityIssuesReportList(hashMap);
+        return success(list);
+    }
+
+    /**
+     * 产品追溯报表
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/productTraceabilityReportList")
+    public AjaxResult productTraceabilityReportList(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> list = qualityReportService.productTraceabilityReportList(hashMap);
+        return success(list);
+    }
+
+}

aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java

@@ -21,7 +21,47 @@ public interface GeneralReportMapper {
     List<HashMap<String, Object>> inventoryRateReportList(Map hashMap);
 
 
+    /**
+     * 查询生产执行报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> productionExecutionReportList(Map hashMap);
+
+    /**
+     * 查询在制品查询报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> WIPInquiryReportList(Map hashMap);
+
+    /**
+     * 质量缺陷统计分析
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> qualityDefectsStatisticalAnalysisList(Map hashMap);
 
 
+    /**
+     * 少错件报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> fewerMistakesReportList(Map hashMap);
+
+
+    /**
+     * 质量问题前80报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> qualityIssuesReportList(Map hashMap);
 
+    /**
+     * 产品追溯报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> productTraceabilityReportList(Map hashMap);
 }

aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java

@@ -21,4 +21,18 @@ public interface IProductionReportService
     List<HashMap<String, Object>> inventoryRateReportList(Map hashMap);
 
 
+    /**
+     * 查询生产执行报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> productionExecutionReportList(Map hashMap);
+
+
+    /**
+     * 查询在制品查询报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> WIPInquiryReportList(Map hashMap);
 }

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<HashMap<String, Object>> qualityDefectsStatisticalAnalysisList(Map hashMap);
+
+    /**
+     * 少错件报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> fewerMistakesReportList(Map hashMap);
+
+    /**
+     * 质量问题前80报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> qualityIssuesReportList(Map hashMap);
+
+    /**
+     * 产品追溯报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> productTraceabilityReportList(Map hashMap);
+}

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<HashMap<String, Object>> productionExecutionReportList(Map hashMap) {
+        return reportMapper.productionExecutionReportList(hashMap);
+    }
+
+    /**
+     * 查询在制品查询报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> WIPInquiryReportList(Map hashMap) {
+        return reportMapper.WIPInquiryReportList(hashMap);
+    }
+
 
 }

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<HashMap<String, Object>> qualityDefectsStatisticalAnalysisList(Map hashMap) {
+        return reportMapper.qualityDefectsStatisticalAnalysisList(hashMap);
+    }
+
+    /**
+     * 少错件报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> fewerMistakesReportList(Map hashMap) {
+        return reportMapper.fewerMistakesReportList(hashMap);
+    }
+
+    /**
+     * 质量问题前80报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> qualityIssuesReportList(Map hashMap) {
+        return reportMapper.qualityIssuesReportList(hashMap);
+    }
+
+
+    /**
+     * 产品追溯报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> productTraceabilityReportList(Map hashMap) {
+        return reportMapper.productTraceabilityReportList(hashMap);
+    }
+
+}

aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml

@@ -36,5 +36,32 @@
         ORDER BY ORDER_RATE
     </select>
 
+    <select id="productionExecutionReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+
+    <select id="WIPInquiryReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+
+    <select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+    <select id="fewerMistakesReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+    <select id="qualityIssuesReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+    <select id="productTraceabilityReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_MATERIAL_COMPLETION
+    </select>
+
 
 </mapper>