gongchunyi
昨天 d5ae8cf83c4b5babb532870be80aef82c3059bd4
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -85,10 +85,6 @@
                        createReworkProductionByNewModel(sourceMain, unqualified.getQuantity());
                    }
                    break;
                case "报废":
                    stockUtils.addUnStockWithBatchNo(qualityInspect.getProductModelId(), unqualified.getQuantity(),
                            StockInQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId(), batchNo);
                    break;
                case "让步放行":
                    stockUtils.addStockWithBatchNo(qualityInspect.getProductModelId(), unqualified.getQuantity(),
                            StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId(), batchNo);
@@ -99,10 +95,6 @@
        } else {
            Long modelId = qualityUnqualifiedMapper.getModelId(qualityUnqualified.getProductName(), qualityUnqualified.getModel());
            switch (qualityUnqualified.getDealResult()) {
                case "报废":
                    stockUtils.addUnStock(modelId, unqualified.getQuantity(),
                            StockInQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
                    break;
                case "让步放行":
                    stockUtils.addStock(modelId, unqualified.getQuantity(),
                            StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
@@ -120,6 +112,19 @@
        return qualityUnqualifiedMapper.getUnqualified(id);
    }
    @Override
    public QualityUnqualified getUnqualifiedDetail(Integer id) {
        QualityUnqualified res = qualityUnqualifiedMapper.getUnqualified(id);
        if (res != null && res.getInspectId() != null) {
            QualityInspect inspect = qualityInspectService.getById(res.getInspectId());
            if (inspect != null) {
                res.setProcess(inspect.getProcess());
                res.setCheckCompany(inspect.getCheckCompany());
            }
        }
        return res;
    }
    private void createReworkProductionByNewModel(ProductionProductMain sourceMain, BigDecimal quantity) {
        ProductionOperationTask sourceTask = productionOperationTaskMapper.selectById(sourceMain.getProductionOperationTaskId());
        if (sourceTask == null) {