工具管理-孔加工、车削、铣削、刀片、工具标识参数导入接口调整

cuilei

2025-06-04 3091802b7b8f65fa26a208bbd03e56f00424b0a0

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java

@@ -26,6 +26,8 @@
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.entity.ToolsConfigProperty;
import org.jeecg.modules.tms.enums.AccuracyClass;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.service.IParaHoleToolsService;

@@ -35,6 +37,7 @@
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.tms.service.IToolsClassifyService;
import org.jeecg.modules.tms.service.IToolsConfigPropertyService;
import org.jeecg.modules.tms.utils.ExcelUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -69,6 +72,8 @@
    private IToolsClassifyService toolsClassifyService;
    @Autowired
    private IBaseToolsService baseToolsService;
    @Autowired
    private IToolsConfigPropertyService toolsConfigPropertyService;

    /**
     * 分页列表查询
@@ -213,204 +218,314 @@
                        continue;
                    }
                    dataLines++;
                    Cell cell1 = row.getCell(1);
                    if (cell1 == null || cell1.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,一级分类名称为空! ");
                    Cell cell0 = row.getCell(0);
                    if (cell0 == null || cell0.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具编码为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell2 = row.getCell(2);
                    if (cell2 == null || cell2.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,二级分类名称为空! ");
                    Cell cell1 = row.getCell(1);
                    if (cell1 == null || cell1.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,库位号为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell3 = row.getCell(3);
                    if (cell3 == null || cell3.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,一级分类名称为空! ");
                        errorLines++;
                        continue;
                    }

                    Cell cell4 = row.getCell(4);
                    if (cell4 == null || cell4.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,二级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell5 = row.getCell(5);
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,三级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell4 = row.getCell(4);
                    if (cell4 == null || cell4.getCellType() == CellType.BLANK) {
                    Cell cell6 = row.getCell(6);
                    if (cell6 == null || cell6.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,四级分类名称为空! ");
                        errorLines++;
                        continue;
                    }
                    Cell cell9 = row.getCell(9);
                    if (cell9 == null || cell9.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! ");
                        errorLines++;
                        continue;
                    }
                    //根据四级分类名称和型号/图号查询工具信息
                    List<ToolsClassify> toolClassifyList = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                            .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell4))

                    ToolsClassify classify;
                    List<ToolsClassify> class1List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                            .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell3))
                            .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                    if (CollectionUtil.isEmpty(toolClassifyList)) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该四级分类名称! ");
                    if (CollectionUtil.isEmpty(class1List)) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该一级分类名称! ");
                        errorLines++;
                        continue;
                    } else {
                        ToolsClassify toolsClassify = toolClassifyList.get(0);
                        List<BaseTools> baseToolsList = baseToolsService.list(new LambdaQueryWrapper<BaseTools>()
                                .eq(BaseTools::getClassifyId, toolsClassify.getId())
                                .eq(BaseTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                        if (CollectionUtil.isEmpty(baseToolsList)) {
                            errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在对应的工具信息! ");
                        ToolsClassify classify1 = class1List.get(0);
                        List<ToolsClassify> class2List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                                .eq(ToolsClassify::getParentId, classify1.getId())
                                .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell4))
                                .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                        if (CollectionUtil.isEmpty(class2List)) {
                            errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该二级分类名称! ");
                            errorLines++;
                            continue;
                        } else {
                            BaseTools baseTools = baseToolsList.get(0);
                            List<ParaHoleTools> paraHoleToolsList = paraHoleToolsService.list(new LambdaQueryWrapper<ParaHoleTools>()
                                    .eq(ParaHoleTools::getToolCode, baseTools.getId())
                                    .eq(ParaHoleTools::getToolModel, ExcelUtils.getCellValueAsString(cell9)));
                            if (CollectionUtil.isEmpty(paraHoleToolsList)) {
                                paraHoleTools.setClassifyId(toolsClassify.getId());
                                paraHoleTools.setToolCode(baseTools.getId());
                                paraHoleTools.setToolModel(ExcelUtils.getCellValueAsString(cell9));
                            ToolsClassify classify2 = class2List.get(0);
                            List<ToolsClassify> class3List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                                    .eq(ToolsClassify::getParentId, classify2.getId())
                                    .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell5))
                                    .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                            if (CollectionUtil.isEmpty(class3List)) {
                                errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该三级分类名称! ");
                                errorLines++;
                                continue;
                            } else {
                                paraHoleTools = paraHoleToolsList.get(0);
                                ToolsClassify classify3 = class3List.get(0);
                                List<ToolsClassify> class4List = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
                                        .eq(ToolsClassify::getParentId, classify3.getId())
                                        .eq(ToolsClassify::getTypeName, ExcelUtils.getCellValueAsString(cell6))
                                        .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
                                if (CollectionUtil.isEmpty(class4List)) {
                                    errorMessage.add("第" + currentRowNum + "行，数据导入失败,系统不存在该四级分类名称! ");
                                    errorLines++;
                                    continue;
                                } else {
                                    classify = class4List.get(0);
                                    paraHoleTools.setClassifyId(classify.getId());
                                }
                            }
                        }
                    }

                    Cell cell0 = row.getCell(0);
                    paraHoleTools.setSignCode(cell0.getStringCellValue());
                    Cell cell5 = row.getCell(5);//物品中文名称
                    if (cell5 == null || cell5.getCellType() == CellType.BLANK) {
                    Cell cell2 = row.getCell(2);//序号(或企业内原代码)
                    paraHoleTools.setSignCode(ExcelUtils.getCellValueAsString(cell2));
                    Cell cell7 = row.getCell(7);//物品中文名称
                    if (cell7 == null || cell7.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setChineseName(ExcelUtils.getCellValueAsString(cell5));
                        paraHoleTools.setChineseName(ExcelUtils.getCellValueAsString(cell7));
                    }
                    Cell cell6 = row.getCell(6);//物品外文名称
                    paraHoleTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6));
                    Cell cell7 = row.getCell(7);//标准级别
                    paraHoleTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell7));
                    Cell cell8 = row.getCell(8);//标准号
                    paraHoleTools.setStandardCode(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell10 = row.getCell(10);//刀具直径
                    if (cell10 == null || cell10.getCellType() == CellType.BLANK) {
                    Cell cell8 = row.getCell(8);//物品外文名称
                    paraHoleTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8));
                    Cell cell9 = row.getCell(9);//标准级别
                    paraHoleTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell9));
                    Cell cell10 = row.getCell(10);//标准号
                    paraHoleTools.setStandardCode(ExcelUtils.getCellValueAsString(cell10));
                    Cell cell11 = row.getCell(11);
                    if (cell11 == null || cell11.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setToolModel(ExcelUtils.getCellValueAsString(cell11));
                    }
                    Cell cell12 = row.getCell(12);
                    String accuracyClassCode;
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,精度等级为空! ");
                        errorLines++;
                        continue;
                    } else {
                        accuracyClassCode = AccuracyClass.getCodeFromValue(ExcelUtils.getCellValueAsString(cell12));
                        if (accuracyClassCode == null) {
                            errorMessage.add("第" + currentRowNum + "行，数据导入失败,精度等级不符合要求! ");
                            errorLines++;
                            continue;
                        }
                    }

                    BaseTools baseTools = new BaseTools()
                            .setToolCode(ExcelUtils.getCellValueAsString(cell0))
                            .setClassifyId(classify.getId())
                            .setSignCode(ExcelUtils.getCellValueAsString(cell2))
                            .setChineseName(ExcelUtils.getCellValueAsString(cell7))
                            .setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8))
                            .setStandardLevel(ExcelUtils.getCellValueAsString(cell9))
                            .setStandardCode(ExcelUtils.getCellValueAsString(cell10))
                            .setToolModel(ExcelUtils.getCellValueAsString(cell11))
                            .setCurrentCode("0000")//当前编码初始化
                            .setParamaTableName("2")//2：孔加工工具
                            .setAccuracyClass(accuracyClassCode);
                    //根据刀具编码、型号/图号、分类id查询刀具信息
                    List<BaseTools> toolsList = baseToolsService.list(new LambdaQueryWrapper<BaseTools>()
                            .eq(BaseTools::getToolCode, ExcelUtils.getCellValueAsString(cell0))
                            .eq(BaseTools::getClassifyId, classify.getId())
                            .eq(BaseTools::getToolModel, ExcelUtils.getCellValueAsString(cell11)));
                    if (CollectionUtil.isEmpty(toolsList)) {
                        //不存在相应刀具，新增
                        baseToolsService.save(baseTools);
                    } else {
                        //存在相应刀具，更新
                        BaseTools tools = toolsList.get(0);
                        baseTools.setId(tools.getId());
                        baseToolsService.updateById(baseTools);
                    }

                    paraHoleTools.setToolCode(baseTools.getId());
                    ToolsConfigProperty configProperty = new ToolsConfigProperty()
                            .setChineseName(ExcelUtils.getCellValueAsString(cell7))
                            .setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8))
                            .setStandardLevel(ExcelUtils.getCellValueAsString(cell9))
                            .setStandardCode(ExcelUtils.getCellValueAsString(cell10))
                            .setToolModel(ExcelUtils.getCellValueAsString(cell11))
                            .setPositionCode(ExcelUtils.getCellValueAsString(cell1))
                            .setApplicationType("1");//1:通用工具类型

                    //根据刀具id、分类id查询通用参数信息
                    List<ToolsConfigProperty> configPropertyList = toolsConfigPropertyService.list(new LambdaQueryWrapper<ToolsConfigProperty>()
                            .eq(ToolsConfigProperty::getToolCode, baseTools.getId())
                            .eq(ToolsConfigProperty::getClassifyId, classify.getId())
                            .eq(ToolsConfigProperty::getStatus, CommonConstant.STATUS_1));
                    if (CollectionUtil.isEmpty(configPropertyList)) {
                        //不存在通用参数信息，新增
                        configProperty.setStatus(CommonConstant.STATUS_1);
                        configProperty.setToolCode(baseTools.getId());
                        configProperty.setClassifyId(classify.getId());
                        toolsConfigPropertyService.save(configProperty);
                    } else {
                        //存在通用参数信息，更新
                        ToolsConfigProperty property = configPropertyList.get(0);
                        configProperty.setId(property.getId());
                        toolsConfigPropertyService.updateById(configProperty);
                    }

                    List<ParaHoleTools> paraHoleToolsList = paraHoleToolsService.list(new LambdaQueryWrapper<ParaHoleTools>()
                            .eq(ParaHoleTools::getToolCode, baseTools.getId())
                            .eq(ParaHoleTools::getClassifyId, classify.getId())
                            .eq(ParaHoleTools::getToolModel, ExcelUtils.getCellValueAsString(cell11)));
                    if (CollectionUtil.isNotEmpty(paraHoleToolsList)) {
                        //存在该孔加工工具参数信息，更新
                        ParaHoleTools paraHoleTool = paraHoleToolsList.get(0);
                        paraHoleTools.setId(paraHoleTool.getId());
                    }

                    Cell cell13 = row.getCell(13);//刀具直径
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具直径为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setDiameter(ExcelUtils.getCellValueAsString(cell10));
                        paraHoleTools.setDiameter(ExcelUtils.getCellValueAsString(cell13));
                    }
                    Cell cell11 = row.getCell(11);//切削刃锥角
                    paraHoleTools.setConeAngle(ExcelUtils.getCellValueAsString(cell11));
                    Cell cell12 = row.getCell(12);//切削刃长
                    if (cell12 == null || cell12.getCellType() == CellType.BLANK) {
                    Cell cell14 = row.getCell(14);//切削刃锥角
                    paraHoleTools.setConeAngle(ExcelUtils.getCellValueAsString(cell14));
                    Cell cell15 = row.getCell(15);//切削刃长
                    if (cell15 == null || cell15.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削刃长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setEdgeLength(ExcelUtils.getCellValueAsString(cell12));
                        paraHoleTools.setEdgeLength(ExcelUtils.getCellValueAsString(cell15));
                    }
                    Cell cell13 = row.getCell(13);//刀具总长
                    if (cell13 == null || cell13.getCellType() == CellType.BLANK) {
                    Cell cell16 = row.getCell(16);//刀具总长
                    if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具总长为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setTotalLength(ExcelUtils.getCellValueAsString(cell13));
                        paraHoleTools.setTotalLength(ExcelUtils.getCellValueAsString(cell16));
                    }
                    Cell cell14 = row.getCell(14);//刀具材料
                    if (cell14 == null || cell14.getCellType() == CellType.BLANK) {
                    Cell cell17 = row.getCell(17);//刀具材料
                    if (cell17 == null || cell17.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell14));
                        paraHoleTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell17));
                    }
                    Cell cell15 = row.getCell(15);//零件材料
                    paraHoleTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell15));
                    Cell cell16 = row.getCell(16);//是否涂层
                    if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                    Cell cell18 = row.getCell(18);//零件材料
                    paraHoleTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell18));
                    Cell cell19 = row.getCell(19);//是否涂层
                    if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell16));
                        paraHoleTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell19));
                    }
                    Cell cell17 = row.getCell(17);//刀具型式
                    if (cell17 == null || cell17.getCellType() == CellType.BLANK) {
                    Cell cell20 = row.getCell(20);//刀具型式
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具型式为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setToolPattern(ExcelUtils.getCellValueAsString(cell17));
                        paraHoleTools.setToolPattern(ExcelUtils.getCellValueAsString(cell20));
                    }
                    Cell cell18 = row.getCell(18);//柄部规格
                    if (cell18 == null || cell18.getCellType() == CellType.BLANK) {
                    Cell cell21 = row.getCell(21);//柄部规格
                    if (cell21 == null || cell21.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,柄部规格为空! ");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setHandleSpecifications(ExcelUtils.getCellValueAsString(cell18));
                        paraHoleTools.setHandleSpecifications(ExcelUtils.getCellValueAsString(cell21));
                    }
                    Cell cell19 = row.getCell(19);//冷却方式
                    if (cell19 == null || cell19.getCellType() == CellType.BLANK) {
                    Cell cell22 = row.getCell(22);//冷却方式
                    if (cell22 == null || cell22.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,冷却方式为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell19));
                        paraHoleTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell22));
                    }
                    Cell cell20 = row.getCell(20);//附加技术条件
                    if (cell20 == null || cell20.getCellType() == CellType.BLANK) {
                    Cell cell23 = row.getCell(23);//附加技术条件
                    if (cell23 == null || cell23.getCellType() == CellType.BLANK) {
                        errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！");
                        errorLines++;
                        continue;
                    } else {
                        paraHoleTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell20));
                        paraHoleTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell23));
                    }
                    Cell cell21 = row.getCell(21);//附加技术条件说明
                    paraHoleTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell21));
                    Cell cell22 = row.getCell(22);//品牌
                    paraHoleTools.setBrand(ExcelUtils.getCellValueAsString(cell22));
                    Cell cell23 = row.getCell(23);//制式
                    paraHoleTools.setTypes(ExcelUtils.getCellValueAsString(cell23));
                    Cell cell24 = row.getCell(24);//公差等级
                    paraHoleTools.setToleranceClass(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//排屑槽形式
                    paraHoleTools.setFluteForm(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//柄部形式
                    paraHoleTools.setHandleForm(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//刃数
                    paraHoleTools.setBladeCount(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//最小直径
                    paraHoleTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//倒角角度
                    paraHoleTools.setChamferAngle(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//适配刀片-刀头-刀杆
                    paraHoleTools.setFitterPart(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//有效加工长度
                    paraHoleTools.setEffectiveLength(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//钻头直径范围
                    paraHoleTools.setDrillDiameterRange(ExcelUtils.getCellValueAsString(cell32));
                    Cell cell33 = row.getCell(33);//刀杆直径
                    paraHoleTools.setKnifeDiameter(ExcelUtils.getCellValueAsString(cell33));
                    Cell cell34 = row.getCell(34);//孔径
                    paraHoleTools.setBoreDiameter(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//接口形式
                    paraHoleTools.setConnectorType(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//接口槽长规格
                    paraHoleTools.setSlotSpecification(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//适用范围
                    paraHoleTools.setScopeOfApplication(ExcelUtils.getCellValueAsString(cell37));
                    Cell cell38 = row.getCell(38);//最小镗孔直径
                    paraHoleTools.setLatestBoringDiameter(ExcelUtils.getCellValueAsString(cell38));
                    Cell cell39 = row.getCell(39);//最大镗孔直径
                    paraHoleTools.setMaxBoringDiameter(ExcelUtils.getCellValueAsString(cell39));
                    Cell cell40 = row.getCell(40);//加工方式
                    paraHoleTools.setProcessingmethod(ExcelUtils.getCellValueAsString(cell40));
                    Cell cell41 = row.getCell(41);//刀头数
                    paraHoleTools.setHeadsNumber(ExcelUtils.getCellValueAsString(cell41));
                    Cell cell42 = row.getCell(42);//适配刀座
                    paraHoleTools.setAdaptHolder(ExcelUtils.getCellValueAsString(cell42));
                    Cell cell24 = row.getCell(24);//附加技术条件说明
                    paraHoleTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell24));
                    Cell cell25 = row.getCell(25);//品牌
                    paraHoleTools.setBrand(ExcelUtils.getCellValueAsString(cell25));
                    Cell cell26 = row.getCell(26);//制式
                    paraHoleTools.setTypes(ExcelUtils.getCellValueAsString(cell26));
                    Cell cell27 = row.getCell(27);//公差等级
                    paraHoleTools.setToleranceClass(ExcelUtils.getCellValueAsString(cell27));
                    Cell cell28 = row.getCell(28);//排屑槽形式
                    paraHoleTools.setFluteForm(ExcelUtils.getCellValueAsString(cell28));
                    Cell cell29 = row.getCell(29);//柄部形式
                    paraHoleTools.setHandleForm(ExcelUtils.getCellValueAsString(cell29));
                    Cell cell30 = row.getCell(30);//刃数
                    paraHoleTools.setBladeCount(ExcelUtils.getCellValueAsString(cell30));
                    Cell cell31 = row.getCell(31);//最小直径
                    paraHoleTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell31));
                    Cell cell32 = row.getCell(32);//倒角角度
                    paraHoleTools.setChamferAngle(ExcelUtils.getCellValueAsString(cell32));
                    Cell cell33 = row.getCell(33);//适配刀片-刀头-刀杆
                    paraHoleTools.setFitterPart(ExcelUtils.getCellValueAsString(cell33));
                    Cell cell34 = row.getCell(34);//有效加工长度
                    paraHoleTools.setEffectiveLength(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//钻头直径范围
                    paraHoleTools.setDrillDiameterRange(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//刀杆直径
                    paraHoleTools.setKnifeDiameter(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//孔径
                    paraHoleTools.setBoreDiameter(ExcelUtils.getCellValueAsString(cell37));
                    Cell cell38 = row.getCell(38);//接口形式
                    paraHoleTools.setConnectorType(ExcelUtils.getCellValueAsString(cell38));
                    Cell cell39 = row.getCell(39);//接口槽长规格
                    paraHoleTools.setSlotSpecification(ExcelUtils.getCellValueAsString(cell39));
                    Cell cell40 = row.getCell(40);//适用范围
                    paraHoleTools.setScopeOfApplication(ExcelUtils.getCellValueAsString(cell40));
                    Cell cell41 = row.getCell(41);//最小镗孔直径
                    paraHoleTools.setLatestBoringDiameter(ExcelUtils.getCellValueAsString(cell41));
                    Cell cell42 = row.getCell(42);//最大镗孔直径
                    paraHoleTools.setMaxBoringDiameter(ExcelUtils.getCellValueAsString(cell42));
                    Cell cell43 = row.getCell(43);//加工方式
                    paraHoleTools.setProcessingmethod(ExcelUtils.getCellValueAsString(cell43));
                    Cell cell44 = row.getCell(44);//刀头数
                    paraHoleTools.setHeadsNumber(ExcelUtils.getCellValueAsString(cell44));
                    Cell cell45 = row.getCell(45);//适配刀座
                    paraHoleTools.setAdaptHolder(ExcelUtils.getCellValueAsString(cell45));

                    paraHoleToolsImportList.add(paraHoleTools);
                    successLines++;
@@ -439,4 +554,16 @@
        }
    }

    /**
     * 通过工具id查询
     *
     * @param toolCode
     * @return
     */
    @GetMapping(value = "/queryByToolCode")
    public Result<ParaHoleTools> queryByToolCode(@RequestParam(name="toolCode",required=true) String toolCode) {
        ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,toolCode).one();
        return Result.OK(paraHoleTools);
    }

}