From 4cb12d21253d754152b7591fe49fa131fed1b3c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:37:28 +0800
Subject: [PATCH] refactor(production): 移除销售台账关联逻辑并优化生产订单创建流程

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

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 717044e..fcaceb6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -3,19 +3,18 @@
 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.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 jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -23,88 +22,117 @@
  */
 @RestController
 @RequestMapping("/quality/qualityInspect")
+@AllArgsConstructor
 public class QualityInspectController {
 
-    @Resource
     private IQualityInspectService qualityInspectService;
-
-    @Resource
     private IQualityInspectParamService qualityInspectParamService;
-
-    @Resource
     private IQualityInspectFileService qualityInspectFileService;
 
 
     /**
      * 鏂板
-     * @param qualityInspect
+     *
+     * @param qualityInspectDto
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody QualityInspect qualityInspect) {
-        return AjaxResult.success(qualityInspectService.add(qualityInspect));
+    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
+        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
     }
 
     /**
      * 鍒犻櫎
+     *
      * @param ids
      * @return
      */
     @DeleteMapping("/del")
     public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
-        if(CollectionUtils.isEmpty(ids)){
+        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));
+                .in(QualityInspectParam::getInspectId, ids));
         //鍒犻櫎妫�楠岄檮浠�
         qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
-        .in(QualityInspectFile::getInspectId,ids));
+                .in(QualityInspectFile::getInspectId, ids));
         //鍒犻櫎妫�楠屽崟
         return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
     }
 
     /**
      * 璇︽儏
+     *
      * @param id
      * @return
      */
     @GetMapping("/{id}")
     public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(qualityInspectService.getById(id));
+        return AjaxResult.success(qualityInspectService.getDetailById(id));
     }
 
     /**
      * 淇敼
-     * @param qualityInspect
+     *
+     * @param qualityInspectDto
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody QualityInspect qualityInspect) {
-        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspect));
+    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
+        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
     }
 
     /**
-     *鍒嗛〉鏌ヨ
+     * 鍒嗛〉鏌ヨ
+     *
      * @param page
      * @param qualityInspect
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
+    public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
         return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
     }
 
     /**
      * 瀵煎嚭
+     *
      * @param response
      * @param qualityInspect
      */
     @PostMapping("/export")
-    public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
+    public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
         qualityInspectService.qualityInspectExport(response, qualityInspect);
     }
 
+    /**
+     * 鎻愪氦
+     *
+     * @param qualityInspect
+     * @return
+     */
+    @PostMapping("/submit")
+    public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
+        return AjaxResult.success(qualityInspectService.submit(qualityInspect));
+    }
 
+    /**
+     * 涓嬭浇
+     *
+     * @param response
+     * @param qualityInspect
+     */
+    @PostMapping("/down")
+    public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
+        qualityInspectService.down(response, qualityInspect);
+    }
 }

--
Gitblit v1.9.3