cl
2024-09-06 91b54fc007c9e82087738048d3b767c9645a6aec
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -528,17 +528,19 @@
    @Override
    public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
        Boolean b = true;
        BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
        getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
        getMaterTwo.setOperationType("2");
        List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
        List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
        for (String s : collect) {
            if(s.equals("")){
                return AjaxResult.error("扫码未完成,禁止拧紧操作!");
        if(!"OP100".equals(bsFormulaChildInfo.getLocationCode())){
            BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
            getMaterTwo.setProductCode(bsFormulaChildInfo.getProductCode());
            getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
            getMaterTwo.setOperationType("2");
            List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
            List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
            for (String s : collect) {
                if(s.equals("")){
                    return AjaxResult.error("扫码未完成,禁止拧紧操作!");
                }
            }
        }
        //添加拧紧参数-参数采集表
        DaParamCollection daParamCollection = new DaParamCollection();
        daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());