修改3.0 9.25

zss

2023-09-25 a3f47b5e065878e5f41699ac1c597fd9ac9c4a21

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

@@ -34,8 +34,6 @@
    @Resource
    private InspectionItemMapper inspectionItemMapper;

    @Resource
    TechniqueMapper techniqueMapper;



@@ -43,15 +41,6 @@
    @Override
    public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
        return inspectionItemMapper.selectInspectionItem(id,type);
    }


    //新增过程检验单-->选择设备
    @Override
    public List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name) {
        //该工艺id下生产工艺最新版本
        Integer ver = techniqueMapper.selectVerByTeId(technologyId).get(0);
        return techniqueMapper.selDevByVerTecIdFaNam(technologyId, father, name, ver);
    }

    //更改设备
@@ -73,15 +62,27 @@
        InspectionItem inspectionItem = inspectionItemMapper.selectById(updateInspectionItemDto.getInspectionItemId());
        inspectionItem.setInspectionValue(updateInspectionItemDto.getInspectionValue());
        inspectionItem.setDeviceId(updateInspectionItemDto.getDeviceId());
        List<Integer> list = Arrays.stream( updateInspectionItemDto.getInspectionValue().split(",")).map(s -> {
            int values = checkValues(inspectionItem.getRequired(),  inspectionItem.getInternal(), s);
            return values;
        }).collect(Collectors.toList());
        if (list.contains(0)) {
            //如果其中一个检验值不合格则该项目检验不合格
            inspectionItem.setResult(0);
        } else {
        if (updateInspectionItemDto.getInspectionValue().equals("过")){
            inspectionItem.setResult(1);
        }else if (updateInspectionItemDto.getInspectionValue().equals("不过")){
            inspectionItem.setResult(0);
        }else {
            char req = inspectionItem.getRequired().charAt(0);
            List<Integer> list = Arrays.stream(updateInspectionItemDto.getInspectionValue().split(",")).map(s -> {
                int values=2;
                if (req == '>' || req == '<' || req == '=') {
                    values = checkValues(inspectionItem.getRequired(),  inspectionItem.getInternal(), s);
                }else {
                    values = conValues(inspectionItem.getRequired(),  inspectionItem.getInternal(), s);
                }
                return values;
            }).collect(Collectors.toList());
            if (list.contains(0)) {
                //如果其中一个检验值不合格则该项目检验不合格
                inspectionItem.setResult(0);
            } else {
                inspectionItem.setResult(1);
            }
        }
        inspectionItem.setUsername(username);
        inspectionItemMapper.updateById(inspectionItem);
@@ -91,6 +92,19 @@


    /*判断检测值是否满足标准值和内控值的要求,如果不满足则检验结论为不合格*/
    //如果是±的操作
    private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
        double standVar = Double.parseDouble(standardValueStr);
        double controlVar = Double.parseDouble(controlValueStr);
        double detecVar = Double.parseDouble(detectionValueStr);
        double a = standVar + controlVar;
        double b = standVar - controlVar;
        if (detecVar >= b && detecVar <= a) {
            return 1;
        }
        return 0;
    }
    //如果是> , < ,=的操作
    private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
        boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
        boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);