From 422a5676c2d96dd37c1be62935a314d70fef79b5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 15 七月 2026 15:28:04 +0800
Subject: [PATCH] 修改不合格管理

---
 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 328c358..fef8ef1 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -17,6 +17,8 @@
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
 import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.pojo.ProductionProductMain;
 import com.ruoyi.quality.dto.QualityInspectDto;
 import com.ruoyi.quality.mapper.QualityInspectMapper;
 import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -67,6 +69,8 @@
     private SalesLedgerProductMapper salesLedgerProductMapper;
 
     private ProcurementRecordService procurementRecordService;
+
+    private ProductionProductMainMapper productionProductMainMapper;
 
     @Override
     public int add(QualityInspectDto qualityInspectDto) {
@@ -148,6 +152,7 @@
             qualityUnqualified.setInspectState(0);//寰呭鐞�
             qualityUnqualified.setQuantity(qualityInspect.getUnqualifiedQuantity());
             qualityUnqualified.setProductModelId(qualityInspect.getProductModelId());
+            applyDealTypeByReportType(qualityInspect, qualityUnqualified);
             List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
             String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
             qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
@@ -159,6 +164,32 @@
         return qualityInspectMapper.updateById(qualityInspect);
     }
 
+    private void applyDealTypeByReportType(QualityInspect qualityInspect, QualityUnqualified qualityUnqualified) {
+        if (qualityInspect == null || qualityUnqualified == null || qualityInspect.getProductMainId() == null) {
+            return;
+        }
+        ProductionProductMain productMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());
+        if (productMain == null || productMain.getReportType() == null) {
+            return;
+        }
+        switch (productMain.getReportType()) {
+            case 1:
+                qualityUnqualified.setDealType(0);
+                qualityUnqualified.setDealResult("鎶ュ伐");
+                break;
+            case 2:
+                qualityUnqualified.setDealType(1);
+                qualityUnqualified.setDealResult("鎶ュ伐");
+                break;
+            case 3:
+                qualityUnqualified.setDealType(2);
+                qualityUnqualified.setDealResult("鎶ュ簾");
+                break;
+            default:
+                break;
+        }
+    }
+
     @Override
     public R autoSubmit(Long id) {
         if (id == null) {

--
Gitblit v1.9.3