lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
@@ -22,9 +22,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PmsUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.tms.entity.BaseTools; import org.jeecg.modules.tms.entity.ParaBlade; import org.jeecg.modules.tms.entity.ToolsClassify; import org.jeecg.modules.tms.entity.*; import org.jeecg.modules.tms.enums.AccuracyClass; import org.jeecg.modules.tms.service.IBaseToolsService; import org.jeecg.modules.tms.service.IParaBladeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -32,6 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -66,6 +66,8 @@ private IToolsClassifyService toolsClassifyService; @Autowired private IBaseToolsService baseToolsService; @Autowired private IToolsConfigPropertyService toolsConfigPropertyService; /** * 分页列表查询 @@ -210,188 +212,298 @@ 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<ParaBlade> paraThreadingToolList = paraBladeService.list(new LambdaQueryWrapper<ParaBlade>() .eq(ParaBlade::getToolCode, baseTools.getId()) .eq(ParaBlade::getToolModel, ExcelUtils.getCellValueAsString(cell9))); if (CollectionUtil.isEmpty(paraThreadingToolList)) { paraBlade.setClassifyId(toolsClassify.getId()); paraBlade.setToolCode(baseTools.getId()); paraBlade.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 { paraBlade = paraThreadingToolList.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); paraBlade.setClassifyId(classify.getId()); } } } } Cell cell0 = row.getCell(0);//序号(或企业内原代码) paraBlade.setSignCode(ExcelUtils.getCellValueAsString(cell0)); Cell cell5 = row.getCell(5);//物品中文名称 if (cell5 == null || cell5.getCellType() == CellType.BLANK) { Cell cell2 = row.getCell(2);//序号(或企业内原代码) paraBlade.setSignCode(ExcelUtils.getCellValueAsString(cell2)); Cell cell7 = row.getCell(7);//物品中文名称 if (cell7 == null || cell7.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! "); errorLines++; continue; } else { paraBlade.setChineseName(ExcelUtils.getCellValueAsString(cell5)); paraBlade.setChineseName(ExcelUtils.getCellValueAsString(cell7)); } Cell cell6 = row.getCell(6);//物品外文名称 paraBlade.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6)); Cell cell7 = row.getCell(7);//标准级别 paraBlade.setStandardLevel(ExcelUtils.getCellValueAsString(cell7)); Cell cell8 = row.getCell(8);//标准号 paraBlade.setStandardCode(ExcelUtils.getCellValueAsString(cell8)); Cell cell10 = row.getCell(10);//刀片形状 if (cell10 == null || cell10.getCellType() == CellType.BLANK) { Cell cell8 = row.getCell(8);//物品外文名称 paraBlade.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8)); Cell cell9 = row.getCell(9);//标准级别 paraBlade.setStandardLevel(ExcelUtils.getCellValueAsString(cell9)); Cell cell10 = row.getCell(10);//标准号 paraBlade.setStandardCode(ExcelUtils.getCellValueAsString(cell10)); Cell cell11 = row.getCell(11); if (cell11 == null || cell11.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! "); errorLines++; continue; } else { paraBlade.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("6")//6：刀片 .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); } paraBlade.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<ParaBlade> paraBladeList = paraBladeService.list(new LambdaQueryWrapper<ParaBlade>() .eq(ParaBlade::getToolCode, baseTools.getId()) .eq(ParaBlade::getClassifyId, classify.getId()) .eq(ParaBlade::getToolModel, ExcelUtils.getCellValueAsString(cell11))); if (CollectionUtil.isNotEmpty(paraBladeList)) { //存在该刀片参数信息，更新 ParaBlade blade = paraBladeList.get(0); paraBlade.setId(blade.getId()); } Cell cell13 = row.getCell(13);//刀片形状 if (cell13 == null || cell13.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀片形状为空! "); errorLines++; continue; } else { paraBlade.setBladeShape(ExcelUtils.getCellValueAsString(cell10)); paraBlade.setBladeShape(ExcelUtils.getCellValueAsString(cell13)); } Cell cell11 = row.getCell(11);//刀片长度 if (cell11 == null || cell11.getCellType() == CellType.BLANK) { Cell cell14 = row.getCell(14);//刀片长度 if (cell14 == null || cell14.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀片长度为空! "); errorLines++; continue; } else { paraBlade.setBladeLength(ExcelUtils.getCellValueAsString(cell11)); paraBlade.setBladeLength(ExcelUtils.getCellValueAsString(cell14)); } Cell cell12 = row.getCell(12);//切削刃数 if (cell12 == null || cell12.getCellType() == CellType.BLANK) { Cell cell15 = row.getCell(15);//切削刃数 if (cell15 == null || cell15.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削刃数为空! "); errorLines++; continue; } else { paraBlade.setCuttingEdgeCount(ExcelUtils.getCellValueAsString(cell12)); paraBlade.setCuttingEdgeCount(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 { paraBlade.setBladeThickness(ExcelUtils.getCellValueAsString(cell13)); paraBlade.setBladeThickness(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 { paraBlade.setClampingType(ExcelUtils.getCellValueAsString(cell14)); paraBlade.setClampingType(ExcelUtils.getCellValueAsString(cell17)); } Cell cell15 = row.getCell(15);//刀尖R if (cell15 == null || cell15.getCellType() == CellType.BLANK) { Cell cell18 = row.getCell(18);//刀尖R if (cell18 == null || cell18.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀尖R为空! "); errorLines++; continue; } else { paraBlade.setNoseAngleR(ExcelUtils.getCellValueAsString(cell15)); paraBlade.setNoseAngleR(ExcelUtils.getCellValueAsString(cell18)); } Cell cell16 = row.getCell(16);//刀片材料 if (cell16 == null || cell16.getCellType() == CellType.BLANK) { Cell cell19 = row.getCell(19);//刀片材料 if (cell19 == null || cell19.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀片材料为空! "); errorLines++; continue; } else { paraBlade.setToolMaterial(ExcelUtils.getCellValueAsString(cell16)); paraBlade.setToolMaterial(ExcelUtils.getCellValueAsString(cell19)); } Cell cell17 = row.getCell(17);//零件材料 paraBlade.setPartMaterial(ExcelUtils.getCellValueAsString(cell17)); Cell cell18 = row.getCell(18);//是否涂层 if (cell18 == null || cell18.getCellType() == CellType.BLANK) { Cell cell20 = row.getCell(20);//零件材料 paraBlade.setPartMaterial(ExcelUtils.getCellValueAsString(cell20)); Cell cell21 = row.getCell(21);//是否涂层 if (cell21 == null || cell21.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! "); errorLines++; continue; } else { paraBlade.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell18)); paraBlade.setPaintcoatFlag(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 { paraBlade.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell19)); paraBlade.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell22)); } Cell cell20 = row.getCell(20);//附加技术条件说明 paraBlade.setConditionsInfo(ExcelUtils.getCellValueAsString(cell20)); Cell cell21 = row.getCell(21);//品牌 paraBlade.setBrand(ExcelUtils.getCellValueAsString(cell21)); Cell cell22 = row.getCell(22);//制式 paraBlade.setTypes(ExcelUtils.getCellValueAsString(cell22)); Cell cell23 = row.getCell(23);//涂层材料 paraBlade.setCoatingMaterial(ExcelUtils.getCellValueAsString(cell23)); Cell cell24 = row.getCell(24);//加工分类 paraBlade.setProcessingClassify(ExcelUtils.getCellValueAsString(cell24)); Cell cell25 = row.getCell(25);//刀片后角 paraBlade.setBladePosterior(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//切削方向 paraBlade.setCuttingDirection(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//刀片宽度 paraBlade.setBladeWide(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//刀片尺寸 paraBlade.setBladeSize(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//内外螺纹 paraBlade.setInOutThread(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//螺纹标准 paraBlade.setThreadStandard(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//牙型角度 paraBlade.setDentalAngle(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//螺距 paraBlade.setPitch(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//最小加工内螺纹公称直径 paraBlade.setMinInternalThread(ExcelUtils.getCellValueAsString(cell33)); Cell cell23 = row.getCell(23);//附加技术条件说明 paraBlade.setConditionsInfo(ExcelUtils.getCellValueAsString(cell23)); Cell cell24 = row.getCell(24);//品牌 paraBlade.setBrand(ExcelUtils.getCellValueAsString(cell24)); Cell cell25 = row.getCell(25);//制式 paraBlade.setTypes(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//涂层材料 paraBlade.setCoatingMaterial(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//加工分类 paraBlade.setProcessingClassify(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//刀片后角 paraBlade.setBladePosterior(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//切削方向 paraBlade.setCuttingDirection(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//刀片宽度 paraBlade.setBladeWide(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//刀片尺寸 paraBlade.setBladeSize(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//内外螺纹 paraBlade.setInOutThread(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//螺纹标准 paraBlade.setThreadStandard(ExcelUtils.getCellValueAsString(cell33)); Cell cell34 = row.getCell(34);//牙型角度 paraBlade.setDentalAngle(ExcelUtils.getCellValueAsString(cell34)); Cell cell35 = row.getCell(35);//螺距 paraBlade.setPitch(ExcelUtils.getCellValueAsString(cell35)); Cell cell36 = row.getCell(36);//最小加工内螺纹公称直径 paraBlade.setMinInternalThread(ExcelUtils.getCellValueAsString(cell36)); paraBladeImportList.add(paraBlade); successLines++; lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java
@@ -22,9 +22,8 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PmsUtil; import org.jeecg.modules.tms.entity.BaseTools; import org.jeecg.modules.tms.entity.ParaCommonTool; import org.jeecg.modules.tms.entity.ToolsClassify; import org.jeecg.modules.tms.entity.*; import org.jeecg.modules.tms.enums.AccuracyClass; import org.jeecg.modules.tms.service.IBaseToolsService; import org.jeecg.modules.tms.service.IParaCommonToolService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -32,6 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -66,6 +66,8 @@ private IToolsClassifyService toolsClassifyService; @Autowired private IBaseToolsService baseToolsService; @Autowired private IToolsConfigPropertyService toolsConfigPropertyService; /** * 分页列表查询 @@ -210,84 +212,204 @@ 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<ParaCommonTool> paraCommonToolList = paraCommonToolService.list(new LambdaQueryWrapper<ParaCommonTool>() .eq(ParaCommonTool::getToolCode, baseTools.getId()) .eq(ParaCommonTool::getToolModel, ExcelUtils.getCellValueAsString(cell9))); if (CollectionUtil.isEmpty(paraCommonToolList)) { paraCommonTool.setClassifyId(toolsClassify.getId()); paraCommonTool.setToolCode(baseTools.getId()); paraCommonTool.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 { paraCommonTool = paraCommonToolList.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); paraCommonTool.setClassifyId(classify.getId()); } } } } Cell cell0 = row.getCell(0);//序号(或企业内原代码) paraCommonTool.setSignCode(ExcelUtils.getCellValueAsString(cell0)); Cell cell5 = row.getCell(5);//物品中文名称 if (cell5 == null || cell5.getCellType() == CellType.BLANK) { Cell cell2 = row.getCell(2);//序号(或企业内原代码) paraCommonTool.setSignCode(ExcelUtils.getCellValueAsString(cell2)); Cell cell7 = row.getCell(7);//物品中文名称 if (cell7 == null || cell7.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! "); errorLines++; continue; } else { paraCommonTool.setChineseName(ExcelUtils.getCellValueAsString(cell5)); paraCommonTool.setChineseName(ExcelUtils.getCellValueAsString(cell7)); } Cell cell6 = row.getCell(6);//物品外文名称 paraCommonTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6)); Cell cell7 = row.getCell(7);//标准级别 paraCommonTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell7)); Cell cell8 = row.getCell(8);//标准号 paraCommonTool.setStandardCode(ExcelUtils.getCellValueAsString(cell8)); Cell cell8 = row.getCell(8);//物品外文名称 paraCommonTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8)); Cell cell9 = row.getCell(9);//标准级别 paraCommonTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell9)); Cell cell10 = row.getCell(10);//标准号 paraCommonTool.setStandardCode(ExcelUtils.getCellValueAsString(cell10)); Cell cell11 = row.getCell(11); if (cell11 == null || cell11.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! "); errorLines++; continue; } else { paraCommonTool.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("1")//1：通用参数类型 .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); } paraCommonTool.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<ParaCommonTool> paraCommonToolList = paraCommonToolService.list(new LambdaQueryWrapper<ParaCommonTool>() .eq(ParaCommonTool::getToolCode, baseTools.getId()) .eq(ParaCommonTool::getClassifyId, classify.getId()) .eq(ParaCommonTool::getToolModel, ExcelUtils.getCellValueAsString(cell11))); if (CollectionUtil.isNotEmpty(paraCommonToolList)) { //存在该通用参数信息，更新 ParaCommonTool commonTool = paraCommonToolList.get(0); paraCommonTool.setId(commonTool.getId()); } Cell cell13 = row.getCell(13);//刀具材料 if (cell13 == null || cell13.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! "); errorLines++; continue; } else { paraCommonTool.setToolMaterial(ExcelUtils.getCellValueAsString(cell13)); } Cell cell14 = row.getCell(14);//零件材料 paraCommonTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell14)); paraCommonToolImportList.add(paraCommonTool); successLines++; 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++; lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaMillToolController.java
@@ -23,10 +23,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PmsUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.tms.entity.BaseTools; import org.jeecg.modules.tms.entity.ParaHoleTools; import org.jeecg.modules.tms.entity.ParaMillTool; import org.jeecg.modules.tms.entity.ToolsClassify; import org.jeecg.modules.tms.entity.*; import org.jeecg.modules.tms.enums.AccuracyClass; import org.jeecg.modules.tms.service.IBaseToolsService; import org.jeecg.modules.tms.service.IParaMillToolService; @@ -36,6 +34,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; @@ -70,6 +69,8 @@ private IToolsClassifyService toolsClassifyService; @Autowired private IBaseToolsService baseToolsService; @Autowired private IToolsConfigPropertyService toolsConfigPropertyService; /** * 分页列表查询 @@ -214,211 +215,321 @@ 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<ParaMillTool> paraMillToolList = paraMillToolService.list(new LambdaQueryWrapper<ParaMillTool>() .eq(ParaMillTool::getToolCode, baseTools.getId()) .eq(ParaMillTool::getToolModel, ExcelUtils.getCellValueAsString(cell9))); if (CollectionUtil.isEmpty(paraMillToolList)) { paraMillTool.setClassifyId(toolsClassify.getId()); paraMillTool.setToolCode(baseTools.getId()); paraMillTool.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 { paraMillTool = paraMillToolList.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); paraMillTool.setClassifyId(classify.getId()); } } } } Cell cell0 = row.getCell(0); paraMillTool.setSignCode(cell0.getStringCellValue()); Cell cell5 = row.getCell(5);//物品中文名称 if (cell5 == null || cell5.getCellType() == CellType.BLANK) { Cell cell2 = row.getCell(2);//序号(或企业内原代码) paraMillTool.setSignCode(ExcelUtils.getCellValueAsString(cell2)); Cell cell7 = row.getCell(7);//物品中文名称 if (cell7 == null || cell7.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! "); errorLines++; continue; } else { paraMillTool.setChineseName(ExcelUtils.getCellValueAsString(cell5)); paraMillTool.setChineseName(ExcelUtils.getCellValueAsString(cell7)); } Cell cell6 = row.getCell(6);//物品外文名称 paraMillTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6)); Cell cell7 = row.getCell(7);//标准级别 paraMillTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell7)); Cell cell8 = row.getCell(8);//标准号 paraMillTool.setStandardCode(ExcelUtils.getCellValueAsString(cell8)); Cell cell10 = row.getCell(10);//刀具直径 if (cell10 == null || cell10.getCellType() == CellType.BLANK) { Cell cell8 = row.getCell(8);//物品外文名称 paraMillTool.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8)); Cell cell9 = row.getCell(9);//标准级别 paraMillTool.setStandardLevel(ExcelUtils.getCellValueAsString(cell9)); Cell cell10 = row.getCell(10);//标准号 paraMillTool.setStandardCode(ExcelUtils.getCellValueAsString(cell10)); Cell cell11 = row.getCell(11); if (cell11 == null || cell11.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! "); errorLines++; continue; } else { paraMillTool.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("3")//4：铣削刀具 .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); } paraMillTool.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<ParaMillTool> paraMillToolList = paraMillToolService.list(new LambdaQueryWrapper<ParaMillTool>() .eq(ParaMillTool::getToolCode, baseTools.getId()) .eq(ParaMillTool::getClassifyId, classify.getId()) .eq(ParaMillTool::getToolModel, ExcelUtils.getCellValueAsString(cell11))); if (CollectionUtil.isNotEmpty(paraMillToolList)) { //存在该铣削刀具参数信息，更新 ParaMillTool millTool = paraMillToolList.get(0); paraMillTool.setId(millTool.getId()); } Cell cell13 = row.getCell(13);//刀具直径 if (cell13 == null || cell13.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具直径为空! "); errorLines++; continue; } else { paraMillTool.setDiameter(ExcelUtils.getCellValueAsString(cell10)); paraMillTool.setDiameter(ExcelUtils.getCellValueAsString(cell13)); } Cell cell11 = row.getCell(11);//刀尖角R if (cell11 == null || cell11.getCellType() == CellType.BLANK) { Cell cell14 = row.getCell(14);//刀尖角R if (cell14 == null || cell11.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀尖角R为空! "); } else { paraMillTool.setNoseAngleR(ExcelUtils.getCellValueAsString(cell11)); paraMillTool.setNoseAngleR(ExcelUtils.getCellValueAsString(cell14)); } Cell cell12 = row.getCell(12);//齿数 if (cell12 == null || cell12.getCellType() == CellType.BLANK) { Cell cell15 = row.getCell(15);//齿数 if (cell15 == null || cell15.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,齿数为空! "); errorLines++; continue; } else { paraMillTool.setNumberOfTeeth(ExcelUtils.getCellValueAsString(cell12)); paraMillTool.setNumberOfTeeth(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 { paraMillTool.setEdgeLength(ExcelUtils.getCellValueAsString(cell13)); paraMillTool.setEdgeLength(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 { paraMillTool.setTotalLength(ExcelUtils.getCellValueAsString(cell14)); paraMillTool.setTotalLength(ExcelUtils.getCellValueAsString(cell17)); } Cell cell15 = row.getCell(15);//刀具材料 if (cell15 == null || cell15.getCellType() == CellType.BLANK) { Cell cell18 = row.getCell(18);//刀具材料 if (cell18 == null || cell15.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! "); } else { paraMillTool.setToolMaterial(ExcelUtils.getCellValueAsString(cell15)); paraMillTool.setToolMaterial(ExcelUtils.getCellValueAsString(cell18)); } Cell cell16 = row.getCell(16);//零件材料 paraMillTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell16)); Cell cell17 = row.getCell(17);//是否涂层 if (cell17 == null || cell17.getCellType() == CellType.BLANK) { Cell cell19 = row.getCell(19);//零件材料 paraMillTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell19)); Cell cell20 = row.getCell(20);//是否涂层 if (cell20 == null || cell20.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,是否涂层为空! "); errorLines++; continue; } else { paraMillTool.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell17)); paraMillTool.setPaintcoatFlag(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 { paraMillTool.setToolPattern(ExcelUtils.getCellValueAsString(cell18)); paraMillTool.setToolPattern(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 { paraMillTool.setClampingSpecifications(ExcelUtils.getCellValueAsString(cell19)); paraMillTool.setClampingSpecifications(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 { paraMillTool.setCoolingMethod(ExcelUtils.getCellValueAsString(cell20)); paraMillTool.setCoolingMethod(ExcelUtils.getCellValueAsString(cell23)); } Cell cell21 = row.getCell(21);//附加技术条件 if (cell21 == null || cell20.getCellType() == CellType.BLANK) { Cell cell24 = row.getCell(24);//附加技术条件 if (cell24 == null || cell24.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,附加技术条件为空！"); } else { paraMillTool.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell21)); paraMillTool.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell24)); } Cell cell22 = row.getCell(22);//附加技术条件说明 paraMillTool.setConditionsInfo(ExcelUtils.getCellValueAsString(cell22)); Cell cell23 = row.getCell(23);//品牌 paraMillTool.setBrand(ExcelUtils.getCellValueAsString(cell23)); Cell cell24 = row.getCell(24);//颈径 paraMillTool.setNeckDiameter(ExcelUtils.getCellValueAsString(cell24)); Cell cell25 = row.getCell(25);//柄部形式 paraMillTool.setHandleForm(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//刀尖角C paraMillTool.setNoseAngleC(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//刀尖角内R paraMillTool.setAngleInsideR(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//最小直径 paraMillTool.setSmallDiameter(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//刀具角度 paraMillTool.setToolAngle(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//柄长 paraMillTool.setHandleLength(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//主偏角K paraMillTool.setMainAngleK(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//最大切深 paraMillTool.setDeepestDepth(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//适配刀片 paraMillTool.setAdaptBlade(ExcelUtils.getCellValueAsString(cell33)); Cell cell34 = row.getCell(34);//柄颈形式 paraMillTool.setHandleNeckForm(ExcelUtils.getCellValueAsString(cell34)); Cell cell35 = row.getCell(35);//柄颈长度 paraMillTool.setHandleNeckLength(ExcelUtils.getCellValueAsString(cell35)); Cell cell36 = row.getCell(36);//接口尺寸规格 paraMillTool.setSizeSpecifications(ExcelUtils.getCellValueAsString(cell36)); Cell cell37 = row.getCell(37);//铣刀头形式 paraMillTool.setMillingHeadForm(ExcelUtils.getCellValueAsString(cell37)); Cell cell38 = row.getCell(38);//悬伸长度 paraMillTool.setOverhangingLength(ExcelUtils.getCellValueAsString(cell38)); Cell cell39 = row.getCell(39);//切削刃形式 paraMillTool.setCuttingEdgeForm(ExcelUtils.getCellValueAsString(cell39)); Cell cell40 = row.getCell(40);//内外螺纹 paraMillTool.setNumberPatterns(ExcelUtils.getCellValueAsString(cell40)); Cell cell41 = row.getCell(41);//螺距 paraMillTool.setPitch(ExcelUtils.getCellValueAsString(cell41)); Cell cell42 = row.getCell(42);//最小加工直径 paraMillTool.setRecentlyDiameter(ExcelUtils.getCellValueAsString(cell42)); Cell cell25 = row.getCell(25);//附加技术条件说明 paraMillTool.setConditionsInfo(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//品牌 paraMillTool.setBrand(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//颈径 paraMillTool.setNeckDiameter(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//柄部形式 paraMillTool.setHandleForm(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//刀尖角C paraMillTool.setNoseAngleC(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//刀尖角内R paraMillTool.setAngleInsideR(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//最小直径 paraMillTool.setSmallDiameter(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//刀具角度 paraMillTool.setToolAngle(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//柄长 paraMillTool.setHandleLength(ExcelUtils.getCellValueAsString(cell33)); Cell cell34 = row.getCell(34);//主偏角K paraMillTool.setMainAngleK(ExcelUtils.getCellValueAsString(cell34)); Cell cell35 = row.getCell(35);//最大切深 paraMillTool.setDeepestDepth(ExcelUtils.getCellValueAsString(cell35)); Cell cell36 = row.getCell(36);//适配刀片 paraMillTool.setAdaptBlade(ExcelUtils.getCellValueAsString(cell36)); Cell cell37 = row.getCell(37);//柄颈形式 paraMillTool.setHandleNeckForm(ExcelUtils.getCellValueAsString(cell37)); Cell cell38 = row.getCell(38);//柄颈长度 paraMillTool.setHandleNeckLength(ExcelUtils.getCellValueAsString(cell38)); Cell cell39 = row.getCell(39);//接口尺寸规格 paraMillTool.setSizeSpecifications(ExcelUtils.getCellValueAsString(cell39)); Cell cell40 = row.getCell(40);//铣刀头形式 paraMillTool.setMillingHeadForm(ExcelUtils.getCellValueAsString(cell40)); Cell cell41 = row.getCell(41);//悬伸长度 paraMillTool.setOverhangingLength(ExcelUtils.getCellValueAsString(cell41)); Cell cell42 = row.getCell(42);//切削刃形式 paraMillTool.setCuttingEdgeForm(ExcelUtils.getCellValueAsString(cell42)); Cell cell43 = row.getCell(43);//内外螺纹 paraMillTool.setNumberPatterns(ExcelUtils.getCellValueAsString(cell43)); Cell cell44 = row.getCell(44);//螺距 paraMillTool.setPitch(ExcelUtils.getCellValueAsString(cell44)); Cell cell45 = row.getCell(45);//最小加工直径 paraMillTool.setRecentlyDiameter(ExcelUtils.getCellValueAsString(cell45)); paraMillToolImportList.add(paraMillTool); successLines++; lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaTurningToolsController.java
@@ -22,9 +22,8 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PmsUtil; import org.jeecg.modules.tms.entity.BaseTools; import org.jeecg.modules.tms.entity.ParaTurningTools; import org.jeecg.modules.tms.entity.ToolsClassify; import org.jeecg.modules.tms.entity.*; import org.jeecg.modules.tms.enums.AccuracyClass; import org.jeecg.modules.tms.service.IBaseToolsService; import org.jeecg.modules.tms.service.IParaTurningToolsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -32,6 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -66,6 +66,8 @@ private IToolsClassifyService toolsClassifyService; @Autowired private IBaseToolsService baseToolsService; @Autowired private IToolsConfigPropertyService toolsConfigPropertyService; /** * 分页列表查询 @@ -210,217 +212,327 @@ 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<ParaTurningTools> paraTurningToolsList = paraTurningToolsService.list(new LambdaQueryWrapper<ParaTurningTools>() .eq(ParaTurningTools::getToolCode, baseTools.getId()) .eq(ParaTurningTools::getToolModel, ExcelUtils.getCellValueAsString(cell9))); if (CollectionUtil.isEmpty(paraTurningToolsList)) { paraTurningTools.setClassifyId(toolsClassify.getId()); paraTurningTools.setToolCode(baseTools.getId()); paraTurningTools.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 { paraTurningTools = paraTurningToolsList.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); paraTurningTools.setClassifyId(classify.getId()); } } } } Cell cell0 = row.getCell(0); paraTurningTools.setSignCode(cell0.getStringCellValue()); Cell cell5 = row.getCell(5);//物品中文名称 if (cell5 == null || cell5.getCellType() == CellType.BLANK) { Cell cell2 = row.getCell(2);//序号(或企业内原代码) paraTurningTools.setSignCode(ExcelUtils.getCellValueAsString(cell2)); Cell cell7 = row.getCell(7);//物品中文名称 if (cell7 == null || cell7.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,物品中文名称为空! "); errorLines++; continue; } else { paraTurningTools.setChineseName(ExcelUtils.getCellValueAsString(cell5)); paraTurningTools.setChineseName(ExcelUtils.getCellValueAsString(cell7)); } Cell cell6 = row.getCell(6);//物品外文名称 paraTurningTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell6)); Cell cell7 = row.getCell(7);//标准级别 paraTurningTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell7)); Cell cell8 = row.getCell(8);//标准号 paraTurningTools.setStandardCode(ExcelUtils.getCellValueAsString(cell8)); Cell cell10 = row.getCell(10);//刀头规格 if (cell10 == null || cell10.getCellType() == CellType.BLANK) { Cell cell8 = row.getCell(8);//物品外文名称 paraTurningTools.setForeignLanguageName(ExcelUtils.getCellValueAsString(cell8)); Cell cell9 = row.getCell(9);//标准级别 paraTurningTools.setStandardLevel(ExcelUtils.getCellValueAsString(cell9)); Cell cell10 = row.getCell(10);//标准号 paraTurningTools.setStandardCode(ExcelUtils.getCellValueAsString(cell10)); Cell cell11 = row.getCell(11); if (cell11 == null || cell11.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,型号/图号为空! "); errorLines++; continue; } else { paraTurningTools.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("5")//5：车削刀具 .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); } paraTurningTools.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<ParaTurningTools> paraTurningToolsList = paraTurningToolsService.list(new LambdaQueryWrapper<ParaTurningTools>() .eq(ParaTurningTools::getToolCode, baseTools.getId()) .eq(ParaTurningTools::getClassifyId, classify.getId()) .eq(ParaTurningTools::getToolModel, ExcelUtils.getCellValueAsString(cell11))); if (CollectionUtil.isNotEmpty(paraTurningToolsList)) { //存在该车削刀具参数信息，更新 ParaTurningTools turningTools = paraTurningToolsList.get(0); paraTurningTools.setId(turningTools.getId()); } Cell cell13 = row.getCell(13);//刀头规格 if (cell13 == null || cell13.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀头规格为空! "); errorLines++; continue; } else { paraTurningTools.setHeadSpecifications(ExcelUtils.getCellValueAsString(cell10)); paraTurningTools.setHeadSpecifications(ExcelUtils.getCellValueAsString(cell13)); } Cell cell11 = row.getCell(11);//配套刀片号 if (cell11 == null || cell11.getCellType() == CellType.BLANK) { Cell cell14 = row.getCell(14);//配套刀片号 if (cell14 == null || cell14.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,配套刀片号为空! "); errorLines++; continue; } else { paraTurningTools.setMatchingNumber(ExcelUtils.getCellValueAsString(cell11)); paraTurningTools.setMatchingNumber(ExcelUtils.getCellValueAsString(cell14)); } Cell cell12 = row.getCell(12);//主偏角 if (cell12 == null || cell12.getCellType() == CellType.BLANK) { Cell cell15 = row.getCell(15);//主偏角 if (cell15 == null || cell15.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,主偏角为空! "); errorLines++; continue; } else { paraTurningTools.setLeadAngle(ExcelUtils.getCellValueAsString(cell12)); paraTurningTools.setLeadAngle(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 { paraTurningTools.setCrossSectionalSize(ExcelUtils.getCellValueAsString(cell13)); paraTurningTools.setCrossSectionalSize(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 { paraTurningTools.setTotalLength(ExcelUtils.getCellValueAsString(cell14)); paraTurningTools.setTotalLength(ExcelUtils.getCellValueAsString(cell17)); } Cell cell15 = row.getCell(15);//切削方向 if (cell15 == null || cell15.getCellType() == CellType.BLANK) { Cell cell18 = row.getCell(18);//切削方向 if (cell18 == null || cell18.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,切削方向为空! "); errorLines++; continue; } else { paraTurningTools.setCuttingDirection(ExcelUtils.getCellValueAsString(cell15)); paraTurningTools.setCuttingDirection(ExcelUtils.getCellValueAsString(cell18)); } Cell cell16 = row.getCell(16);//刀具材料 if (cell16 == null || cell16.getCellType() == CellType.BLANK) { Cell cell19 = row.getCell(19);//刀具材料 if (cell19 == null || cell19.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具材料为空! "); errorLines++; continue; } else { paraTurningTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell16)); paraTurningTools.setToolMaterial(ExcelUtils.getCellValueAsString(cell19)); } Cell cell17 = row.getCell(17);//零件材料 paraTurningTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell17)); Cell cell18 = row.getCell(18);//刀具型式 if (cell18 == null || cell18.getCellType() == CellType.BLANK) { Cell cell20 = row.getCell(20);//零件材料 paraTurningTools.setPartMaterial(ExcelUtils.getCellValueAsString(cell20)); Cell cell21 = row.getCell(21);//刀具型式 if (cell21 == null || cell21.getCellType() == CellType.BLANK) { errorMessage.add("第" + currentRowNum + "行，数据导入失败,刀具型式为空! "); errorLines++; continue; } else { paraTurningTools.setToolPattern(ExcelUtils.getCellValueAsString(cell18)); paraTurningTools.setToolPattern(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 { paraTurningTools.setPaintcoatFlag(ExcelUtils.getCellValueAsString(cell19)); paraTurningTools.setPaintcoatFlag(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 { paraTurningTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell20)); paraTurningTools.setTechnicalConditions(ExcelUtils.getCellValueAsString(cell23)); } Cell cell21 = row.getCell(21);//附加技术条件说明 paraTurningTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell21)); Cell cell22 = row.getCell(22);//品牌 paraTurningTools.setBrand(ExcelUtils.getCellValueAsString(cell22)); Cell cell23 = row.getCell(23);//制式 paraTurningTools.setTypes(ExcelUtils.getCellValueAsString(cell23)); Cell cell24 = row.getCell(24);//刀片尺寸 paraTurningTools.setKnifeSize(ExcelUtils.getCellValueAsString(cell24)); Cell cell25 = row.getCell(25);//冷却方式 paraTurningTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//刀杆类别 paraTurningTools.setHolderCategory(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//刀具直径 paraTurningTools.setToolDiameter(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//接口紧固形式 paraTurningTools.setFasteningForm(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//镗杆直径 paraTurningTools.setBoringBarDiameter(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//刀杆长度 paraTurningTools.setBladeLength(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//刀片形状 paraTurningTools.setBladeShape(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//刀片后角 paraTurningTools.setBladePosterior(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//刀杆方向 paraTurningTools.setBarDirection(ExcelUtils.getCellValueAsString(cell33)); Cell cell34 = row.getCell(34);//刀杆高度 paraTurningTools.setBladeHeight(ExcelUtils.getCellValueAsString(cell34)); Cell cell35 = row.getCell(35);//刀杆宽度 paraTurningTools.setBladeWide(ExcelUtils.getCellValueAsString(cell35)); Cell cell36 = row.getCell(36);//刀杆尺寸 paraTurningTools.setBladeSize(ExcelUtils.getCellValueAsString(cell36)); Cell cell37 = row.getCell(37);//刀夹型号 paraTurningTools.setKnifeClipModel(ExcelUtils.getCellValueAsString(cell37)); Cell cell38 = row.getCell(38);//刀片装夹方式 paraTurningTools.setClampingMethod(ExcelUtils.getCellValueAsString(cell38)); Cell cell39 = row.getCell(39);//刀片槽宽 paraTurningTools.setSlotWidth(ExcelUtils.getCellValueAsString(cell39)); Cell cell40 = row.getCell(40);//最小切入直径 paraTurningTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell40)); Cell cell41 = row.getCell(41);//最大切入直径 paraTurningTools.setMaxDiameter(ExcelUtils.getCellValueAsString(cell41)); Cell cell42 = row.getCell(42);//最大切槽深度 paraTurningTools.setMaxDepth(ExcelUtils.getCellValueAsString(cell42)); Cell cell43 = row.getCell(43);//刀杆形式 paraTurningTools.setKnifeBarForm(ExcelUtils.getCellValueAsString(cell43)); Cell cell44 = row.getCell(44);//刀板厚度 paraTurningTools.setBladeThickness(ExcelUtils.getCellValueAsString(cell44)); Cell cell45 = row.getCell(45);//最小加工直径 paraTurningTools.setMinDiameter(ExcelUtils.getCellValueAsString(cell45)); Cell cell24 = row.getCell(24);//附加技术条件说明 paraTurningTools.setConditionsInfo(ExcelUtils.getCellValueAsString(cell24)); Cell cell25 = row.getCell(25);//品牌 paraTurningTools.setBrand(ExcelUtils.getCellValueAsString(cell25)); Cell cell26 = row.getCell(26);//制式 paraTurningTools.setTypes(ExcelUtils.getCellValueAsString(cell26)); Cell cell27 = row.getCell(27);//刀片尺寸 paraTurningTools.setKnifeSize(ExcelUtils.getCellValueAsString(cell27)); Cell cell28 = row.getCell(28);//冷却方式 paraTurningTools.setCoolingMethod(ExcelUtils.getCellValueAsString(cell28)); Cell cell29 = row.getCell(29);//刀杆类别 paraTurningTools.setHolderCategory(ExcelUtils.getCellValueAsString(cell29)); Cell cell30 = row.getCell(30);//刀具直径 paraTurningTools.setToolDiameter(ExcelUtils.getCellValueAsString(cell30)); Cell cell31 = row.getCell(31);//接口紧固形式 paraTurningTools.setFasteningForm(ExcelUtils.getCellValueAsString(cell31)); Cell cell32 = row.getCell(32);//镗杆直径 paraTurningTools.setBoringBarDiameter(ExcelUtils.getCellValueAsString(cell32)); Cell cell33 = row.getCell(33);//刀杆长度 paraTurningTools.setBladeLength(ExcelUtils.getCellValueAsString(cell33)); Cell cell34 = row.getCell(34);//刀片形状 paraTurningTools.setBladeShape(ExcelUtils.getCellValueAsString(cell34)); Cell cell35 = row.getCell(35);//刀片后角 paraTurningTools.setBladePosterior(ExcelUtils.getCellValueAsString(cell35)); Cell cell36 = row.getCell(36);//刀杆方向 paraTurningTools.setBarDirection(ExcelUtils.getCellValueAsString(cell36)); Cell cell37 = row.getCell(37);//刀杆高度 paraTurningTools.setBladeHeight(ExcelUtils.getCellValueAsString(cell37)); Cell cell38 = row.getCell(38);//刀杆宽度 paraTurningTools.setBladeWide(ExcelUtils.getCellValueAsString(cell38)); Cell cell39 = row.getCell(39);//刀杆尺寸 paraTurningTools.setBladeSize(ExcelUtils.getCellValueAsString(cell39)); Cell cell40 = row.getCell(40);//刀夹型号 paraTurningTools.setKnifeClipModel(ExcelUtils.getCellValueAsString(cell40)); Cell cell41 = row.getCell(41);//刀片装夹方式 paraTurningTools.setClampingMethod(ExcelUtils.getCellValueAsString(cell41)); Cell cell42 = row.getCell(42);//刀片槽宽 paraTurningTools.setSlotWidth(ExcelUtils.getCellValueAsString(cell42)); Cell cell43 = row.getCell(43);//最小切入直径 paraTurningTools.setSmallDiameter(ExcelUtils.getCellValueAsString(cell43)); Cell cell44 = row.getCell(44);//最大切入直径 paraTurningTools.setMaxDiameter(ExcelUtils.getCellValueAsString(cell44)); Cell cell45 = row.getCell(45);//最大切槽深度 paraTurningTools.setMaxDepth(ExcelUtils.getCellValueAsString(cell45)); Cell cell46 = row.getCell(46);//刀杆形式 paraTurningTools.setKnifeBarForm(ExcelUtils.getCellValueAsString(cell46)); Cell cell47 = row.getCell(47);//刀板厚度 paraTurningTools.setBladeThickness(ExcelUtils.getCellValueAsString(cell47)); Cell cell48 = row.getCell(48);//最小加工直径 paraTurningTools.setMinDiameter(ExcelUtils.getCellValueAsString(cell48)); paraTurningToolsImportList.add(paraTurningTools); successLines++; lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaCommonTool.java
@@ -72,6 +72,14 @@ @Excel(name = "型号/图号", width = 15) @ApiModelProperty(value = "型号/图号") private String toolModel; /**刀具材料*/ @Excel(name = "刀具材料", width = 15) @ApiModelProperty(value = "刀具材料") private String toolMaterial; /**零件材料*/ @Excel(name = "零件材料", width = 15) @ApiModelProperty(value = "零件材料") private String partMaterial; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注")
