From 5dc34f36049194d1a124eb60dd68cb17e498caec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 四月 2026 09:49:13 +0800
Subject: [PATCH] fix：原料、过程与出厂检验导出列修改
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 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 1cce084..fea6b88 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -1,9 +1,14 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +26,12 @@
@Resource
private IQualityUnqualifiedService qualityUnqualifiedService;
+ @Autowired
+ private TempFileServiceImpl tempFileService;
+
+ @Autowired
+ private CommonFileServiceImpl commonFileService;
+
/**
* 鏂板涓嶅悎鏍肩鐞�
@@ -28,8 +39,12 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
+ public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) throws Exception {
+ qualityUnqualified.setInspectState(0);
+ qualityUnqualifiedService.save(qualityUnqualified);
+ // 闄勪欢缁戝畾
+ tempFileService.migrateTempFilesToFormal(qualityUnqualified.getId(), qualityUnqualified.getTempFileIds(), FileNameType.QUALITY_UQUALIFIED.getValue());
+ return AjaxResult.success();
}
/**
@@ -39,9 +54,13 @@
*/
@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("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
+ }
+ // 鍒犻櫎瀵瑰簲鐨勯檮浠�
+ commonFileService.deleteByBusinessId(qualityUnqualified.getId(), FileNameType.QUALITY_UQUALIFIED.getValue());
+ });
return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
@@ -52,7 +71,7 @@
*/
@GetMapping("/{id}")
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -61,8 +80,11 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
+ public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) throws Exception {
+ qualityUnqualifiedService.updateById(qualityUnqualified);
+ // 闄勪欢缁戝畾
+ tempFileService.migrateTempFilesToFormal(qualityUnqualified.getId(), qualityUnqualified.getTempFileIds(), FileNameType.QUALITY_UQUALIFIED.getValue());
+ return AjaxResult.success();
}
/**
--
Gitblit v1.9.3