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/service/impl/QualityReportServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
index ee11f8e..f01f315 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityReportServiceImpl.java
@@ -1,13 +1,10 @@
package com.ruoyi.quality.service.impl;
+import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.basic.service.IProductService;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.quality.dto.QualityPassRateDto;
-import com.ruoyi.quality.dto.QualityInspectStatDto;
-import com.ruoyi.quality.dto.QualityMonthlyPassRateDto;
-import com.ruoyi.quality.dto.QualityMonthlyDetailDto;
-import com.ruoyi.quality.dto.QualityParameterStatDto;
-import com.ruoyi.quality.dto.QualityMonthlyPassRateWrapperDto;
-import com.ruoyi.quality.dto.QualityTopParameterDto;
+import com.ruoyi.production.service.ProductOrderService;
+import com.ruoyi.quality.dto.*;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.service.QualityReportService;
import org.springframework.beans.BeanUtils;
@@ -59,11 +56,11 @@
QualityPassRateDto passRateDto = new QualityPassRateDto();
BeanUtils.copyProperties(dto, passRateDto);
- if (dto.getInspectType() == 0) {
+ if (dto.getModelType() == 0) {
wrapper.setRawMaterial(passRateDto);
- } else if (dto.getInspectType() == 1) {
+ } else if (dto.getModelType() == 1) {
wrapper.setProcess(passRateDto);
- } else if (dto.getInspectType() == 2) {
+ } else if (dto.getModelType() == 2) {
wrapper.setOutgoing(passRateDto);
}
}
@@ -90,11 +87,11 @@
}
@Override
- public QualityTopParameterDto getTopParameters(Integer inspectType) {
- if (inspectType == null) {
+ public QualityTopParameterDto getTopParameters(Integer modelType) {
+ if (modelType == null) {
return new QualityTopParameterDto();
}
- List<QualityParameterStatDto> list = qualityInspectMapper.getTopParameters(inspectType);
+ List<QualityParameterStatDto> list = qualityInspectMapper.getTopParameters(modelType);
BigDecimal total = list.stream()
.map(QualityParameterStatDto::getCount)
--
Gitblit v1.9.3