src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -63,8 +63,16 @@
    @Override
    public int deal(QualityUnqualified qualityUnqualified) {
        QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
        QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
        if (ObjectUtils.isNull(unqualified)) {
            throw new RuntimeException("不合格记录不存在");
        }
        QualityInspect qualityInspect = null;
        if (ObjectUtils.isNotNull(unqualified.getInspectId())) {
            qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        }
        if (ObjectUtils.isNotNull(unqualified.getInspectId())
                && ObjectUtils.isNotNull(qualityInspect)
                && qualityInspect.getInspectType() != 0) {
            switch (qualityUnqualified.getDealResult()) {
                case "返修":
                case "返工":
@@ -137,14 +145,22 @@
                    break;
            }
        } else {
            // 扫码不合格优先使用 productModelId
            Long modelId = unqualified.getProductModelId();
            if (ObjectUtils.isNull(modelId)) {
                modelId = qualityUnqualifiedMapper.getModelId(qualityUnqualified.getProductName(), qualityUnqualified.getModel());
            }
            if (ObjectUtils.isNull(modelId)) {
                throw new RuntimeException("处理失败,未找到对应产品规格,请检查产品名称和规格型号");
            }
            switch (qualityUnqualified.getDealResult()) {
                case "报废":
                    //调用不合格库存接口 入不合格库
                    stockUtils.addUnStock(Long.valueOf(unqualified.getModel()), unqualified.getQuantity(), StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
                    stockUtils.addUnStock(modelId, unqualified.getQuantity(), StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
                    break;
                case "让步放行":
                    //调用提交合格的接口
                    stockUtils.addStock(Long.valueOf(unqualified.getModel()), unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
                    stockUtils.addStock(modelId, unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
                    break;
                default:
                    break;