From 84ee50f83144da18e7eb42bb8577aa17f717e7fa Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 18 三月 2026 09:23:00 +0800
Subject: [PATCH] 不合格管理：取消隔离
---
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 5a47d92..e82c196 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,32 +2,42 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffOnJobService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
- * 妫�娴嬫寚鏍囩淮鎶�
+ * <p>
+ * 妫�娴嬫爣鍑嗕富琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:40:24
*/
@RestController
-@RequestMapping("/quality/qualityTestStandard")
+@RequestMapping("/qualityTestStandard")
public class QualityTestStandardController {
@Resource
private IQualityTestStandardService qualityTestStandardService;
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
+
/**
- * 鏂板妫�娴嬫寚鏍囩淮鎶�
+ * 鏂板妫�娴嬫爣鍑嗕富琛�
* @param qualityTestStandard
* @return
*/
@@ -37,7 +47,7 @@
}
/**
- * 鍒犻櫎妫�娴嬫寚鏍囩淮鎶�
+ * 鍒犻櫎妫�娴嬫爣鍑嗕富琛�
* @param ids
* @return
*/
@@ -46,21 +56,11 @@
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
- * 妫�娴嬫寚鏍囩淮鎶よ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
- }
-
- /**
- * 妫�娴嬫寚鏍囩淮鎶や慨鏀�
+ * 妫�娴嬫爣鍑嗕富琛ㄤ慨鏀�
* @param qualityTestStandard
* @return
*/
@@ -70,7 +70,7 @@
}
/**
- *妫�娴嬫寚鏍囩淮鎶ゅ垎椤垫煡璇�
+ *妫�娴嬫爣鍑嗕富琛ㄥ垎椤垫煡璇�
* @param page
* @param qualityTestStandard
* @return
@@ -81,24 +81,47 @@
}
/**
- * 妫�娴嬫寚鏍囩淮鎶ゅ鍑�
- * @param response
+ * 妫�娴嬫爣鍑嗗鍒跺弬鏁�
* @param qualityTestStandard
+ * @return
*/
- @PostMapping("/export")
- public void qualityTestStandardListPageExport(HttpServletResponse response,QualityTestStandard qualityTestStandard) {
- qualityTestStandardService.qualityTestStandardListPageExport(response, qualityTestStandard);
+ @PostMapping("/copyParam")
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
}
/**
- * 璇︽儏
- * @param productId
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
* @return
*/
- @GetMapping("/{productId}")
- public AjaxResult QualityInspectDetail(@PathVariable("productId") Integer productId) {
- return AjaxResult.success(qualityTestStandardService.list(Wrappers.<QualityTestStandard>lambdaQuery().eq(QualityTestStandard::getProductId,productId)));
+ @PostMapping("/qualityTestStandardAudit")
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ }
+
+ @ApiOperation("鏍规嵁 宸ュ簭鎴栫被鍒� 鏌ヨ瀵瑰簲鍙傛暟椤�")
+ @GetMapping("/getParameterItemByProcessOrCategory")
+ public AjaxResult delete(@RequestParam(required = false) Long id, Integer inspectType) {
+ return AjaxResult.success(qualityTestStandardService.getParameterItemByProcessOrCategory(id, inspectType));
+ }
}
--
Gitblit v1.9.3