diff --git a/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java b/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java index 266983c..a4b29e6 100644 --- a/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java +++ b/src/main/java/ru/dmitriymx/corrector1s/Corrector1S.java @@ -339,57 +339,62 @@ public class Corrector1S { } public void insertNewLines() { - Cell cell = sheet.createRow(19).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + int line = maxLines+3; + + int t1 = line; + Cell cell = sheet.createRow(line).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Итого по справке:"); - cell = sheet.getRow(19).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.getRow(line++).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.FORMULA); cell.setCellFormula(String.format("%s%d", CellReference.convertNumToColString(this.lastColumn+3), this.maxLines+2)); - cell = sheet.createRow(20).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line++).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Дополнительные страховые взносы за сварщиков"); - cell = sheet.createRow(21).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line++).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Корпоративный транспорт"); - cell = sheet.createRow(22).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line++).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Подбор персонала сторонним агентством"); - cell = sheet.createRow(23).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line++).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Страхование жизни"); - cell = sheet.createRow(24).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line++).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Страхование НС"); - cell = sheet.createRow(25).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + int t2 = line; + cell = sheet.createRow(line).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Итого без НДС"); - cell = sheet.getRow(25).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.getRow(line++).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.FORMULA); - cell.setCellFormula(String.format("%s%d", CellReference.convertNumToColString(6), 19+1)); + cell.setCellFormula(String.format("%s%d", CellReference.convertNumToColString(6), t1+1)); - cell = sheet.createRow(26).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + int t3 = line; + cell = sheet.createRow(line).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Сумма НДС:"); - cell = sheet.getRow(26).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.getRow(line++).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.FORMULA); - cell.setCellFormula(String.format("%s%d*18%%", CellReference.convertNumToColString(6), 25+1)); + cell.setCellFormula(String.format("%s%d*18%%", CellReference.convertNumToColString(6), t2+1)); - cell = sheet.createRow(27).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.createRow(line).getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.STRING); cell.setCellValue("Всего (с учетом НДС):"); - cell = sheet.getRow(27).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + cell = sheet.getRow(line).getCell(6, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.setCellType(CellType.FORMULA); cell.setCellFormula(String.format("%s%d+%s%d", CellReference.convertNumToColString(6), - 25+1, + t2+1, CellReference.convertNumToColString(6), - 26+1)); + t3+1)); } public void saveFile() throws IOException {