Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

昨天 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -63,6 +63,7 @@
    public int deal(QualityUnqualified qualityUnqualified) {
        QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
        QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType()!=0) {
        switch (qualityUnqualified.getDealResult()) {
            case "返修":
            case "返工":
@@ -140,6 +141,7 @@
            default:
                break;
        }
        }
        qualityUnqualified.setInspectState(1);//已处理
        return qualityUnqualifiedMapper.updateById(qualityUnqualified);
    }