复核结束闭环+电性能+辐射性能

zss

2025-03-21 5ce26886a49d6f7fe283ca44f450bbe2b9f2e926

复核结束闭环+电性能+辐射性能

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -1204,6 +1204,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //该订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }
@@ -1291,6 +1294,9 @@
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    createReport(insOrder.getId(),insReportDto1s);
                    //订单闭环
                    insOrder.setState(4);
                    insOrderMapper.updateById(insOrder);
                    break;
            }
        }

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java

@@ -253,14 +253,6 @@
        ProcessReport processReport = new ProcessReport();
        processReport.setInsReportCode(insReport.getCode());
        processReportMapper.insert(processReport);
        /*检验单结束*/
        List<InsReport> insReports = insReportMapper.selectList(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getInsOrderId, insReport.getInsOrderId()));
        List<Integer> list = insReports.stream().map(InsReport::getIsRatify).distinct().collect(Collectors.toList());
        if (list.size() == 1 && list.contains(1)) {
            InsOrder insOrder = insOrderMapper.selectById(insReport.getInsOrderId());
            insOrder.setState(4);
            insOrderMapper.updateById(insOrder);
        }
        return 0;
    }


 inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java

@@ -2687,7 +2687,13 @@
        for (InsProduct insPro : insProducts) {
            InsProductWordDto insProductWordDto = new InsProductWordDto();
            insProductWordDto.setIndex(index1+"");//序号
            insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//检验项目
            if (insPro.getInspectionItem().contains("电路试验")){
                insProductWordDto.setTerm("电性能参数-"+insPro.getInspectionItemSubclass());//检验项目
            }else if (insPro.getInspectionItem().contains("辐射试验")){
                insProductWordDto.setTerm("辐射性能参数"+insPro.getInspectionItemSubclass());//检验项目
            }else {
                insProductWordDto.setTerm(insPro.getInspectionItem()+"-"+insPro.getInspectionItemSubclass());//检验项目
            }
            if (ObjectUtils.isNotNull(insPro.getInsResult()) && insPro.getInsResult()==0) {
                insProductWordDto.setResult("不合格");//结论
            } else {