From 3091802b7b8f65fa26a208bbd03e56f00424b0a0 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 04 六月 2025 16:08:49 +0800
Subject: [PATCH] 工具管理-孔加工、车削、铣削、刀片、工具标识参数导入接口调整
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java | 322 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 217 insertions(+), 105 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
index 686f12c..3723d0e 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
+++ b/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);
+
+ //鏍规嵁鍒�鍏风紪鐮併�佸瀷鍙�/鍥惧彿銆佸垎绫籭d鏌ヨ鍒�鍏蜂俊鎭�
+ 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:閫氱敤宸ュ叿绫诲瀷
+ //鏍规嵁鍒�鍏穒d銆佸垎绫籭d鏌ヨ閫氱敤鍙傛暟淇℃伅
+ 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);//鍒�灏朢
- 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 {
- 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++;
--
Gitblit v1.9.3