From 1b912a25864dfbe6968740738afe7c042919724a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 15:53:21 +0800
Subject: [PATCH] 生产报工的报废未进入库存记录页面中+不合格处理后不能删除
---
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