cuilei
2025-06-16 73be743ff89b54fa14fb07afa72e6d833406a381
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaBladeController.java
@@ -504,6 +504,23 @@
               paraBlade.setPitch(ExcelUtils.getCellValueAsString(cell35));
               Cell cell36 = row.getCell(36);//最小加工内螺纹公称直径
               paraBlade.setMinInternalThread(ExcelUtils.getCellValueAsString(cell36));
               Cell cell37 = row.getCell(37);//集团公司编码
               paraBlade.setGroupCompanyCode(ExcelUtils.getCellValueAsString(cell37));
               Cell cell38 = row.getCell(38);//集团公司标记
               if (cell38 == null || cell38.getCellType() == CellType.BLANK) {
                  //标记为空,拼接
                  String sign = ExcelUtils.getCellValueAsString(cell7)//中文名称
                        + "-" + ExcelUtils.getCellValueAsString(cell11)//型号/图号
                        + "-" + ExcelUtils.getCellValueAsString(cell13)//刀片形状
                        + "-" + ExcelUtils.getCellValueAsString(cell14)//刀片长度
                        + "-" + ExcelUtils.getCellValueAsString(cell15)//切削刃数
                        + "-" + ExcelUtils.getCellValueAsString(cell18);//刀尖R
                  paraBlade.setGroupCompanySign(sign);
               } else {
                  paraBlade.setGroupCompanySign(ExcelUtils.getCellValueAsString(cell38));
               }
               Cell cell39 = row.getCell(39);//工具简称
               paraBlade.setShortCalled(ExcelUtils.getCellValueAsString(cell39));
               paraBladeImportList.add(paraBlade);
               successLines++;