-

懒羊羊

2024-03-23 e20d7373595960ad6be9bd6373a3c6f186e76e5c

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -47,19 +47,27 @@
            formulaChildInfo.setSort(formulaChildInfo.getStepSort());
            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
            formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
            if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
                if(formulaChildInfo.getCollectData().contains("[")){
                    String data = formulaChildInfo.getCollectData();
                    data = data.replace("[", "").replace("]", "").replace(" ", "");
                    String[] tightenDataParts = data.split(",");
                    formulaChildInfo.setCollectData("扭矩"+tightenDataParts[0]+"角度"+tightenDataParts[1]+"扭矩结果"+tightenDataParts[2]+"角度结果"+tightenDataParts[3]);
                }
            }
        }
        return getDataTable(list);
    }

    /**
     * 检查是否可以放行
     */
    @GetMapping("/releaseCheck")
    public AjaxResult releaseCheck(BsFormulaChildInfo bsFormulaChildInfo)
    {
        List<BsFormulaChildInfo> i = bsFormulaChildInfoService.releaseCheck(bsFormulaChildInfo);
        return AjaxResult.success(i.size());
    }
//    /**
//     * 检查是否可以放行
//     */
//    @GetMapping("/releaseCheck")
//    public AjaxResult releaseCheck(BsFormulaChildInfo bsFormulaChildInfo)
//    {
//        List<BsFormulaChildInfo> i = bsFormulaChildInfoService.releaseCheck(bsFormulaChildInfo);
//        return AjaxResult.success(i.size());
//    }

    /**
     * 扫码确认
@@ -80,6 +88,15 @@
    }

    /**
     * 拧紧后更新对应数据
     */
    @GetMapping("/updateTighteningFormula")
    public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo)
    {
        return bsFormulaChildInfoService.updateTighteningFormula(bsFormulaChildInfo);
    }

    /**
     * 导出配方配置子信息列表
     */
    @PreAuthorize("@ss.hasPermi('bs:formulaChild:export')")