From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 349fe3c..fcaceb6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,11 +2,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.procurementrecord.utils.StockUtils;
 import com.ruoyi.quality.dto.QualityInspectDto;
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -14,12 +10,11 @@
 import com.ruoyi.quality.service.IQualityInspectFileService;
 import com.ruoyi.quality.service.IQualityInspectParamService;
 import com.ruoyi.quality.service.IQualityInspectService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -27,24 +22,17 @@
  */
 @RestController
 @RequestMapping("/quality/qualityInspect")
+@AllArgsConstructor
 public class QualityInspectController {
 
-    @Resource
     private IQualityInspectService qualityInspectService;
-
-    @Resource
     private IQualityInspectParamService qualityInspectParamService;
-
-    @Resource
     private IQualityInspectFileService qualityInspectFileService;
-    @Autowired
-    private ProcurementRecordService procurementRecordService;
-    @Autowired
-    private StockUtils stockUtils;
 
 
     /**
      * 鏂板
+     *
      * @param qualityInspectDto
      * @return
      */
@@ -55,33 +43,35 @@
 
     /**
      * 鍒犻櫎
+     *
      * @param ids
      * @return
      */
     @DeleteMapping("/del")
     public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
-        if(CollectionUtils.isEmpty(ids)){
+        if (CollectionUtils.isEmpty(ids)) {
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         //濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
         List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
         for (QualityInspect qualityInspect : qualityInspects) {
-            if(qualityInspect.getInspectState()==1){
-               throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+            if (qualityInspect.getInspectState() == 1) {
+                throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
             }
         }
         //鍒犻櫎妫�楠屽弬鏁�
         qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
-        .in(QualityInspectParam::getInspectId,ids));
+                .in(QualityInspectParam::getInspectId, ids));
         //鍒犻櫎妫�楠岄檮浠�
         qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
-        .in(QualityInspectFile::getInspectId,ids));
+                .in(QualityInspectFile::getInspectId, ids));
         //鍒犻櫎妫�楠屽崟
         return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
     }
 
     /**
      * 璇︽儏
+     *
      * @param id
      * @return
      */
@@ -92,6 +82,7 @@
 
     /**
      * 淇敼
+     *
      * @param qualityInspectDto
      * @return
      */
@@ -101,7 +92,8 @@
     }
 
     /**
-     *鍒嗛〉鏌ヨ
+     * 鍒嗛〉鏌ヨ
+     *
      * @param page
      * @param qualityInspect
      * @return
@@ -113,16 +105,18 @@
 
     /**
      * 瀵煎嚭
+     *
      * @param response
      * @param qualityInspect
      */
     @PostMapping("/export")
-    public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
+    public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
         qualityInspectService.qualityInspectExport(response, qualityInspect);
     }
 
     /**
      * 鎻愪氦
+     *
      * @param qualityInspect
      * @return
      */
@@ -133,11 +127,12 @@
 
     /**
      * 涓嬭浇
+     *
      * @param response
      * @param qualityInspect
      */
     @PostMapping("/down")
-    public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
+    public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
         qualityInspectService.down(response, qualityInspect);
     }
 }

--
Gitblit v1.9.3