From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java |   74 ++++++++++++++++++++++++-------------
 1 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 770dea5..42aa2ea 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,15 +2,16 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.dto.QualityTestStandardDto;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
 import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**
@@ -28,6 +29,9 @@
     @Resource
     private IQualityTestStandardService qualityTestStandardService;
 
+    @Resource
+    private QualityTestStandardParamService qualityTestStandardParamService;
+
 
     /**
      * 鏂板妫�娴嬫爣鍑嗕富琛�
@@ -35,8 +39,8 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
-        return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
+    public R<?> add(@RequestBody QualityTestStandard qualityTestStandard) {
+        return R.ok(qualityTestStandardService.save(qualityTestStandard));
     }
 
     /**
@@ -45,21 +49,11 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
+    public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
-        return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
-    }
-
-    /**
-     * 妫�娴嬫爣鍑嗕富琛ㄨ鎯�
-     * @param id
-     * @return
-     */
-    @GetMapping("/{id}")
-    public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(qualityTestStandardService.getById(id));
+        return R.ok(qualityTestStandardService.delQualityTestStandard(ids));
     }
 
     /**
@@ -68,8 +62,8 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
-        return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
+    public R<?> update(@RequestBody QualityTestStandard qualityTestStandard) {
+        return R.ok(qualityTestStandardService.updateById(qualityTestStandard));
     }
 
     /**
@@ -79,18 +73,46 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
-        return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
+    public R<?> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
+        return R.ok(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
     }
 
     /**
      * 妫�娴嬫爣鍑嗗鍒跺弬鏁�
-     * @param qualityTestStandardDto
+     * @param qualityTestStandard
      * @return
      */
     @PostMapping("/copyParam")
-    public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
-        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
+    public R<?> copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+        return R.ok(qualityTestStandardService.copyParam(qualityTestStandard));
+    }
+
+    /**
+     * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+     * @param qualityTestStandards
+     * @return
+     */
+    @PostMapping("/qualityTestStandardAudit")
+    public R<?> qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+        return R.ok(qualityTestStandardService.updateBatchById(qualityTestStandards));
+    }
+
+    /**
+     * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+     * @return
+     */
+    @GetMapping("/getQualityTestStandardByProductId")
+    public R<?> getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+        return R.ok(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+    }
+
+    /**
+     * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+     * @return
+     */
+    @GetMapping("/getQualityTestStandardParamByTestStandardId")
+    public R<?> getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+        return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
     }
 
 }

--
Gitblit v1.9.3