电路试验,不同频段的要求值可以进行调整

zss

3 天以前 996c3fb89b185eedf2fd58a6c5bd5586e04cdccf

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

@@ -139,16 +139,21 @@
        map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        String laboratory = null;
        String userName = null;
        String myName = null;
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
            userName = userMapper.selectById(map1.get("userId")).getName();
            myName = userMapper.selectById(map1.get("userId")).getName();
            insOrderPlanDTO.setUserId(null);
        }
        //检验人
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserName())){
            myName=(ObjectUtils.isNotNull(myName)?myName+",":"")+insOrderPlanDTO.getUserName();
            insOrderPlanDTO.setUserName(null);
        }
        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
        insOrderPlanDTO.setSonLaboratory(null);
        String sampleCode = insOrderPlanDTO.getSampleCode();
        insOrderPlanDTO.setSampleCode(null);
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory,sampleCode);
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), myName, sonLaboratory, laboratory,sampleCode);
        map.put("body", insOrderPage);
        return map;
    }
@@ -405,10 +410,11 @@
        InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getSampleCode, sampleCode)
                .eq(InsSample::getInsOrderId, insOrders.get(0).getId()));
        List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .eq(InsProduct::getInsSampleId, insSample.getId())).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
        if (!collect.contains(sonLaboratory)) {
                .eq(InsProduct::getSonLaboratory,sonLaboratory)
                .eq(InsProduct::getInsSampleId, insSample.getId()));
        if (insProducts.size()<=0) {
            throw new ErrorException("该样品没有" + sonLaboratory + "站点的相关项目,请查看下单详情!");
        }
        //判断该订单是否站点任务有结束试验(只要任一任务结束试验都不能再次试验)
@@ -429,6 +435,11 @@
                orderState.setNum(orderState.getNum() + 1);//递增
                orderState.setCreateTime(LocalDateTime.now());
                insOrderStateMapper.updateById(orderState);
                //这里需要将原来的检验项目的状态重置为null(根据样品id和试验室来判断项目)
                insProducts.stream().forEach(insProduct -> {
                    insProduct.setInsResult(null);
                    insProductMapper.updateById(insProduct);
                });
            }
        } else {
            InsOrderState insOrderState = new InsOrderState();
@@ -799,10 +810,12 @@
        List<InsProductResult2> result2s = new ArrayList<>();
        List<InsProductUser> insProductUsers = new ArrayList<>();
        for (InsProductResult2 insProductResult2 : insProductResultDtos.getInsProductResult2s()) {
            InsProduct insProduct = new InsProduct();
            insProduct.setId(insProductResult2.getInsProductId());//项目id
            InsProductResult2 result2 = new InsProductResult2();
            //要求值
            result2.setAsk(insProductResult2.getAsk());
            //次数
            result2.setNum(orderState.getNum());
            //关联项目id
            result2.setInsProductId(insProductResult2.getInsProductId());
            //频率
            result2.setFrequency(insProductResultDtos.getFrequency());
@@ -826,7 +839,7 @@
            if (insProductResult2.getEquipName() != null) {
                result2.setEquipName(insProductResult2.getEquipName());
            }
            insProduct = insProductMapper.selectById(insProduct.getId());
//            InsProduct insProduct = insProductMapper.selectById(insProductResult2.getInsProductId());
            //值
            if (insProductResult2.getValue() != null) {
                result2.setValue(insProductResult2.getValue());
@@ -834,15 +847,15 @@
                int ressult = 1;
                String valueStr = insProductResult2.getValue();
                String regex = "[\u4e00-\u9fa5]";
                if (!insProduct.getAsk().contains(",")) {
                    if (insProduct.getAsk().equals("/") || Pattern.compile(regex).matcher(insProduct.getAsk()).find()) {
                if (!insProductResult2.getAsk().contains(",")) {
                    if (insProductResult2.getAsk().equals("/") || Pattern.compile(regex).matcher(insProductResult2.getAsk()).find()) {
                        ressult = 3; //不判定
                    } else if (!isValueValid(valueStr, new String[]{insProduct.getAsk()})) {
                    } else if (!isValueValid(valueStr, new String[]{insProductResult2.getAsk()})) {
                        ressult = 0; //不合格
                    }
                } else {
                    // 如果要求值是(2°≥20,7°≥25,12°≥25)这种情况
                    String[] askParts = insProduct.getAsk().split(",");
                    String[] askParts = insProductResult2.getAsk().split(",");
                    String[] angles = insProductResult2.getAngle().split(",");
                    for (String s : askParts) {
                        String[] askSplit = s.split("°");
@@ -876,12 +889,7 @@
            result2.setCreateUser(userId);
            result2.setUpdateUser(userId);
            result2s.add(result2);
            //insProductResult2Mapper.insert(result2);
            //insProduct.setUpdateUser(userId);
            //insProducts.add(insProduct);
            //insProductMapper.updateById(insProduct);
            insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
            //insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
            insProductUsers.add(new InsProductUser(null, userId, LocalDateTime.now(), insProductResult2.getInsProductId()));
            /*更新样品的检验状态*/
            insSample.setInsState(1);
            Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -920,6 +928,15 @@
            saveInsContext2(insProductResultDto);
        }
        return 1;
    }

    //样品编号更改
    @Override
    public int changeSampleCode(Integer sampleId, String sampleCode) {
        InsSample insSample = new InsSample();
        insSample.setId(sampleId);
        insSample.setSampleCode(sampleCode);
        return  insSampleMapper.updateById(insSample);
    }

    /**
@@ -1100,7 +1117,7 @@
            if (ObjectUtils.isEmpty(s)) {
                continue;
            }
            double numericValue = Math.abs(Double.parseDouble(s));
            double numericValue = Double.parseDouble(s);
            boolean valid = Arrays.stream(valuesToCheck)
                    .allMatch(v -> getResult(numericValue, v));
            if (!valid) {
@@ -1184,6 +1201,11 @@
                            .set(InsOrderState::getVerifyUser, userId)
                            .set(InsOrderState::getNum, record.getNum() + 1)//次数加1
                            .set(InsOrderState::getCreateTime, LocalDateTime.now()));
                    //这里需要将原来的检验项目的状态重置为null(根据样品id和试验室来判断项目)
                    insProducts.stream().forEach(insProduct -> {
                        insProduct.setInsResult(null);
                       insProductMapper.updateById(insProduct);
                    });
                    break;
                case 1:
                    //继续试验:该样品该站点任务结束(可以再次扫码检验)；
@@ -1214,7 +1236,7 @@
                            .set(InsOrderState::getVerifyTell, tell)
                            .set(InsOrderState::getVerifyUser, userId));
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),null);
                    createReport(insOrder.getId(),insReportDto1s);
                    break;
            }
@@ -1228,6 +1250,10 @@
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        InsSample insSample = insSampleMapper.selectById(sampleId);
        InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getSonLaboratory, laboratory)
                .eq(InsProduct::getState, 1));
        /*type=0  再次试验; type=1 继续试验 ; type=2 结束试验*/
        // 查询根据 id 倒序排列的第一条记录
        InsOrderState record = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
@@ -1248,6 +1274,11 @@
                            .set(InsOrderState::getVerifyUser, userId)
                            .set(InsOrderState::getNum, record.getNum() + 1)//次数加1
                            .set(InsOrderState::getCreateTime, LocalDateTime.now()));
                    //这里需要将原来的检验项目的状态重置为null(根据样品id和试验室来判断项目)
                    insProducts.stream().forEach(insProduct -> {
                        insProduct.setInsResult(null);
                        insProductMapper.updateById(insProduct);
                    });
                    break;
                case 1:
                    //继续试验:该样品该站点任务结束(可以再次扫码检验)；
@@ -1305,7 +1336,7 @@
                                .set(InsOrderState::getVerifyUser, userId));
                    }
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),sampleId);
                    createReport(insOrder.getId(),insReportDto1s);
                    break;
            }