fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除

liding

9 天以前 cf65d0a608b21f07dc50a98b864dfe47def4f86b

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

@@ -4,7 +4,8 @@
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 io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -39,12 +40,8 @@
     * @return
     */
    @DeleteMapping("/del")
    @PreAuthorize("@ss.hasPermi('nonconforming_cancel')")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
       qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
           if (qualityUnqualified.getInspectState()==1){
               throw new RuntimeException("该不合格数据已经处理无法删除!");
           }
       });
        return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
    }

@@ -55,7 +52,7 @@
     */
    @GetMapping("/{id}")
    public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityUnqualifiedService.getById(id));
        return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
    }

    /**
@@ -64,6 +61,8 @@
     * @return
     */
    @PostMapping("/update")
    @PreAuthorize("@ss.hasPermi('nonconforming_edit')")
    @ApiOperation("不合格管理修改")
    public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
    }