cuilei
2025-06-16 73be743ff89b54fa14fb07afa72e6d833406a381
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaThreadingToolController.java
@@ -513,6 +513,21 @@
                    paraThreadingTool.setConnectionAperture(ExcelUtils.getCellValueAsString(cell34));
                    Cell cell35 = row.getCell(35);//连接键槽
                    paraThreadingTool.setConnectingKeyway(ExcelUtils.getCellValueAsString(cell35));
                    Cell cell36 = row.getCell(36);//集团公司编码
                    paraThreadingTool.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell36));
                    Cell cell37 = row.getCell(37);//集团公司标记
                    if (cell37 == null || cell37.getCellType() == CellType.BLANK) {
                        //标记为空,拼接
                        String sign = ExcelUtils.getCellValueAsString(cell7)//中文名称
                                + "-" + ExcelUtils.getCellValueAsString(cell11)//型号/图号
                                + "-" + ExcelUtils.getCellValueAsString(cell13)//螺纹代号
                                + "-" + ExcelUtils.getCellValueAsString(cell14);//螺距
                        paraThreadingTool.setGroupCompanySign(sign);
                    } else {
                        paraThreadingTool.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell37));
                    }
                    Cell cell38 = row.getCell(38);//工具简称
                    paraThreadingTool.setShortCalled(ExcelUtils.getCellValueAsString(cell38));
                    paraThreadingToolImportList.add(paraThreadingTool);
                    successLines++;