From 17a63200983a8e154a1eb3549d1caffa050372c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:45 +0800
Subject: [PATCH] feat:1.生产订单领用 2.报工领用（关联订单领用） 3.报工删除（关联报工领用） 4.不合格处理（返工生成返工附件并下载）
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..14b7483 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -4,11 +4,11 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
/**
@@ -24,6 +24,7 @@
/**
* 鏂板涓嶅悎鏍肩鐞�
+ *
* @param qualityUnqualified
* @return
*/
@@ -35,29 +36,34 @@
/**
* 鍒犻櫎涓嶅悎鏍肩鐞�
+ *
* @param ids
* @return
*/
@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));
}
/**
* 涓嶅悎鏍肩鐞嗚鎯�
+ *
* @param id
* @return
*/
@GetMapping("/{id}")
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
* 涓嶅悎鏍肩鐞嗕慨鏀�
+ *
* @param qualityUnqualified
* @return
*/
@@ -67,7 +73,8 @@
}
/**
- *涓嶅悎鏍肩鐞嗗垎椤垫煡璇�
+ * 涓嶅悎鏍肩鐞嗗垎椤垫煡璇�
+ *
* @param page
* @param qualityUnqualified
* @return
@@ -79,16 +86,18 @@
/**
* 涓嶅悎鏍肩鐞嗗鍑�
+ *
* @param response
* @param qualityUnqualified
*/
@PostMapping("/export")
- public void qualityUnqualifiedExport(HttpServletResponse response,QualityUnqualified qualityUnqualified) {
+ public void qualityUnqualifiedExport(HttpServletResponse response, QualityUnqualified qualityUnqualified) {
qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
}
/**
* 涓嶅悎鏍肩鐞嗗鐞�
+ *
* @param qualityUnqualified
* @return
*/
@@ -97,5 +106,8 @@
return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
}
-
+ @GetMapping("/downloadReturnRecord")
+ public void downloadReturnRecord(@RequestParam("id") Long id,HttpServletResponse response) throws IOException {
+ qualityUnqualifiedService.downloadReturnRecord(id,response);
+ }
}
--
Gitblit v1.9.3