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

liding

9 天以前 cf65d0a608b21f07dc50a98b864dfe47def4f86b

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

@@ -2,11 +2,10 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityTestStandardService;
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;
@@ -31,6 +30,7 @@
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
        qualityUnqualified.setInspectState(0);
        return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
    }

@@ -40,10 +40,8 @@
     * @return
     */
    @DeleteMapping("/del")
    @PreAuthorize("@ss.hasPermi('nonconforming_cancel')")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
    }

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

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

    /**
     * 不合格管理处理
     * @param qualityUnqualified
     * @return
     */
    @PostMapping("/deal")
    public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
    }


}