From 3bdaa5708b94e64f813f70ede8ba0bbd1a3179ec Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 15:08:01 +0800
Subject: [PATCH] 成品检数据查询

---
 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java |   72 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 3348a8e..1994c07 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,21 +2,22 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.procurementrecord.service.impl.ProcurementRecordServiceImpl;
 import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.quality.dto.FinishedPageDto;
+import com.ruoyi.quality.dto.ProcessPageDto;
 import com.ruoyi.quality.dto.QualityInspectDto;
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectFile;
 import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityUnqualified;
 import com.ruoyi.quality.service.IQualityInspectFileService;
 import com.ruoyi.quality.service.IQualityInspectParamService;
 import com.ruoyi.quality.service.IQualityInspectService;
-import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,7 @@
  * 鍘熸潗鏂欐楠�/杩囩▼妫�楠�/鍑哄巶妫�楠�
  */
 @RestController
+@Api(tags = "璐ㄩ噺绠＄悊")
 @RequestMapping("/quality/qualityInspect")
 public class QualityInspectController {
 
@@ -66,16 +68,19 @@
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
+        //濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
+        List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
+        for (QualityInspect qualityInspect : qualityInspects) {
+            if(qualityInspect.getInspectState()==1){
+               throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+            }
+        }
         //鍒犻櫎妫�楠屽弬鏁�
         qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
         .in(QualityInspectParam::getInspectId,ids));
         //鍒犻櫎妫�楠岄檮浠�
         qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
         .in(QualityInspectFile::getInspectId,ids));
-        //鍒犻櫎鍏ュ簱璁板綍
-        for (Integer id : ids) {
-            stockUtils.deleteStockInRecord(Long.valueOf(id), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode());
-        }
         //鍒犻櫎妫�楠屽崟
         return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
     }
@@ -140,4 +145,53 @@
     public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
         qualityInspectService.down(response, qualityInspect);
     }
+
+    /************************************************瀹佸涓洓寤烘潗鐨勮繃绋嬫鍜屾垚鍝佹*********************************************************************************/
+
+    /**
+     * 杩囩▼妫�鍒嗛〉鏌ヨ
+     * @param page
+     * @param processPageDto
+     * @return
+     */
+    @GetMapping("/processPage")
+    @ApiOperation("杩囩▼妫�鍒嗛〉鏌ヨ")
+    public AjaxResult processPage(Page page, ProcessPageDto processPageDto) {
+        return AjaxResult.success(qualityInspectService.processPage(page, processPageDto));
+    }
+
+    /**
+     * 杩囩▼妫�璇︽儏
+     * @param processPageDto
+     * @return
+     */
+    @GetMapping("/processDetails")
+    @ApiOperation("杩囩▼妫�璇︽儏")
+    public AjaxResult processDetails(ProcessPageDto processPageDto) {
+        return AjaxResult.success(qualityInspectService.processDetails(processPageDto));
+    }
+
+    /**
+     * 鎴愬搧妫�鍒嗛〉鏌ヨ
+     * @param page
+     * @param finishedPageDto
+     * @return
+     */
+    @GetMapping("/finishedPage")
+    @ApiOperation("鎴愬搧妫�鍒嗛〉鏌ヨ")
+    public AjaxResult finishedPage(Page page, FinishedPageDto finishedPageDto) {
+        return AjaxResult.success(qualityInspectService.finishedPage(page, finishedPageDto));
+    }
+
+    /**
+     * 鎴愬搧妫�-璁＄畻瀹為檯鎶曞叆浜у嚭姣斾緥鍜屾爣鍑嗘姇鍏ヤ骇鍑烘瘮鐨勫亸宸巼
+     * 鏍规嵁bom鏉ョ畻
+     * @param finishedPageDto
+     * @return
+     */
+    @GetMapping("/finishedRatio")
+    @ApiOperation("鎴愬搧妫�-鏌ョ湅鏍囧噯鎶曞叆浜у嚭姣斾緥")
+    public AjaxResult finishedRatio(FinishedPageDto finishedPageDto) {
+        return AjaxResult.success(qualityInspectService.finishedRatio(finishedPageDto));
+    }
 }

--
Gitblit v1.9.3