cuilei
2025-06-16 73be743ff89b54fa14fb07afa72e6d833406a381
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaCommonToolController.java
@@ -410,6 +410,19 @@
               }
               Cell cell14 = row.getCell(14);//零件材料
               paraCommonTool.setPartMaterial(ExcelUtils.getCellValueAsString(cell14));
               Cell cell15 = row.getCell(15);//集团公司编码
               paraCommonTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell15));
               Cell cell16 = row.getCell(16);//集团公司标记
               if (cell16 == null || cell16.getCellType() == CellType.BLANK) {
                  //标记为空,拼接
                  String sign = ExcelUtils.getCellValueAsString(cell7)//中文名称
                        + "-" + ExcelUtils.getCellValueAsString(cell11);//型号/图号
                  paraCommonTool.setGroupCompanySign(sign);
               } else {
                  paraCommonTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell16));
               }
               Cell cell17 = row.getCell(17);//工具简称
               paraCommonTool.setShortCalled(ExcelUtils.getCellValueAsString(cell17));
               paraCommonToolImportList.add(paraCommonTool);
               successLines++;