From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index fa6820f..e60216d 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -1,15 +1,12 @@
package com.ruoyi.quality.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityReportService;
-import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* <p>
@@ -19,6 +16,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-14 03:39:49
*/
+@Api(tags = "璐ㄩ噺绠＄悊")
@RestController
@RequestMapping("/qualityReport")
public class QualityReportController {
@@ -26,6 +24,58 @@
@Autowired
private QualityReportService qualityReportService;
+ /**
+ * 鑾峰彇妫�楠岀粺璁℃暟鎹�
+ */
+ @ApiOperation("鑾峰彇妫�楠岀粺璁℃暟鎹�")
+ @GetMapping("/getInspectStatistics")
+ public AjaxResult getInspectStatistics() {
+ return AjaxResult.success(qualityReportService.getInspectStatistics());
+ }
+ /**
+ * 鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�
+ */
+ @ApiOperation("鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
+ @GetMapping("/getPassRateStatistics")
+ public AjaxResult getPassRateStatistics() {
+ return AjaxResult.success(qualityReportService.getPassRateStatistics());
+ }
+
+ /**
+ * 鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�
+ */
+ @ApiOperation("鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
+ @GetMapping("/getMonthlyPassRateStatistics")
+ public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
+ }
+
+ /**
+ * 鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁
+ */
+ @ApiOperation("鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
+ @GetMapping("/getYearlyPassRateStatistics")
+ public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
+ }
+
+ /**
+ * 鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁
+ */
+ @ApiOperation("鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
+ @GetMapping("/getMonthlyCompletionDetails")
+ public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
+ return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
+ }
+
+ /**
+ * 鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�
+ */
+ @ApiOperation("鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
+ @GetMapping("/getTopParameters")
+ public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
+ return AjaxResult.success(qualityReportService.getTopParameters(modelType));
+ }
}
--
Gitblit v1.9.3