质量管理：删除原料时，删除相关联数据

huminmin

2026-03-16 196eed1a17e2d0d7ccdafb502ac597247ecb00a1

 src/main/java/com/ruoyi/quality/controller/RawMaterialController.java

@@ -1,13 +1,16 @@
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.RawMaterial;
import com.ruoyi.quality.pojo.*;
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.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -27,6 +30,12 @@
public class RawMaterialController {
    @Resource
    private RawMaterialService rawMaterialService;

    @Resource
    private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;

    @Resource
    private IQualityInspectFileService qualityInspectFileService;

    /**
     * 原料分页查询
@@ -87,8 +96,26 @@
     * 原料删除
     */
    @DeleteMapping("")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delete(@RequestBody List<Integer> ids) {
        return AjaxResult.success(rawMaterialService.removeByIds(ids));
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //如果已经提交就不允许删除
        List<RawMaterial> rawMaterials = rawMaterialService.list(Wrappers.<RawMaterial>lambdaQuery()
                .in(RawMaterial::getId,ids)
                .eq(RawMaterial::getInspectState, RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode()));
        if(!CollectionUtils.isEmpty(rawMaterials)){
            throw new RuntimeException("已提交的数据不允许删除");
        }
        //删除检验参数
        rawMaterialQualityInspectItemService.remove(Wrappers.<RawMaterialQualityInspectItem>lambdaQuery()
                .in(RawMaterialQualityInspectItem::getRawMaterialId,ids));
        //删除检验附件
        qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
                .in(QualityInspectFile::getInspectId,ids));
        //删除检验单
        return AjaxResult.success(rawMaterialService.removeBatchByIds(ids));
    }

    /**