质量管理模块：指标按产品/类别/工序维护与绑定、不合格处理方式、检验提交入库判定

liu

10 天以前 9ca45195f78b74e9181cbbe7e82eb683ee49fabf

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import org.springframework.util.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -31,7 +31,17 @@
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
        if (qualityUnqualified != null && qualityUnqualified.getInspectState() == null) {
            qualityUnqualified.setInspectState(0);
        }
        String validationMessage = validateUnqualified(qualityUnqualified, false);
        if (validationMessage != null) {
            return AjaxResult.error(validationMessage);
        }
        if (!qualityUnqualifiedService.save(qualityUnqualified)) {
            throw new ServiceException("新增不合格记录失败");
        }
        return AjaxResult.success(true);
    }

    /**
@@ -64,7 +74,17 @@
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
        String validationMessage = validateUnqualified(qualityUnqualified, true);
        if (validationMessage != null) {
            return AjaxResult.error(validationMessage);
        }
        if (qualityUnqualifiedService.getById(qualityUnqualified.getId()) == null) {
            return AjaxResult.error("不合格记录不存在");
        }
        if (!qualityUnqualifiedService.updateById(qualityUnqualified)) {
            throw new ServiceException("修改不合格记录失败");
        }
        return AjaxResult.success(true);
    }

    /**
@@ -88,5 +108,45 @@
        qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
    }

    private String validateUnqualified(QualityUnqualified record, boolean requireId) {
        if (record == null) {
            return "不合格数据不能为空";
        }
        if (requireId && record.getId() == null) {
            return "不合格记录ID不能为空";
        }
        if (record.getInspectType() == null || record.getInspectType() < 0 || record.getInspectType() > 2) {
            return "检验类别不正确";
        }
        if (record.getInspectState() == null
                || (record.getInspectState() != 0 && record.getInspectState() != 1)) {
            return "处理状态不正确";
        }
        if (record.getProductId() == null) {
            return "请选择产品";
        }
        if (record.getQuantity() == null || record.getQuantity().signum() <= 0) {
            return "不合格数量必须大于0";
        }
        if (StringUtils.isBlank(record.getDefectivePhenomena())) {
            return "请填写不合格原因或现象";
        }
        if (Integer.valueOf(1).equals(record.getInspectState())) {
            if (StringUtils.isBlank(record.getDealType())) {
                return "请选择处理方式";
            }
            if (StringUtils.isBlank(record.getDealResult())) {
                return "请填写处理结果";
            }
            if (StringUtils.isBlank(record.getDealName())) {
                return "请填写处理人";
            }
            if (record.getDealTime() == null) {
                return "请选择处理日期";
            }
        }
        return null;
    }


}