cuilei
2025-06-16 73be743ff89b54fa14fb07afa72e6d833406a381
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java
@@ -526,6 +526,21 @@
                    paraHoleTools.setHeadsNumber(ExcelUtils.getCellValueAsString(cell44));
                    Cell cell45 = row.getCell(45);//适配刀座
                    paraHoleTools.setAdaptHolder(ExcelUtils.getCellValueAsString(cell45));
                    Cell cell46 = row.getCell(46);//集团公司编码
                    paraHoleTools.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell46));
                    Cell cell47 = row.getCell(47);//集团公司标记
                    if (cell47 == null || cell47.getCellType() == CellType.BLANK) {
                        //标记为空,拼接
                        String sign = ExcelUtils.getCellValueAsString(cell7)//中文名称
                                + "-" + ExcelUtils.getCellValueAsString(cell11)//型号/图号
                                + "-" + ExcelUtils.getCellValueAsString(cell13)//刀具直径
                                + "-" + ExcelUtils.getCellValueAsString(cell16);//刀具总长
                        paraHoleTools.setGroupCompanySign(sign);
                    } else {
                        paraHoleTools.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell47));
                    }
                    Cell cell48 = row.getCell(48);//工具简称
                    paraHoleTools.setShortCalled(ExcelUtils.getCellValueAsString(cell48));
                    paraHoleToolsImportList.add(paraHoleTools);
                    successLines++;