From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index b015150..5968a6a 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -40,9 +40,11 @@
*/
@DeleteMapping("/del")
public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
+ qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
+ if (qualityUnqualified.getInspectState()==1){
+ throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
+ }
+ });
return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
@@ -53,7 +55,7 @@
*/
@GetMapping("/{id}")
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -98,4 +100,13 @@
}
+ /**
+ * 鍙栨秷闅旂
+ * @param qualityUnqualified
+ * @return
+ */
+ @PostMapping("/liftTheQuarantine")
+ public AjaxResult liftTheQuarantine(@RequestBody QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.liftTheQuarantine(qualityUnqualified));
+ }
}
--
Gitblit v1.9.3