From cf65d0a608b21f07dc50a98b864dfe47def4f86b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 17:12:37 +0800
Subject: [PATCH] fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除
---
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
index 92f13f1..b5939be 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,13 +1,18 @@
package com.ruoyi.quality.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.RawMaterialDto;
-import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.RawMaterial;
+import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
import com.ruoyi.quality.service.RawMaterialService;
-import com.ruoyi.staff.pojo.StaffOnJob;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,6 +32,12 @@
public class RawMaterialController {
@Resource
private RawMaterialService rawMaterialService;
+
+ @Resource
+ private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;
+
+ @Resource
+ private IQualityInspectFileService qualityInspectFileService;
/**
* 鍘熸枡鍒嗛〉鏌ヨ
@@ -59,10 +70,7 @@
*/
@PatchMapping("/submit/{id}")
public AjaxResult submit(@PathVariable Long id) {
- RawMaterial rawMaterial = new RawMaterial();
- rawMaterial.setId(id);
- rawMaterial.setInspectState(RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode());
- return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ return AjaxResult.success(rawMaterialService.submit(id));
}
/**
@@ -90,8 +98,20 @@
* 鍘熸枡鍒犻櫎
*/
@DeleteMapping("")
+ @PreAuthorize("@ss.hasPermi('raw_cancel')")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Integer> ids) {
- return AjaxResult.success(rawMaterialService.removeByIds(ids));
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠屽弬鏁�
+ rawMaterialQualityInspectItemService.remove(Wrappers.<RawMaterialQualityInspectItem>lambdaQuery()
+ .in(RawMaterialQualityInspectItem::getRawMaterialId,ids));
+ //鍒犻櫎妫�楠岄檮浠�
+ qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
+ .in(QualityInspectFile::getInspectId,ids));
+ //鍒犻櫎妫�楠屽崟
+ return AjaxResult.success(rawMaterialService.removeBatchByIds(ids));
}
/**
--
Gitblit v1.9.3